Index: trunk/src/DPlayX/dplayx.rc
===================================================================
--- trunk/src/DPlayX/dplayx.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: dplayx.rc,v 1.1 2000-02-05 01:58:08 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "DPLAYX System dll\0"
-            VALUE "FileVersion", "4.04\0"
-            VALUE "InternalName", "DPLAYX\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "DPLAYX.DLL\0"
-            VALUE "ProductName", "Odin32 - DPLAYX\0"
-            VALUE "ProductVersion", "4.04\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/DPlayX/dplayxrsrc.orc
===================================================================
--- trunk/src/DPlayX/dplayxrsrc.orc	(revision 3031)
+++ trunk/src/DPlayX/dplayxrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: dplayxrsrc.orc,v 1.1 2000-03-06 23:38:14 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "DPLAYX System dll\0"
+            VALUE "FileVersion", "4.04\0"
+            VALUE "InternalName", "DPLAYX\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "DPLAYX.DLL\0"
+            VALUE "ProductName", "Odin32 - DPLAYX\0"
+            VALUE "ProductVersion", "4.04\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/DPlayX/makefile
===================================================================
--- trunk/src/DPlayX/makefile	(revision 3028)
+++ trunk/src/DPlayX/makefile	(revision 3031)
@@ -1,68 +1,76 @@
-# $Id: makefile,v 1.7 2000-02-09 23:46:52 bird Exp $
+# $Id: makefile,v 1.8 2000-03-06 23:38:14 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       dplayx.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = dsoundrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\dplayx.obj\
+$(OBJDIR)\dplayxrsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = dplayx
 
-OBJS =  dplayx.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/advapi32.lib \
-          OS2386.LIB $(RTLLIB_O) \
-          $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/advapi32.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(PDWIN32_LIB)/ole32.lib
+$(PDWIN32_LIB)/msvfw32.lib
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/NTDLL/makefile
===================================================================
--- trunk/src/NTDLL/makefile	(revision 3028)
+++ trunk/src/NTDLL/makefile	(revision 3031)
@@ -1,79 +1,90 @@
-# $Id: makefile,v 1.20 2000-02-09 23:46:52 bird Exp $
+# $Id: makefile,v 1.21 2000-03-06 23:38:14 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       NTDLL.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = ntdllrsrc.asm
 
 
-OBJS = NTDLL.obj\
-       file.obj\
-       exception.obj\
-       nt.obj\
-       om.obj\
-       reg.obj\
-       rtl.obj\
-       rtlstr.obj\
-       sec.obj\
-       sync.obj\
-       initterm.obj\
-       time.obj\
-       unknown.obj\
-       arith64.obj\
-       regfunc.obj resource.obj
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\NTDLL.obj \
+$(OBJDIR)\file.obj \
+$(OBJDIR)\exception.obj \
+$(OBJDIR)\nt.obj \
+$(OBJDIR)\om.obj \
+$(OBJDIR)\reg.obj \
+$(OBJDIR)\rtl.obj \
+$(OBJDIR)\rtlstr.obj \
+$(OBJDIR)\sec.obj \
+$(OBJDIR)\sync.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\time.obj \
+$(OBJDIR)\unknown.obj \
+$(OBJDIR)\arith64.obj \
+$(OBJDIR)\regfunc.obj \
+$(OBJDIR)\ntdllrsrc.obj
 
 
+# Target name - name of the dll without extention and path.
 TARGET = NTDLL
 
-all: $(TARGET).dll $(TARGET).lib
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) sbsstub.obj $(TARGET).def $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/crtdll.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+sbsstub.obj
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/crtdll.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_LIB)\$(TARGET).lib $(PDWIN32_BIN)\$(TARGET).dll \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/NTDLL/ntdll.rc
===================================================================
--- trunk/src/NTDLL/ntdll.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: ntdll.rc,v 1.1 2000-02-05 02:05:00 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "NTDLL System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "NTDLL\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "NTDLL.DLL\0"
-            VALUE "ProductName", "Odin32 - NTDLL\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/NTDLL/ntdllrsrc.orc
===================================================================
--- trunk/src/NTDLL/ntdllrsrc.orc	(revision 3031)
+++ trunk/src/NTDLL/ntdllrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: ntdllrsrc.orc,v 1.1 2000-03-06 23:38:15 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "NTDLL System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "NTDLL\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "NTDLL.DLL\0"
+            VALUE "ProductName", "Odin32 - NTDLL\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/advapi32/advapi32.rc
===================================================================
--- trunk/src/advapi32/advapi32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: advapi32.rc,v 1.1 2000-02-05 01:51:39 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "ADVAPI32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "ADVAPI32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ADVAPI32.DLL\0"
-            VALUE "ProductName", "Odin32 - ADVAPI32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/advapi32/advapi32rsrc.orc
===================================================================
--- trunk/src/advapi32/advapi32rsrc.orc	(revision 3031)
+++ trunk/src/advapi32/advapi32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: advapi32rsrc.orc,v 1.1 2000-03-06 23:38:15 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "ADVAPI32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "ADVAPI32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "ADVAPI32.DLL\0"
+            VALUE "ProductName", "Odin32 - ADVAPI32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/advapi32/makefile
===================================================================
--- trunk/src/advapi32/makefile	(revision 3028)
+++ trunk/src/advapi32/makefile	(revision 3031)
@@ -1,66 +1,80 @@
-# $Id: makefile,v 1.22 2000-03-03 11:14:58 sandervl Exp $
+# $Id: makefile,v 1.23 2000-03-06 23:38:15 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       advapi32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+
+# Flag overloads and local macros.
+CLEANEXTRAS = advapi32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\advapi32.obj \
+$(OBJDIR)\advapi32rsrc.obj \
+$(OBJDIR)\lsa.obj \
+$(OBJDIR)\security.obj \
+$(OBJDIR)\service.obj \
+$(OBJDIR)\eventlog.obj \
+$(OBJDIR)\crypt.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = advapi32
 
-OBJS =  advapi32.obj resource.obj lsa.obj security.obj service.obj eventlog.obj crypt.obj $(PDWIN32_LIB)/dllentry.obj
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-all: $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/ntdll.lib \
-          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/pmwinx.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/ntdll.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/pmwinx.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll  \
-        $(PDWIN32_LIB)\$(TARGET).lib  \
-        $(TARGET)exp.def resource.asm
-
Index: trunk/src/avifil32/avifil32.orc
===================================================================
--- trunk/src/avifil32/avifil32.orc	(revision 3031)
+++ trunk/src/avifil32/avifil32.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: avifil32.orc,v 1.1 2000-03-06 23:38:16 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3 avifil32.dll)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "AVIFIL32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "AVIFIL32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "AVIFIL32.DLL\0"
+            VALUE "ProductName", "Odin32 - AVIFIL32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/avifil32/avifil32.rc
===================================================================
--- trunk/src/avifil32/avifil32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: avifil32.rc,v 1.1 2000-02-05 01:52:22 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3 avifil32.dll)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "AVIFIL32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "AVIFIL32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "AVIFIL32.DLL\0"
-            VALUE "ProductName", "Odin32 - AVIFIL32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/avifil32/makefile
===================================================================
--- trunk/src/avifil32/makefile	(revision 3028)
+++ trunk/src/avifil32/makefile	(revision 3031)
@@ -1,65 +1,75 @@
-# $Id: makefile,v 1.7 2000-02-09 23:46:53 bird Exp $
+# $Id: makefile,v 1.8 2000-03-06 23:38:16 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       avifil32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = avifile32.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\avifile.obj \
+$(OBJDIR)\avifil32.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = avifil32
 
-OBJS =  avifile.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-          $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/msvfw32.lib
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
 
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(PDWIN32_LIB)/ole32.lib
+$(PDWIN32_LIB)/msvfw32.lib
+$(TARGET).def
+<<keep
 
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm  $(TARGET)exp.def
-
Index: trunk/src/capi2032/capi2032.rc
===================================================================
--- trunk/src/capi2032/capi2032.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: capi2032.rc,v 1.1 2000-02-05 01:53:04 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version ???
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "CAPI2032 System dll\0"
-            VALUE "FileVersion", "2.00\0"
-            VALUE "InternalName", "CAPI2032\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "CAPI2032.DLL\0"
-            VALUE "ProductName", "Odin32 - CAPI2032\0"
-            VALUE "ProductVersion", "2.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/capi2032/capi2032rsrc.orc
===================================================================
--- trunk/src/capi2032/capi2032rsrc.orc	(revision 3031)
+++ trunk/src/capi2032/capi2032rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: capi2032rsrc.orc,v 1.1 2000-03-06 23:38:17 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version ???
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "CAPI2032 System dll\0"
+            VALUE "FileVersion", "2.00\0"
+            VALUE "InternalName", "CAPI2032\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "CAPI2032.DLL\0"
+            VALUE "ProductName", "Odin32 - CAPI2032\0"
+            VALUE "ProductVersion", "2.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/capi2032/makefile
===================================================================
--- trunk/src/capi2032/makefile	(revision 3028)
+++ trunk/src/capi2032/makefile	(revision 3031)
@@ -1,68 +1,73 @@
-# $Id: makefile,v 1.11 2000-02-09 23:46:53 bird Exp $
+# $Id: makefile,v 1.12 2000-03-06 23:38:17 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       capi2032.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = capi2032rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\capi2032.obj \
+$(OBJDIR)\capi2032rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = capi2032
 
-OBJS =  capi2032.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-all: $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib \
-          OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/comctl32/makefile
===================================================================
--- trunk/src/comctl32/makefile	(revision 3028)
+++ trunk/src/comctl32/makefile	(revision 3031)
@@ -1,73 +1,101 @@
-# $Id: makefile,v 1.23 2000-02-23 17:09:44 cbratschi Exp $
+# $Id: makefile,v 1.24 2000-03-06 23:38:17 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       comctl32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = lz32rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\comctl32.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\progress.obj \
+$(OBJDIR)\comctl32undoc.obj \
+$(OBJDIR)\imagelist.obj \
+$(OBJDIR)\comboex.obj \
+$(OBJDIR)\animate.obj \
+$(OBJDIR)\datetime.obj \
+$(OBJDIR)\flatsb.obj \
+$(OBJDIR)\hotkey.obj \
+$(OBJDIR)\monthcal.obj \
+$(OBJDIR)\nativefont.obj \
+$(OBJDIR)\pager.obj \
+$(OBJDIR)\tab.obj \
+$(OBJDIR)\status.obj \
+$(OBJDIR)\header.obj \
+$(OBJDIR)\updown.obj \
+$(OBJDIR)\rebar.obj \
+$(OBJDIR)\trackbar.obj \
+$(OBJDIR)\tooltips.obj \
+$(OBJDIR)\toolbar.obj \
+$(OBJDIR)\treeview.obj \
+$(OBJDIR)\propsheet.obj \
+$(OBJDIR)\listview.obj \
+$(OBJDIR)\draglist.obj \
+$(OBJDIR)\ipaddress.obj \
+$(OBJDIR)\ccbase.obj \
+$(OBJDIR)\rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = comctl32
 
-OBJS =  comctl32.obj initterm.obj progress.obj comctl32undoc.obj imagelist.obj \
-        comboex.obj animate.obj datetime.obj flatsb.obj hotkey.obj monthcal.obj \
-        nativefont.obj pager.obj tab.obj status.obj header.obj updown.obj \
-        rebar.obj trackbar.obj tooltips.obj toolbar.obj treeview.obj \
-        propsheet.obj listview.obj draglist.obj ipaddress.obj resource.obj \
-        ccbase.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/gdi32.lib \
-          $(PDWIN32_LIB)/user32.lib  $(PDWIN32_LIB)/odincrt.lib \
-          $(PDWIN32_LIB)/winmm.lib \
-          OS2386.LIB  $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: rsrc.rc
-    $(RC) $(RCFLAGS) -o resource.asm rsrc.rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/gdi32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/winmm.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib \
-        $(TARGET)exp.def
-
Index: trunk/src/comctl32/rsrc.orc
===================================================================
--- trunk/src/comctl32/rsrc.orc	(revision 3031)
+++ trunk/src/comctl32/rsrc.orc	(revision 3031)
@@ -0,0 +1,963 @@
+#include "winuser.h"
+#include "comctl32.h"
+#include "odinrsrc.h"
+
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 292, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Properties for "
+FONT 8, "MS Sans Serif"
+BEGIN
+  DEFPUSHBUTTON "OK",     IDOK,72,138,50,14
+  PUSHBUTTON    "Cancel", IDCANCEL,127,138,50,14
+  PUSHBUTTON    "&Apply", IDC_APPLY_BUTTON,181,138,50,14
+  PUSHBUTTON    "Help",   IDHELP,235,138,50,14,WS_TABSTOP|WS_GROUP
+  CONTROL       "Tab",    IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_TABSTOP,7,7,278,125
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 292, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Sans Serif"
+BEGIN
+  DEFPUSHBUTTON "Finish",  IDC_FINISH_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
+  PUSHBUTTON    "< &Back", IDC_BACK_BUTTON,71,138,50,14
+  PUSHBUTTON    "Cancel",  IDCANCEL,178,138,50,14
+  PUSHBUTTON    "Help",    IDHELP,235,138,50,14,WS_GROUP
+  LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+  CONTROL       "Tab",     IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Customize Toolbar"
+FONT 8, "MS Sans Serif"
+BEGIN
+  DEFPUSHBUTTON "&Close",     IDCANCEL,308,6,44,14
+  PUSHBUTTON    "R&eset",     IDC_RESET_BTN,308,23,44,14
+  PUSHBUTTON    "&Help",      IDC_HELP_BTN,308,40,44,14
+  PUSHBUTTON    "Move &Up",   IDC_MOVEUP_BTN,308,74,44,14
+  PUSHBUTTON    "Move &Down", IDC_MOVEDN_BTN,308,91,44,14
+  LTEXT         "A&vailable buttons:", -1,4,5,84,10
+  LISTBOX       IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+  PUSHBUTTON    "&Add ->",    IDOK, 131, 42, 44, 14
+  PUSHBUTTON    "<- &Remove", IDC_REMOVE_BTN,131,62,44,14
+  LTEXT         "&Toolbar buttons:", -1,182,5,78,10
+  LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+IDD_MCMONTHMENU MENU LOADONCALL DISCARDABLE
+{
+    POPUP ""
+    BEGIN
+        MENUITEM "&January", IDM_JAN
+        MENUITEM "&February", IDM_FEB
+        MENUITEM "&March", IDM_MAR
+        MENUITEM "&April", IDM_APR
+        MENUITEM "&May", IDM_MAY
+        MENUITEM "J&une", IDM_JUN
+        MENUITEM "Ju&ly", IDM_JUL
+        MENUITEM "Au&gust", IDM_AUG
+        MENUITEM "&September", IDM_SEP
+        MENUITEM "&October", IDM_OCT
+        MENUITEM "&November", IDM_NOV
+        MENUITEM "&December", IDM_DEC
+    END
+}
+
+IDT_CHECK BITMAP LOADONCALL DISCARDABLE
+{ 
+ '42 4D 8E 01 00 00 00 00 00 00 5E 00 00 00 28 00'
+ '00 00 1F 00 00 00 10 00 00 00 01 00 04 00 02 00'
+ '00 00 30 01 00 00 01 00 00 00 01 00 00 00 0A 00'
+ '00 00 0A 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 80 00 00 00 C0 C0 C0 00 80 80 80 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF FF FF 00 1F 99'
+ '00 00 01 99 0D 11 02 99 0E 11 01 99 00 00 01 99'
+ '0D 11 02 99 0E 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 0A 99 02 11 01 99 00 00 01 99'
+ '02 11 09 99 02 11 02 99 02 11 0A 99 02 11 01 99'
+ '00 00 01 99 02 11 09 99 02 11 02 99 02 11 03 99'
+ '02 00 05 99 02 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 03 99 03 00 04 99 02 11 01 99'
+ '00 00 01 99 02 11 09 99 02 11 02 99 02 11 02 99'
+ '04 00 04 99 02 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 01 99 02 00 02 99 02 00 03 99'
+ '02 11 01 99 00 00 01 99 02 11 09 99 02 11 02 99'
+ '02 11 02 00 04 99 02 00 02 99 02 11 01 99 00 00'
+ '01 99 02 11 09 99 02 11 02 99 02 11 01 00 06 99'
+ '02 00 01 99 02 11 01 99 00 00 01 99 02 11 09 99'
+ '02 11 02 99 02 11 07 99 02 00 01 99 01 00 01 11'
+ '01 99 00 00 01 99 02 11 09 99 02 11 02 99 02 11'
+ '08 99 01 00 01 99 01 00 01 11 01 99 00 00 01 99'
+ '0D 11 02 99 0A 11 02 00 02 11 01 99 00 00 01 99'
+ '0D 11 02 99 0E 11 01 99 00 00 1F 99 00 01'
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_CLOSE    "Close"
+}
+
+IDB_STD_SMALL BITMAP LOADONCALL DISCARDABLE
+{
+ '42 4D 20 07 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 F0 00 00 00 10 00 00 00 01 00 04 00 02 00'
+ '00 00 AA 06 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 FF FF FF 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 00'
+ '00 00 80 80 80 00 C0 C0 C0 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 00 66 66 00 CC 88 02 44 22 88 00 00 04 88'
+ '00 04 84 48 1E 88 0A 44 52 88 0C 66 02 68 0C 66'
+ '02 88 0E 66 08 88 00 04 86 68 12 88 04 84 02 48'
+ '08 88 02 44 08 88 0A 66 00 04 68 88 00 00 04 88'
+ '00 08 48 84 88 44 0A 88 02 84 08 44 02 86 04 66'
+ '02 40 06 00 02 04 22 88 02 86 0A 88 00 04 68 88'
+ '0A 66 00 04 68 88 0A 66 02 68 04 88 00 04 86 33'
+ '06 66 00 08 88 63 68 60 08 00 00 08 06 86 66 60'
+ '08 00 02 06 08 88 00 04 86 68 12 88 00 06 48 44'
+ '48 00 06 88 00 04 84 44 06 88 02 86 08 88 04 86'
+ '02 88 00 00 04 88 02 48 04 84 00 04 88 48 08 88'
+ '02 84 06 00 00 04 04 67 04 37 02 40 06 66 02 04'
+ '22 88 00 04 66 68 0C 88 02 60 08 00 00 06 68 88'
+ '66 00 08 33 02 36 04 88 00 04 86 33 06 66 00 08'
+ '88 63 68 60 06 00 06 66 00 08 68 60 66 06 04 66'
+ '02 06 08 88 02 66 04 88 00 04 44 48 0A 88 04 84'
+ '02 44 04 88 04 66 00 04 44 48 06 88 0C 66 04 68'
+ '00 00 04 88 02 48 04 84 00 04 88 48 08 88 00 04'
+ '84 06 04 66 00 04 04 63 04 73 02 40 06 00 02 04'
+ '22 88 04 66 06 88 02 86 04 88 02 60 08 00 00 08'
+ '68 88 6B 63 08 33 00 08 68 88 86 33 06 66 00 08'
+ '88 63 68 60 04 00 00 0C 06 78 87 66 88 60 08 00'
+ '02 06 04 88 00 06 68 88 66 00 04 88 00 04 44 48'
+ '06 88 04 66 00 10 48 44 48 88 86 78 07 64 04 88'
+ '00 06 18 88 68 00 04 88 00 0A 8B BB 88 66 68 00'
+ '00 00 04 88 00 0E 84 44 84 88 48 88 86 00 04 66'
+ '02 64 06 00 00 04 04 67 04 37 00 06 40 66 60 00'
+ '04 44 0C 88 02 48 04 88 02 84 0E 88 00 04 86 66'
+ '06 88 02 68 04 88 02 60 08 00 00 08 68 88 60 B6'
+ '08 33 00 08 36 88 86 33 08 66 00 06 63 68 60 00'
+ '04 00 00 10 67 88 E7 76 88 60 66 06 04 66 02 06'
+ '04 88 00 06 66 86 68 00 0C 88 00 0A 66 88 80 74'
+ '44 00 04 88 00 12 67 88 80 76 88 81 18 88 68 00'
+ '04 88 00 06 87 77 88 00 04 68 00 00 06 88 04 84'
+ '02 44 04 88 02 86 04 00 00 04 04 06 04 66 00 04'
+ '04 63 04 73 02 40 04 00 00 06 40 48 88 00 04 44'
+ '02 48 04 88 02 48 04 88 02 84 04 88 02 84 04 44'
+ '06 88 00 0A 66 68 88 86 68 00 04 88 02 60 08 00'
+ '00 0A 68 88 6B 0B 63 00 08 33 00 04 68 86 0C 33'
+ '00 04 68 60 04 00 00 0C 68 88 87 86 88 60 08 00'
+ '02 06 04 88 04 66 02 68 04 88 00 0A 44 48 88 86'
+ '78 00 04 88 00 04 07 68 04 88 02 68 04 88 00 04'
+ '06 88 04 11 02 18 0C 66 00 04 68 86 00 00 06 88'
+ '00 04 84 64 06 88 00 08 86 06 66 64 06 00 00 04'
+ '04 67 04 37 02 40 04 00 02 44 04 88 04 44 06 88'
+ '02 84 04 88 02 48 06 88 04 44 06 88 00 08 86 66'
+ '88 66 06 88 02 60 08 00 00 0A 68 88 60 B0 B6 00'
+ '0A 66 00 04 86 33 08 66 00 06 33 68 60 00 04 00'
+ '00 0C 68 E8 87 86 88 60 06 00 00 04 60 06 04 88'
+ '08 66 00 0A 88 44 48 88 86 00 06 88 00 04 80 68'
+ '04 88 00 12 68 0E 88 86 88 81 18 81 68 00 08 88'
+ '06 86 00 00 08 88 02 68 06 88 02 86 04 00 00 06'
+ '04 06 60 00 04 44 02 63 04 73 06 44 02 46 04 88'
+ '00 04 44 48 06 88 02 84 04 88 02 48 06 88 00 04'
+ '84 44 08 88 04 66 02 68 06 88 02 60 08 00 00 06'
+ '68 88 6B 00 08 0B 02 68 04 88 00 04 86 36 08 88'
+ '00 06 63 68 60 00 04 00 00 16 67 EE 87 76 88 60'
+ '66 00 06 86 06 00 04 88 06 66 00 0C 68 88 84 44'
+ '88 68 08 88 02 86 04 88 00 08 67 00 88 76 04 88'
+ '00 06 18 81 86 00 08 66 04 68 02 66 00 00 06 88'
+ '00 04 86 66 06 88 00 08 86 06 66 64 04 00 00 06'
+ '40 48 67 00 0A 37 02 36 04 88 00 04 44 84 06 88'
+ '02 84 04 88 02 48 06 88 00 04 48 44 08 88 00 04'
+ '86 66 08 88 02 60 08 00 00 06 68 88 60 00 08 B0'
+ '02 68 04 88 00 04 86 36 08 88 00 06 63 68 60 00'
+ '04 00 00 10 06 78 87 68 88 60 68 60 04 68 00 06'
+ '66 68 44 00 06 66 06 88 00 06 44 48 68 00 08 88'
+ '02 86 04 88 00 08 86 78 87 68 06 88 00 06 81 88'
+ '60 00 06 00 02 06 04 86 00 00 06 88 04 86 06 88'
+ '02 86 04 00 02 04 04 00 00 08 44 88 63 76 06 66'
+ '00 04 67 76 04 88 00 06 48 88 44 00 04 88 02 48'
+ '04 88 02 84 04 88 00 06 44 88 84 00 08 88 04 66'
+ '02 68 06 88 02 60 08 00 00 08 68 88 6B 0B 06 66'
+ '02 68 04 88 00 04 86 36 08 88 00 06 63 68 60 00'
+ '06 00 04 66 04 88 00 04 60 06 06 86 00 06 88 86'
+ '44 00 04 66 00 10 68 84 44 88 84 44 68 0E 06 88'
+ '02 86 06 88 04 66 00 04 88 81 08 88 00 04 86 06'
+ '04 66 00 06 06 66 68 00 00 00 06 88 00 06 66 86'
+ '68 00 04 88 00 08 86 06 60 64 04 44 00 08 48 88'
+ '67 76 06 88 00 04 67 36 0A 88 04 44 08 88 04 44'
+ '0C 88 00 08 86 66 88 66 06 88 02 60 04 00 00 0C'
+ '06 66 68 88 86 66 08 88 00 08 66 68 86 36 08 88'
+ '00 06 63 68 60 00 08 00 02 06 04 88 04 66 06 68'
+ '04 88 02 44 04 66 00 10 88 84 44 88 84 44 68 0E'
+ '06 88 02 86 0C 88 00 06 81 88 18 00 04 88 02 86'
+ '08 00 00 04 68 88 00 00 06 88 00 06 68 88 68 00'
+ '04 88 02 86 04 00 00 04 60 68 06 88 00 0E 63 73'
+ '6B 66 B6 73 76 00 24 88 00 0C 86 66 68 88 86 68'
+ '04 88 02 60 04 00 04 06 10 88 00 08 86 68 86 36'
+ '08 88 00 06 66 68 60 00 06 00 04 66 08 88 04 86'
+ '06 88 00 18 44 66 68 88 84 44 88 84 44 86 00 EE'
+ '04 88 02 68 0C 88 00 06 81 88 11 00 06 88 02 60'
+ '04 66 00 06 60 68 88 00 00 00 06 88 00 06 68 88'
+ '68 00 04 88 02 86 04 00 02 66 08 88 02 86 04 66'
+ '02 BB 04 66 02 68 24 88 04 66 06 88 02 66 04 88'
+ '02 60 04 00 00 04 06 68 0C 88 00 04 68 88 04 68'
+ '00 04 86 36 08 88 04 68 02 60 06 00 04 68 0A 88'
+ '02 68 04 88 00 06 86 44 66 00 06 88 06 44 00 0E'
+ '48 86 70 00 88 87 68 00 0E 88 04 11 02 18 04 88'
+ '02 60 06 00 00 04 06 88 00 00 06 88 00 06 68 88'
+ '68 00 04 88 02 86 04 66 02 68 0C 88 00 06 86 66'
+ '68 00 28 88 00 04 66 68 08 88 00 04 68 88 08 66'
+ '0E 88 00 04 86 66 04 88 02 86 0C 66 00 04 68 60'
+ '06 00 02 66 0C 88 02 86 04 66 00 06 68 44 68 00'
+ '06 88 02 84 04 44 04 88 02 66 04 88 02 66 12 88'
+ '02 11 06 88 02 86 08 66 02 88 00 00 90 88 08 66'
+ '02 68 2A 88 04 66 14 88 02 18 12 88 00 00 00 01'
+}
+
+IDB_STD_LARGE BITMAP LOADONCALL DISCARDABLE
+{
+ '42 4D D6 0A 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 68 01 00 00 18 00 00 00 01 00 04 00 02 00'
+ '00 00 60 0A 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 FF 77 69 77 00 00 07 77 03 44'
+ 'FF 77 5F 77 00 00 06 77 01 47 03 77 01 47 14 77'
+ '0E 44 5F 77 01 07 06 77 11 00 1F 77 12 00 19 77'
+ '02 00 03 77 10 00 30 77 02 44 10 77 02 44 0C 77'
+ '10 00 05 77 00 00 06 77 01 47 03 77 01 47 04 77'
+ '03 44 0D 77 01 4F 0C FF 01 47 0D 77 0B 44 34 77'
+ '04 00 16 77 01 0F 0F FF 01 07 04 77 11 00 09 77'
+ '01 03 03 33 09 00 03 77 00 04 03 30 04 77 10 00'
+ '03 77 03 00 03 77 01 0F 0E FF 01 07 0E 77 03 00'
+ '1E 77 03 47 01 47 0E 77 03 47 01 47 0A 77 01 07'
+ '0E 77 04 07 03 77 00 00 06 77 01 47 03 77 01 47'
+ '03 77 01 47 03 77 01 47 0C 77 01 4F 0C FF 01 47'
+ '0D 77 01 4F 09 FF 01 47 34 77 05 00 0D 77 01 07'
+ '07 77 01 0F 0F FF 01 07 04 77 02 00 0F 33 01 07'
+ '08 77 01 03 03 33 09 00 03 77 00 04 03 30 04 77'
+ '01 0F 0E FF 01 07 02 77 04 00 03 77 01 0F 0E FF'
+ '01 07 0E 77 03 00 04 77 03 44 16 77 03 47 02 44'
+ '0D 77 03 47 02 44 0A 77 01 07 0E 77 02 07 03 70'
+ '02 77 00 00 06 77 01 47 03 77 01 47 03 77 01 47'
+ '03 77 01 47 0C 77 01 4F 02 FF 08 00 01 FF 02 F4'
+ '0D 77 02 4F 07 00 02 F4 34 77 05 00 0C 77 01 07'
+ '08 77 01 0F 0F FF 01 07 04 77 03 0F 0F 33 01 07'
+ '07 77 01 03 03 33 09 00 03 77 00 04 03 30 04 77'
+ '01 0F 0A FF 0A 00 04 77 00 04 0F F0 03 0F 06 00'
+ '01 FF 02 F0 0D 77 03 00 04 77 05 44 14 77 03 47'
+ '02 44 0D 77 03 47 02 44 0A 77 12 00 01 77 03 70'
+ '01 70 00 00 06 77 01 47 03 77 01 47 03 77 01 47'
+ '03 77 01 47 06 77 06 00 01 4F 0C FF 01 47 06 77'
+ '07 00 01 4F 09 FF 01 47 35 77 05 00 0A 77 02 00'
+ '08 77 01 0F 0F FF 01 07 04 77 00 04 0B F0 0F 33'
+ '01 07 06 77 01 03 03 33 09 00 03 77 00 04 03 30'
+ '04 77 01 0F 09 FF 02 08 03 77 01 80 04 00 05 77'
+ '01 0F 0E FF 01 07 07 77 01 07 05 77 03 00 05 77'
+ '03 44 14 77 03 47 02 44 09 77 04 00 03 47 02 44'
+ '0B 77 01 07 10 77 01 00 02 07 03 70 00 00 07 77'
+ '04 44 03 77 01 47 03 77 01 47 06 77 01 0F 05 FF'
+ '01 4F 02 FF 08 00 01 FF 02 F4 05 77 01 03 07 38'
+ '02 4F 07 00 02 F4 12 77 02 44 0D 77 02 44 13 77'
+ '04 00 09 77 02 00 09 77 01 0F 0F FF 01 07 04 77'
+ '01 0F 03 FB 01 03 0F 33 01 07 05 77 01 03 03 33'
+ '09 00 03 77 00 04 03 30 04 77 01 0F 08 FF 00 0A'
+ '08 77 EE 88 00 77 06 77 00 04 0F F0 03 0F 06 00'
+ '01 FF 02 F0 07 77 02 00 03 77 03 00 15 77 05 00'
+ '01 77 04 74 02 44 08 77 02 00 03 77 02 F8 03 44'
+ '0C 77 01 07 0B 77 03 BB 01 77 07 70 00 00 0A 77'
+ '01 47 03 77 04 44 07 77 01 0F 05 FF 01 4F 0C FF'
+ '01 47 05 77 01 08 07 83 01 4F 09 FF 01 47 14 77'
+ '01 47 0B 77 01 47 16 77 04 00 07 77 03 00 09 77'
+ '01 0F 0F FF 01 07 04 77 01 0B 04 BF 01 03 0F 33'
+ '01 07 04 77 01 03 03 33 0D 00 01 33 02 30 04 77'
+ '01 0F 07 FF 02 08 05 77 00 04 E7 80 06 77 01 0F'
+ '0E FF 01 07 07 77 03 00 02 77 03 00 06 77 03 44'
+ '0A 77 02 00 05 77 01 00 02 07 03 44 08 77 02 08'
+ '05 77 01 F8 02 80 0D 77 01 07 0B 77 03 88 01 77'
+ '03 70 02 70 02 07 00 00 0A 77 01 44 03 47 01 47'
+ '0A 77 01 0F 02 FF 03 00 01 4F 02 FF 08 00 01 FF'
+ '02 F4 05 77 01 03 07 38 02 4F 03 00 02 FF 04 44'
+ '06 77 06 44 09 77 01 47 09 77 01 47 09 77 06 44'
+ '09 77 04 00 05 77 03 00 0A 77 01 0F 0F FF 01 07'
+ '04 77 01 0F 05 FB 01 03 0F 33 01 07 03 77 01 03'
+ '12 33 01 07 04 77 01 0F 07 FF 01 07 06 77 02 8E'
+ '03 70 05 77 00 04 0F F0 03 0F 06 00 01 FF 02 F0'
+ '07 77 07 00 07 77 03 44 09 77 02 08 05 77 01 FF'
+ '02 F8 03 44 09 77 01 07 07 77 02 F0 06 77 01 17'
+ '06 77 13 00 01 77 03 70 00 00 0B 77 04 47 0A 77'
+ '01 0F 05 FF 01 4F 0C FF 01 47 05 77 01 08 07 83'
+ '01 4F 06 FF 03 4F 07 77 05 44 0B 77 01 47 07 77'
+ '01 47 0B 77 05 44 0A 77 04 00 03 77 03 00 0B 77'
+ '01 0F 0F FF 01 07 04 77 01 0B 06 BF 01 03 0F 33'
+ '00 04 07 70 12 33 01 07 04 77 01 0F 07 FF 01 07'
+ '06 77 02 8E 03 70 05 77 01 0F 0E FF 01 07 07 77'
+ '0B 00 03 77 03 44 08 77 02 08 08 77 01 F8 02 80'
+ '09 77 01 07 0A 77 01 07 04 77 02 11 06 77 01 07'
+ '10 77 04 07 02 70 00 00 0B 77 03 40 0B 77 01 0F'
+ '02 FF 03 00 01 4F 02 FF 08 00 01 FF 02 F4 05 77'
+ '01 03 07 38 01 4F 06 FF 02 44 08 77 04 44 0C 77'
+ '01 47 07 77 01 47 0C 77 04 44 0B 77 04 00 01 70'
+ '03 00 0C 77 01 0F 0F FF 01 07 04 77 01 0F 07 FB'
+ '10 00 01 77 02 70 03 33 0C 00 03 33 01 07 04 77'
+ '01 0F 07 FF 01 07 03 7E 03 77 02 87 03 70 05 77'
+ '00 04 0F F0 03 0F 06 00 01 FF 02 F0 07 77 0A 00'
+ '05 77 03 44 07 77 01 07 0A 77 02 F0 09 77 01 07'
+ '0A 77 01 07 03 77 06 11 04 77 01 07 0F 77 02 07'
+ '04 70 00 00 0C 77 01 07 0C 77 01 0F 05 FF 01 4F'
+ '0C FF 01 47 05 77 01 08 07 83 08 44 09 77 04 44'
+ '0C 77 01 47 07 77 01 47 0C 77 04 44 0C 77 06 00'
+ '0D 77 01 0F 0F FF 01 07 04 77 01 0B 10 BF 01 07'
+ '08 77 00 04 03 30 0C 77 00 04 03 30 04 77 01 0F'
+ '07 FF 01 08 02 8E 04 77 03 87 01 07 06 77 01 0F'
+ '0E FF 01 07 07 77 09 00 07 77 03 44 05 77 01 07'
+ '0B 77 01 F7 03 70 07 77 00 04 07 FE 07 77 01 07'
+ '04 77 02 11 03 77 01 17 04 77 0F 00 03 70 02 70'
+ '01 00 00 00 0B 77 03 00 0B 77 01 0F 02 FF 03 00'
+ '01 4F 02 FF 04 00 02 FF 05 44 05 77 01 03 0E 38'
+ '01 07 09 77 01 44 02 47 03 74 0A 77 01 47 07 77'
+ '01 47 0B 77 00 05 47 74 47 88 0D 77 04 00 0E 77'
+ '01 0F 0F FF 01 07 04 77 01 0F 10 FB 01 07 08 77'
+ '00 04 03 30 0C 77 00 04 03 30 04 77 01 0F 08 FF'
+ '00 09 08 EE 77 88 07 68 07 77 01 0F 09 FF 01 0F'
+ '04 FF 01 07 07 77 08 00 02 77 03 44 04 77 03 44'
+ '04 77 01 07 03 7F 0A 77 01 07 08 77 00 04 07 FE'
+ '07 77 01 07 05 77 01 17 03 77 01 17 05 77 01 0F'
+ '0C FF 01 00 04 07 02 70 00 00 0B 77 04 07 0A 77'
+ '01 0F 05 FF 01 4F 08 FF 00 04 4F F4 06 77 01 08'
+ '0E 83 01 07 09 77 01 47 04 77 01 47 09 77 01 47'
+ '09 77 01 47 09 77 01 47 04 77 01 47 0C 77 06 00'
+ '0D 77 01 0F 0F FF 01 07 04 77 01 0B 10 BF 01 07'
+ '08 77 00 04 03 30 0C 77 00 04 03 30 04 77 01 0F'
+ '09 FF 02 08 03 77 02 80 08 77 01 0F 03 FF 02 00'
+ '03 FF 03 07 03 FF 01 07 07 77 07 00 03 77 03 44'
+ '04 77 04 44 03 77 00 04 07 FE 0A 77 01 07 09 77'
+ '00 05 0F FE E7 88 04 77 01 07 0A 77 01 17 05 77'
+ '01 0F 02 FF 08 00 02 FF 03 00 04 70 00 00 0A 77'
+ '01 00 03 07 01 07 0A 77 01 0F 02 FF 03 00 01 4F'
+ '08 FF 03 4F 07 77 01 03 0E 38 01 07 0F 77 02 44'
+ '05 77 02 44 0B 77 02 44 05 77 02 44 10 77 04 00'
+ '02 77 03 00 0C 77 01 0F 0F FF 01 07 04 77 01 0F'
+ '06 FB 0B 00 08 77 00 04 03 30 0C 77 00 04 03 30'
+ '04 77 01 0F 0A FF 05 00 09 77 01 0F 03 FF 03 07'
+ '01 F0 05 07 03 00 02 44 05 77 06 00 04 77 03 44'
+ '04 77 04 44 03 77 00 05 07 FF E7 00 09 77 01 07'
+ '09 77 02 08 03 FF 03 77 02 80 03 77 01 17 06 77'
+ '01 17 06 77 01 0F 0C FF 05 00 01 70 00 00 0A 77'
+ '01 07 03 77 01 07 0A 77 01 0F 05 FF 01 4F 08 FF'
+ '02 44 08 77 01 08 02 83 0A 00 01 83 02 30 11 77'
+ '05 44 0F 77 05 44 11 77 04 00 04 77 03 00 0B 77'
+ '01 0F 0A FF 06 00 05 77 01 0F 04 FB 01 07 13 77'
+ '00 04 03 30 0C 77 00 04 03 30 04 77 01 0F 0E FF'
+ '01 07 09 77 01 0F 04 FF 08 07 00 05 77 04 47 00'
+ '05 77 05 00 05 77 03 44 04 77 04 44 03 77 00 05'
+ '07 7F E7 63 09 77 01 07 0A 77 02 00 04 77 02 00'
+ '04 77 01 17 06 77 01 17 06 77 01 0F 02 FF 08 00'
+ '01 FF 02 F0 05 77 00 00 09 77 02 00 03 77 02 00'
+ '09 77 01 0F 02 FF 03 00 0A 44 09 77 00 04 03 80'
+ '08 77 00 04 03 80 39 77 05 00 07 77 02 00 0A 77'
+ '01 0F 0A FF 01 0F 03 FF 01 07 07 77 04 00 0C 77'
+ '05 00 03 77 00 04 03 30 0C 77 00 04 03 30 04 77'
+ '01 0F 0A FF 05 00 09 77 07 00 05 70 04 77 02 44'
+ '05 77 04 00 07 77 03 44 02 77 04 44 05 77 00 06'
+ '07 FF EE 77 06 77 01 07 0D 77 04 00 06 77 01 17'
+ '0E 77 01 0F 0C FF 01 07 04 77 00 00 09 77 01 07'
+ '05 77 01 07 09 77 01 0F 08 FF 00 04 0F F0 0C 77'
+ '01 08 03 83 00 08 0B B0 0B B0 03 38 01 07 38 77'
+ '05 00 09 77 02 00 09 77 01 0F 0A FF 00 04 0F F0'
+ '19 77 04 00 03 77 00 04 03 30 0C 77 00 04 03 30'
+ '04 77 01 0F 0A FF 00 04 0F F0 11 77 04 07 05 77'
+ '02 44 05 77 03 00 09 77 07 44 06 77 01 08 02 88'
+ '03 FF 01 E7 04 77 02 80 17 77 01 17 03 77 01 17'
+ '0A 77 01 0F 02 FF 08 00 01 FF 02 F0 04 77 00 00'
+ '09 77 01 07 05 77 01 07 09 77 01 0F 08 FF 03 0F'
+ '0E 77 05 00 04 BB 05 00 38 77 05 00 0B 77 02 00'
+ '08 77 01 0F 0A FF 03 0F 1B 77 03 00 03 77 00 04'
+ '03 30 0C 77 04 00 04 77 01 0F 0A FF 03 0F 13 77'
+ '01 07 06 77 01 04 02 44 05 77 02 00 18 77 00 04'
+ '08 77 03 FF 00 04 77 80 18 77 01 17 03 77 02 11'
+ '0A 77 01 0F 0C FF 01 07 03 77 00 00 09 77 01 07'
+ '05 77 01 07 09 77 01 0F 08 FF 02 00 13 77 06 00'
+ '3B 77 05 00 0E 77 02 00 06 77 01 0F 0A FF 02 00'
+ '14 77 01 07 06 77 03 07 01 07 03 77 00 04 03 30'
+ '0C 77 00 04 07 F0 04 77 01 0F 0A FF 02 00 15 77'
+ '06 00 01 74 02 44 05 77 01 07 1A 77 02 00 05 77'
+ '02 00 1A 77 06 11 0A 77 0D 00 03 77 00 00 09 77'
+ '01 07 05 77 01 07 09 77 0A 00 55 77 04 00 17 77'
+ '0C 00 16 77 01 07 04 77 01 07 03 77 01 07 03 77'
+ '14 00 04 77 0C 00 41 77 05 00 1F 77 02 11 1B 77'
+ '00 00 B6 77 04 00 91 77 01 17 1C 77 00 00 FF 77'
+ '69 77 00 00 00 01'
+}
+
+/* BINRES idb_view_small.bmp */
+IDB_VIEW_SMALL BITMAP LOADONCALL DISCARDABLE
+{
+ '42 4D 36 10 00 00 00 00 00 00 36 04 00 00 28 00'
+ '00 00 C0 00 00 00 10 00 00 00 01 00 08 00 00 00'
+ '00 00 00 0C 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 C0 DC C0 00 F0 CA A6 00 04 04'
+ '04 00 08 08 08 00 0C 0C 0C 00 11 11 11 00 16 16'
+ '16 00 1C 1C 1C 00 22 22 22 00 29 29 29 00 55 55'
+ '55 00 4D 4D 4D 00 42 42 42 00 39 39 39 00 80 7C'
+ 'FF 00 50 50 FF 00 93 00 D6 00 FF EC CC 00 C6 D6'
+ 'EF 00 D6 E7 E7 00 90 A9 AD 00 00 00 33 00 00 00'
+ '66 00 00 00 99 00 00 00 CC 00 00 33 00 00 00 33'
+ '33 00 00 33 66 00 00 33 99 00 00 33 CC 00 00 33'
+ 'FF 00 00 66 00 00 00 66 33 00 00 66 66 00 00 66'
+ '99 00 00 66 CC 00 00 66 FF 00 00 99 00 00 00 99'
+ '33 00 00 99 66 00 00 99 99 00 00 99 CC 00 00 99'
+ 'FF 00 00 CC 00 00 00 CC 33 00 00 CC 66 00 00 CC'
+ '99 00 00 CC CC 00 00 CC FF 00 00 FF 66 00 00 FF'
+ '99 00 00 FF CC 00 33 00 00 00 33 00 33 00 33 00'
+ '66 00 33 00 99 00 33 00 CC 00 33 00 FF 00 33 33'
+ '00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33'
+ 'CC 00 33 33 FF 00 33 66 00 00 33 66 33 00 33 66'
+ '66 00 33 66 99 00 33 66 CC 00 33 66 FF 00 33 99'
+ '00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99'
+ 'CC 00 33 99 FF 00 33 CC 00 00 33 CC 33 00 33 CC'
+ '66 00 33 CC 99 00 33 CC CC 00 33 CC FF 00 33 FF'
+ '33 00 33 FF 66 00 33 FF 99 00 33 FF CC 00 33 FF'
+ 'FF 00 66 00 00 00 66 00 33 00 66 00 66 00 66 00'
+ '99 00 66 00 CC 00 66 00 FF 00 66 33 00 00 66 33'
+ '33 00 66 33 66 00 66 33 99 00 66 33 CC 00 66 33'
+ 'FF 00 66 66 00 00 66 66 33 00 66 66 66 00 66 66'
+ '99 00 66 66 CC 00 66 99 00 00 66 99 33 00 66 99'
+ '66 00 66 99 99 00 66 99 CC 00 66 99 FF 00 66 CC'
+ '00 00 66 CC 33 00 66 CC 99 00 66 CC CC 00 66 CC'
+ 'FF 00 66 FF 00 00 66 FF 33 00 66 FF 99 00 66 FF'
+ 'CC 00 CC 00 FF 00 FF 00 CC 00 99 99 00 00 99 33'
+ '99 00 99 00 99 00 99 00 CC 00 99 00 00 00 99 33'
+ '33 00 99 00 66 00 99 33 CC 00 99 00 FF 00 99 66'
+ '00 00 99 66 33 00 99 33 66 00 99 66 99 00 99 66'
+ 'CC 00 99 33 FF 00 99 99 33 00 99 99 66 00 99 99'
+ '99 00 99 99 CC 00 99 99 FF 00 99 CC 00 00 99 CC'
+ '33 00 66 CC 66 00 99 CC 99 00 99 CC CC 00 99 CC'
+ 'FF 00 99 FF 00 00 99 FF 33 00 99 CC 66 00 99 FF'
+ '99 00 99 FF CC 00 99 FF FF 00 CC 00 00 00 99 00'
+ '33 00 CC 00 66 00 CC 00 99 00 CC 00 CC 00 99 33'
+ '00 00 CC 33 33 00 CC 33 66 00 CC 33 99 00 CC 33'
+ 'CC 00 CC 33 FF 00 CC 66 00 00 CC 66 33 00 99 66'
+ '66 00 CC 66 99 00 CC 66 CC 00 99 66 FF 00 CC 99'
+ '00 00 CC 99 33 00 CC 99 66 00 CC 99 99 00 CC 99'
+ 'CC 00 CC 99 FF 00 CC CC 00 00 CC CC 33 00 CC CC'
+ '66 00 CC CC 99 00 CC CC CC 00 CC CC FF 00 CC FF'
+ '00 00 CC FF 33 00 99 FF 66 00 CC FF 99 00 CC FF'
+ 'CC 00 CC FF FF 00 CC 00 33 00 FF 00 66 00 FF 00'
+ '99 00 CC 33 00 00 FF 33 33 00 FF 33 66 00 FF 33'
+ '99 00 FF 33 CC 00 FF 33 FF 00 FF 66 00 00 FF 66'
+ '33 00 CC 66 66 00 FF 66 99 00 FF 66 CC 00 CC 66'
+ 'FF 00 FF 99 00 00 FF 99 33 00 FF 99 66 00 FF 99'
+ '99 00 FF 99 CC 00 FF 99 FF 00 FF CC 00 00 FF CC'
+ '33 00 FF CC 66 00 FF CC 99 00 FF CC CC 00 FF CC'
+ 'FF 00 FF FF 33 00 CC FF 66 00 FF FF 99 00 FF FF'
+ 'CC 00 66 66 FF 00 66 FF 66 00 66 FF FF 00 FF 66'
+ '66 00 FF 66 FF 00 FF FF 66 00 21 00 A5 00 5F 5F'
+ '5F 00 77 77 77 00 86 86 86 00 96 96 96 00 CB CB'
+ 'CB 00 B2 B2 B2 00 D7 D7 D7 00 DD DD DD 00 E3 E3'
+ 'E3 00 EA EA EA 00 F1 F1 F1 00 F8 F8 F8 00 F0 FB'
+ 'FF 00 A4 A0 A0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 00'
+ '00 00 00 00 00 07 07 07 07 04 04 04 07 07 07 07'
+ '07 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 04 04 04 07 07 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 07 07 92 92 92 92 92 92 92 92'
+ '92 92 92 92 92 07 07 07 07 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 07 07 07 00 07 00 07 00 07 00'
+ '07 00 07 00 07 00 07 07 6D 6D 6D 6D 6D 6D 6D 6D'
+ '6D 6D 6D 6D 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 FF 04 07 00 00 00'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
+ '00 07 00 00 00 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 01 01 01 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 01 01 01 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 01 01 01 07 00 00 00 00 00 00 00 00 07 07'
+ '07 07 01 01 01 07 07 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 92 07 07 07 07 00 07 EC EC EC EC EC'
+ 'EC EC EC EC EC 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 04 04 04 07 07 07 07 07 04 04 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 07 07 07 07 07 07'
+ '07 01 01 01 01 01 04 FF FF FF FF FF FF FF 04 07'
+ '07 01 01 01 01 01 07 07 07 07 07 07 07 07 07 07'
+ '07 01 01 01 01 01 00 FF FF FF FF FF FF 00 07 07'
+ '07 01 01 01 01 01 07 00 FF DD DD DD DD D6 D6 D6'
+ 'D6 D6 D6 00 92 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 EC 00 07 07 07 00 07 07 00 07 00 07'
+ '00 07 00 07 07 00 07 00 FF DD DD DD DD D6 D6 D6'
+ 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 FF FF 04 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 07 00 00 00 00 00 00 00 00 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 07 07'
+ '07 07 07 01 07 07 07 00 FF DD DD DD DD DD DD D6'
+ 'D6 D6 D6 00 92 07 07 07 07 00 07 EC EC EC EC EC'
+ 'EC EC EC EC EC 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 FF DD DD DD DD DD DD D6'
+ 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 FF FF 04 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 04 04'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 D6 D6 00 92 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 EC 00 07 07 07 00 07 07 00 07 00 07'
+ '00 07 00 07 07 00 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '04 FF 04 04 07 07 07 07 07 07 07 07 07 07 04 04'
+ '04 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
+ '00 07 00 00 00 07 07 07 07 04 04 04 04 07 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 FF 07 FF 07 FF 07 07 04 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 FB FF'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD 1F 1F 1F'
+ 'D6 D6 D6 00 92 07 00 07 07 00 07 EC EC EC EC EC'
+ 'EC EC 02 02 EC 00 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 FB D6 00 6D 07 07 00 00 00 00 00 00 07 07 07'
+ '04 04 04 07 07 07 07 07 07 07 07 07 07 07 04 FF'
+ '04 07 00 00 00 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 07 FF 01 FF 01 01 07 04 00'
+ '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 FF FB'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
+ '1F D6 D6 00 92 07 07 00 07 00 07 00 EC EC EC EC'
+ 'EC EC FA FA EC 00 07 07 07 00 07 07 07 07 07 07'
+ '00 07 00 07 07 00 07 00 FF DD DD DD DD DD DD DD'
+ 'D6 FB D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 04 04'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
+ '07 07 07 01 07 07 04 FF 07 01 07 01 07 FF 04 00'
+ '07 07 07 01 07 07 00 FF FF FF 00 00 00 00 FB FF'
+ '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
+ 'DD 1F D6 00 92 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 00 01 01 07 07 01 01 07 07 07 07'
+ '07 07 07 07 07 07 07 00 FF DD DD DD DD DD FB DD'
+ 'DD FB D6 92 FB 07 07 07 04 04 04 04 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
+ '07 07 07 01 07 07 04 07 01 01 FF 07 01 07 04 00'
+ '07 07 07 01 07 07 00 FF FF FF 00 FF 00 FB FF FB'
+ '04 07 07 01 07 07 07 00 FF FF FF FF FF FF FF FF'
+ 'FF 1F C3 00 07 07 00 00 07 07 00 00 00 00 00 00'
+ '00 00 00 00 00 00 07 01 01 01 01 07 07 00 07 00'
+ '07 00 07 00 07 00 07 00 FF FF FF FF FF FF FF FB'
+ 'FF FB C3 FB 07 07 07 07 04 FF FF 04 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
+ '00 07 00 00 00 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 01 07 07 04 FF 07 01 07 01 01 FF 04 00'
+ '07 07 07 01 07 07 00 FF FF FF 00 00 FB FF FB FF'
+ '04 07 07 01 07 07 07 00 D6 D6 D6 D6 D6 D6 D6 00'
+ '00 1F 00 00 07 07 07 07 00 07 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 01 01 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 00 D6 D6 D6 D6 D6 D6 D6 92'
+ 'FB FB FB 92 92 07 07 07 04 FF FF 04 07 07 07 07'
+ '07 07 07 07 07 07 07 04 04 04 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
+ '07 07 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 04 04 07 07 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 04 04 04 07'
+ '07 07 07 01 07 07 04 07 FF 07 FF 07 FF 07 04 00'
+ '07 07 07 01 07 07 00 00 00 00 00 FB FF 04 04 04'
+ '04 07 07 01 07 07 07 07 00 D6 D6 D6 D6 D6 00 07'
+ '07 1F 07 07 07 07 07 00 07 00 07 00 07 07 07 07'
+ '07 07 07 07 07 07 07 01 01 01 01 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 00 D6 D6 D6 D6 FB FB FB'
+ 'FB FB FB FB FB FB 07 07 04 FF 04 04 07 07 07 07'
+ '07 07 07 07 07 07 07 04 FF 04 07 00 00 00 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 FF FF 04 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 00'
+ '07 07 07 01 07 07 07 07 07 04 FB FF FB 04 FB 04'
+ '07 07 07 01 07 07 07 07 07 00 00 00 00 00 07 07'
+ '07 1F 07 07 07 07 00 07 07 07 07 07 00 07 07 07'
+ '07 07 07 07 07 07 01 01 07 07 01 01 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 00 00 00 00 00 07 92'
+ 'FB FB FB 92 07 07 07 07 04 04 04 07 07 07 07 07'
+ '07 07 07 07 07 07 07 04 04 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
+ '00 00 07 07 07 07 92 92 92 92 92 92 92 92 92 92'
+ '92 92 92 92 92 92 07 07 07 07 07 07 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 FF FF 04 07'
+ '07 07 07 01 07 07 04 FC 04 FC FC FC 04 FC 04 00'
+ '07 07 07 01 07 07 07 07 07 04 FF FB FF 04 04 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 1F'
+ '1F 1F 1F 1F 07 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 FF FB'
+ '07 FB 07 FB 92 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
+ '07 07 07 07 07 07 92 FF FF 92 FF FF FF FF 92 FF'
+ 'FF 92 FF FF FF 92 07 07 07 04 04 04 04 07 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 04 04 04 04 07'
+ '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
+ '07 07 07 01 07 07 07 07 07 04 04 04 04 04 07 07'
+ '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
+ '1F 1F 1F 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 FB 07'
+ '07 FB 07 07 FB 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 92 92 92 92 92 92 92 92 92 92'
+ '92 92 92 92 92 92 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 1F 07 07 07 07 07 07 07 00 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
+ '07 FB 07 07 07 07'
+}
+
+IDB_VIEW_LARGE BITMAP LOADONCALL MOVEABLE DISCARDABLE
+{
+ '42 4D DE 08 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 20 01 00 00 18 00 00 00 01 00 04 00 02 00'
+ '00 00 68 08 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 FE 77 22 77 00 00 78 77 0E 44'
+ '04 77 02 71 16 77 02 71 16 77 02 71 64 77 00 00'
+ '0C 77 02 70 08 00 08 77 04 44 0E 77 00 06 74 44'
+ '47 00 06 77 04 44 08 77 00 04 74 77 04 00 00 0E'
+ '07 00 07 00 07 00 07 00 08 77 06 44 06 77 02 71'
+ '04 77 02 4F 0A FF 02 F4 04 77 00 04 11 17 14 77'
+ '00 04 11 17 14 77 00 04 11 17 62 77 00 00 1E 77'
+ '00 04 4F F4 0E 77 00 06 74 FF 47 00 06 77 00 04'
+ '4F F4 24 77 00 0A 74 44 77 74 47 00 04 77 00 08'
+ '11 17 77 4F 0A FF 00 06 F4 77 71 00 04 11 12 77'
+ '02 71 04 11 12 77 02 71 04 11 00 04 77 70 16 00'
+ '30 77 12 00 02 07 04 77 00 00 0E 77 06 44 02 47'
+ '08 77 00 06 4F F4 70 00 06 00 06 77 00 06 74 FF'
+ '47 00 04 00 00 08 07 4F F4 70 04 00 00 06 77 74'
+ '77 00 04 00 00 0E 07 00 07 00 07 00 07 00 06 77'
+ '00 04 74 44 08 77 02 71 04 11 00 04 77 4F 0A FF'
+ '00 04 F4 77 06 11 02 17 10 77 06 11 02 17 10 77'
+ '06 11 00 04 17 70 14 BF 02 B0 04 77 12 00 02 07'
+ '04 77 14 07 02 0F 10 BF 02 07 04 77 00 00 0E 77'
+ '02 4F 04 FF 02 47 08 77 00 04 4F 44 0E 77 00 06'
+ '74 F4 47 00 06 77 00 04 4F 44 24 77 00 04 74 44'
+ '08 77 06 11 00 04 17 4F 0A FF 02 F4 04 77 02 71'
+ '16 77 02 71 16 77 02 71 04 77 02 70 14 FB 02 F0'
+ '04 77 02 07 10 88 02 07 18 77 02 0B 10 FB 02 07'
+ '04 77 00 00 0E 77 02 4F 04 FF 02 47 08 77 00 04'
+ '44 47 0E 77 00 04 74 44 08 77 00 04 44 47 08 77'
+ '00 04 74 77 04 00 00 0E 07 00 07 00 07 00 07 00'
+ '06 77 02 74 06 44 02 47 04 77 02 71 04 77 02 4F'
+ '0A FF 02 F4 04 77 02 71 16 77 02 71 04 77 02 74'
+ '08 44 02 47 06 77 02 71 04 77 02 70 14 BF 02 B0'
+ '04 77 02 07 0E 77 00 04 78 07 04 77 02 07 0E 70'
+ '00 06 77 07 0F 00 10 BF 02 07 04 77 00 00 0E 77'
+ '02 4F 04 FF 02 47 4E 77 00 0A 74 44 77 44 47 00'
+ '04 77 02 71 04 77 02 4F 0A FF 02 F4 04 77 02 71'
+ '16 77 02 71 04 77 02 74 08 FF 02 47 06 77 02 71'
+ '04 77 02 70 06 FB 0C 00 00 04 FB F0 04 77 02 07'
+ '10 88 02 07 18 77 02 0B 10 FB 02 07 04 77 00 00'
+ '0E 77 02 4F 04 FF 02 47 32 77 00 04 74 77 04 00'
+ '00 0E 07 00 07 00 07 00 07 00 06 77 00 0A 74 44'
+ '77 44 47 00 04 77 02 71 04 77 02 4F 0A FF 02 F4'
+ '04 77 02 71 08 77 0A 00 04 77 02 71 04 77 02 74'
+ '08 FF 02 47 06 77 02 71 04 77 02 70 06 BF 02 0F'
+ '0C BF 02 B0 04 77 02 07 0E 77 00 04 78 07 04 77'
+ '02 07 0E 70 00 06 77 07 0F 00 10 BF 02 07 04 77'
+ '00 00 0E 77 00 08 4F FF 44 47 1A 77 00 06 74 44'
+ '47 00 06 77 04 44 26 77 06 44 06 77 02 71 04 77'
+ '02 4F 0A FF 02 F4 04 77 02 71 06 77 02 74 08 44'
+ '02 40 04 77 02 71 04 77 02 74 08 FF 02 47 06 77'
+ '02 71 04 77 02 70 06 FB 02 0B 0C FB 02 F0 04 77'
+ '02 07 10 88 02 07 18 77 02 0B 10 FB 02 07 04 77'
+ '00 00 0E 77 00 06 4F FF 44 00 0E 77 00 06 74 44'
+ '47 00 08 77 00 06 74 FF 47 00 06 77 00 04 4F F4'
+ '08 77 00 04 74 77 04 00 00 0E 07 00 07 00 07 00'
+ '07 00 14 77 02 71 04 77 02 4F 0A FF 02 F4 04 77'
+ '02 71 06 77 02 74 08 F7 02 40 04 77 02 71 04 77'
+ '02 74 08 FF 04 44 00 06 47 77 71 00 04 77 02 70'
+ '06 BF 02 0F 0C BF 00 08 B0 07 77 07 10 88 02 07'
+ '04 77 02 07 10 77 00 04 07 0F 10 BF 02 07 04 77'
+ '00 00 02 77 08 00 00 04 07 77 04 44 02 47 0E 77'
+ '00 06 74 FF 47 00 08 77 00 06 74 FF 47 00 04 00'
+ '00 08 07 4F F4 70 04 00 2C 77 02 71 04 77 02 4F'
+ '0A FF 02 F4 04 77 02 71 06 77 02 74 08 7F 02 40'
+ '04 77 02 71 04 77 02 74 08 FF 00 0A 4F BF 47 77'
+ '71 00 04 77 00 06 70 FB F0 00 06 00 0A FB 00 0A'
+ 'F0 70 77 07 80 00 0A 88 00 10 82 28 07 71 17 77'
+ '71 17 06 77 04 70 04 77 02 0B 10 FB 00 06 07 77'
+ '07 00 00 00 22 77 00 06 74 FF 47 00 06 00 00 08'
+ '07 74 F4 47 06 77 00 04 4F 44 08 77 00 04 74 77'
+ '04 00 00 0E 07 00 07 00 07 00 07 00 14 77 02 71'
+ '04 77 02 4F 0A FF 02 F4 04 77 02 71 06 77 00 0C'
+ '74 F7 17 11 17 40 04 77 02 71 04 77 02 74 08 FF'
+ '00 0A 4B FB 47 77 71 00 04 77 02 70 04 BF 04 00'
+ '02 0F 0A BF 00 04 B0 77 04 07 02 08 0A 88 00 0E'
+ '8A A8 07 77 11 77 11 00 0E 77 00 04 07 0F 0C BF'
+ '00 0A B0 BF 07 70 77 00 00 00 00 04 77 74 06 44'
+ '18 77 00 06 74 F4 47 00 08 77 00 04 74 44 08 77'
+ '00 04 44 47 26 77 06 44 02 47 04 77 02 71 04 77'
+ '0E 44 04 77 02 71 06 77 00 0C 74 7F 1F 18 7F 40'
+ '04 77 02 71 04 77 02 74 08 FF 00 0A 4F BF 47 77'
+ '71 00 04 77 02 70 04 FB 00 04 F0 00 0C FB 00 08'
+ 'F0 77 70 00 0E 77 00 0C 78 07 77 71 11 17 10 77'
+ '02 0B 0E FB 02 0B 04 07 02 77 00 00 00 04 77 74'
+ '04 FF 02 F4 18 77 00 04 74 44 22 77 00 04 74 77'
+ '04 00 00 0E 07 00 07 00 07 00 07 00 06 77 00 0A'
+ '74 44 77 44 47 00 04 77 02 71 16 77 02 71 06 77'
+ '00 0C 74 F7 17 F1 87 40 04 77 02 71 04 77 02 74'
+ '04 FF 00 0E F4 44 4B FB 47 77 71 00 04 77 02 70'
+ '06 BF 02 0F 0C BF 00 08 B0 00 07 70 10 00 02 07'
+ '04 77 00 04 11 77 10 07 02 0F 0E BF 00 04 B0 00'
+ '04 77 00 00 00 04 77 74 04 FF 02 F4 5A 77 00 0A'
+ '74 44 77 44 47 00 04 77 02 71 16 77 02 71 06 77'
+ '00 0C 74 71 1F 7F 1F 40 04 77 02 71 04 77 02 74'
+ '04 FF 04 F4 04 BF 00 06 47 77 71 00 04 77 02 70'
+ '14 FB 00 04 F0 77 04 70 14 77 00 06 71 11 17 00'
+ '10 77 12 00 00 06 77 00 07 00 00 00 00 04 77 74'
+ '04 FF 02 F4 0E 77 00 06 74 44 47 00 12 77 00 06'
+ '74 44 47 00 06 77 04 44 08 77 00 04 74 77 04 00'
+ '00 0E 07 00 07 00 07 00 07 00 06 77 00 0A 74 44'
+ '77 44 47 00 04 77 02 71 0A 77 02 74 04 44 02 47'
+ '04 77 02 71 06 77 00 0C 74 F7 17 11 87 40 04 77'
+ '02 71 04 77 02 74 04 FF 00 04 F4 4B 04 FB 00 06'
+ '47 77 71 00 04 77 02 70 14 BF 00 04 B0 77 06 07'
+ '12 77 00 06 11 77 11 00 10 77 02 70 08 FB 02 07'
+ '04 77 04 70 04 77 00 00 00 04 77 74 04 FF 02 F4'
+ '0E 77 00 06 74 FF 47 00 12 77 00 06 74 FF 47 00'
+ '06 77 00 04 4F F4 24 77 00 0A 74 44 77 44 47 00'
+ '04 77 02 71 0A 77 02 74 04 FF 02 47 04 77 02 71'
+ '06 77 02 74 08 7F 02 40 04 77 02 71 04 77 02 74'
+ '06 44 06 BF 00 06 47 77 71 00 04 77 02 70 14 00'
+ '00 04 07 70 04 77 02 70 10 77 00 0A 71 17 77 71'
+ '17 00 10 77 02 0F 04 BF 02 B0 06 77 06 07 02 77'
+ '00 00 00 0A 77 74 FF F4 44 00 0E 77 00 06 74 FF'
+ '47 00 06 00 02 07 0A 77 00 06 74 FF 47 00 04 00'
+ '00 08 07 4F F4 70 04 00 00 04 77 74 14 44 08 77'
+ '06 44 02 47 04 77 02 71 0A 77 02 74 04 FF 02 47'
+ '04 77 02 71 06 77 02 74 08 F7 02 40 04 77 02 71'
+ '08 77 02 74 04 FB 00 0A F4 44 47 77 71 00 06 77'
+ '02 0F 08 BF 02 07 0A 77 00 0A 07 77 07 77 07 00'
+ '28 77 02 70 04 00 02 07 04 77 02 70 04 77 00 04'
+ '70 77 00 00 00 0A 77 74 FF F4 47 00 0E 77 00 06'
+ '74 F4 47 00 12 77 00 06 74 F4 47 00 06 77 00 04'
+ '4F 44 2A 77 00 04 44 47 04 77 02 71 0A 77 02 74'
+ '04 FF 02 47 04 77 02 71 06 77 02 74 08 44 02 40'
+ '04 77 02 71 08 77 02 74 04 BF 00 04 B4 F4 04 77'
+ '02 71 06 77 02 70 06 FB 02 F0 4A 77 00 0A 07 77'
+ '07 77 07 00 00 00 00 04 77 74 04 44 10 77 00 04'
+ '74 44 14 77 00 04 74 44 08 77 00 04 44 47 0C 77'
+ '04 00 00 08 70 00 70 00 0E 77 06 44 06 77 02 71'
+ '0A 77 02 74 04 FF 02 47 04 77 02 71 06 77 00 0C'
+ '74 CC 4C C4 CC 40 04 77 02 71 08 77 02 74 04 FB'
+ '00 04 F4 47 04 77 02 71 08 77 06 00 02 07 10 77'
+ '02 07 42 77 00 00 7E 77 02 74 04 44 02 47 04 77'
+ '02 71 06 77 02 74 08 44 02 47 04 77 02 71 08 77'
+ '02 74 06 44 06 77 02 71 5E 77 02 07 04 77 00 00'
+ 'FE 77 22 77 00 00 FE 77 22 77 00 00 00 01'
+}
+
+IDB_HIST_SMALL BITMAP LOADONCALL DISCARDABLE
+{
+ '42 4D 6C 02 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 50 00 00 00 10 00 00 00 01 00 04 00 02 00'
+ '00 00 F6 01 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 FF FF FF 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 00'
+ '00 00 80 80 80 00 C0 C0 C0 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 00 66 66 00 50 88 00 00 20 88 0E 66 02 68'
+ '04 88 0C 66 10 88 00 00 20 88 02 60 0C B0 02 68'
+ '04 88 02 60 08 B0 00 04 B6 88 0C 44 02 48 00 00'
+ '20 88 02 6B 04 0B 02 04 06 0B 02 68 04 88 00 04'
+ '6B 0B 06 4B 00 0A 06 88 40 00 40 00 06 00 02 48'
+ '00 00 08 88 02 86 0C 88 02 68 08 88 00 04 60 B0'
+ '06 B4 04 B0 02 68 04 88 00 14 60 B0 B4 44 B0 B6'
+ '88 40 00 40 06 00 02 48 00 00 08 88 02 66 0C 88'
+ '02 66 08 88 02 6B 04 0B 00 04 44 4B 04 0B 02 68'
+ '04 66 00 1C 6B 0B 44 B4 4B 06 88 40 60 40 06 66'
+ '00 48 00 00 06 88 00 04 86 66 0C 88 00 04 66 68'
+ '06 88 00 28 60 B0 44 40 44 40 B0 68 60 00 60 B0'
+ 'B4 44 B0 B6 88 40 00 40 06 00 02 48 00 00 06 88'
+ '04 66 0C 88 04 66 06 88 02 6B 04 0B 00 04 44 4B'
+ '04 0B 00 0A 68 60 44 6B 0B 00 06 4B 00 12 06 88'
+ '40 60 40 06 66 00 48 00 00 00 04 88 02 86 04 66'
+ '0C 88 04 66 02 68 04 88 00 04 60 B0 06 B4 04 B0'
+ '00 08 68 60 00 60 08 B0 00 0A B6 88 40 00 40 00'
+ '06 00 02 48 00 00 06 88 04 66 0C 88 04 66 06 88'
+ '02 6B 04 0B 02 04 06 0B 00 06 68 60 44 00 0C 66'
+ '00 10 88 40 60 40 06 66 00 48 00 00 06 88 00 04'
+ '86 66 0C 88 00 04 66 68 06 88 02 60 0C B0 00 08'
+ '68 60 00 06 04 B0 02 68 06 88 00 06 40 00 40 00'
+ '06 00 02 48 00 00 08 88 02 66 0C 88 02 66 08 88'
+ '0E 66 00 08 88 60 22 04 04 66 00 04 88 86 04 88'
+ '00 06 40 00 40 00 06 00 02 48 00 00 08 88 02 86'
+ '0C 88 02 68 08 88 02 86 04 B0 02 B6 08 88 00 04'
+ '60 22 04 00 00 06 68 88 86 00 04 88 0C 44 02 48'
+ '00 00 22 88 04 66 02 68 08 88 00 0C 60 22 04 40'
+ '68 86 04 66 02 88 0C 44 02 48 00 00 30 88 02 60'
+ '06 00 00 06 68 88 86 00 12 88 00 00 30 88 08 66'
+ '00 06 68 88 86 00 12 88 00 00 00 01'
+}
+
+IDB_HIST_LARGE BITMAP LOADONCALL DISCARDABLE
+{
+ '42 4D 60 04 00 00 00 00 00 00 76 00 00 00 28 00'
+ '00 00 78 00 00 00 18 00 00 00 01 00 04 00 02 00'
+ '00 00 EA 03 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 FF FF FF 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 00'
+ '00 00 80 80 80 00 C0 C0 C0 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 00 66 66 00 78 88 00 00 78 88 00 00 30 88'
+ '02 86 14 66 08 88 02 86 10 66 18 88 00 00 30 88'
+ '00 16 86 0B B0 BB 0B B0 BB 0B B0 BB 06 00 08 88'
+ '00 12 86 0B B0 BB 0B B0 BB 0B B6 00 18 88 00 00'
+ '30 88 00 16 86 0B B0 BB 0B B0 BB 0B B0 BB 06 00'
+ '08 88 00 12 86 0B B0 BB 0B B0 BB 0B B6 00 18 88'
+ '00 00 30 88 00 16 86 B0 0B 00 B0 04 00 B0 0B 00'
+ 'B6 00 08 88 00 12 86 B0 0B 44 B4 4B 44 B0 06 00'
+ '18 88 00 00 0E 88 02 68 10 88 00 04 86 68 0C 88'
+ '00 16 86 0B B0 BB 4B B4 BB 4B B0 BB 06 00 08 88'
+ '00 08 86 0B B0 BB 04 44 00 06 BB 0B B6 00 04 88'
+ '02 84 0C 44 02 48 04 88 00 00 0E 88 02 68 10 88'
+ '00 04 86 68 0C 88 00 16 86 0B B0 BB 4B B4 BB 4B'
+ 'B0 BB 06 00 08 88 00 08 86 0B B0 BB 04 44 00 06'
+ 'BB 0B B6 00 04 88 00 06 84 00 04 00 08 00 02 48'
+ '04 88 00 00 0C 88 00 04 66 68 10 88 00 04 86 66'
+ '0C 88 00 0A 86 B0 0B 00 B4 00 04 44 00 0C B0 0B'
+ '00 B6 88 86 06 66 00 10 B0 0B 44 4B B4 44 B0 06'
+ '04 88 00 06 84 00 04 00 08 00 02 48 04 88 00 00'
+ '0A 88 00 06 86 66 68 00 10 88 02 86 04 66 0A 88'
+ '00 06 86 0B B0 00 04 44 02 40 04 44 00 0A 40 BB'
+ '06 88 86 00 04 00 00 08 06 0B B0 BB 04 44 00 06'
+ 'BB 0B B6 00 04 88 00 08 84 06 04 00 04 66 00 04'
+ '00 48 04 88 00 00 0A 88 00 06 86 66 68 00 10 88'
+ '02 86 04 66 0A 88 00 06 86 0B B0 00 04 44 02 40'
+ '04 44 00 0A 40 BB 06 88 86 00 04 00 00 08 06 0B'
+ 'B0 BB 04 44 00 06 BB 0B B6 00 04 88 00 06 84 00'
+ '04 00 08 00 02 48 04 88 00 00 08 88 02 86 04 66'
+ '02 68 10 88 02 86 04 66 02 68 08 88 00 0A 86 B0'
+ '0B 00 B4 00 04 44 00 22 B0 0B 00 B6 88 86 04 44'
+ '46 B0 0B 44 B4 4B 44 B0 06 00 04 88 00 08 84 06'
+ '04 00 04 66 00 04 00 48 04 88 00 00 08 88 06 66'
+ '02 68 10 88 02 86 06 66 02 68 06 88 00 1A 86 0B'
+ 'B0 BB 4B B4 BB 4B B0 BB 06 88 86 00 04 00 00 12'
+ '06 0B B0 BB 0B B0 BB 0B B6 00 04 88 00 06 84 00'
+ '04 00 08 00 02 48 04 88 00 00 08 88 06 66 02 68'
+ '10 88 02 86 06 66 02 68 06 88 00 1A 86 0B B0 BB'
+ '4B B4 BB 4B B0 BB 06 88 86 00 04 00 00 12 06 0B'
+ 'B0 BB 0B B0 BB 0B B6 00 04 88 00 08 84 06 04 00'
+ '04 66 00 04 00 48 04 88 00 00 08 88 02 86 04 66'
+ '02 68 10 88 02 86 04 66 02 68 08 88 00 20 86 B0'
+ '0B 00 B0 04 00 B0 0B 00 B6 88 86 04 44 46 10 66'
+ '04 88 00 06 84 00 04 00 08 00 02 48 04 88 00 00'
+ '0A 88 00 06 86 66 68 00 10 88 02 86 04 66 0A 88'
+ '00 1A 86 0B B0 BB 0B B0 BB 0B B0 BB 06 88 86 00'
+ '06 00 00 08 6B B0 BB 06 0C 88 00 06 84 00 04 00'
+ '08 00 02 48 04 88 00 00 0A 88 00 06 86 66 68 00'
+ '10 88 02 86 04 66 0A 88 00 1A 86 0B B0 BB 0B B0'
+ 'BB 0B B0 BB 06 88 86 00 06 00 00 08 6B B0 BB 06'
+ '0C 88 02 84 0C 44 02 48 04 88 00 00 0C 88 00 04'
+ '66 68 10 88 00 04 86 66 0C 88 02 86 14 66 00 0C'
+ '88 86 02 22 00 46 04 66 02 68 04 88 02 68 06 88'
+ '02 84 0C 44 02 48 04 88 00 00 0E 88 02 68 10 88'
+ '00 04 86 68 0E 88 00 0A 6B B0 BB 0B B6 00 0C 88'
+ '00 06 86 02 22 00 06 00 02 68 06 88 02 68 1A 88'
+ '00 00 0E 88 02 68 10 88 00 04 86 68 0E 88 00 0A'
+ '6B B0 BB 0B B6 00 0C 88 00 06 86 02 22 00 06 00'
+ '02 68 06 88 02 68 1A 88 00 00 32 88 02 86 06 66'
+ '02 68 0C 88 00 12 86 02 22 00 44 40 68 88 86 00'
+ '06 66 14 88 00 04 87 88 00 00 48 88 02 86 0A 00'
+ '02 68 06 88 02 68 16 88 00 04 87 88 00 00 48 88'
+ '02 86 0A 00 02 68 06 88 02 68 1A 88 00 00 48 88'
+ '02 86 0A 66 02 68 06 88 02 68 1A 88 00 00 00 01'
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3 user32.dll)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "COMCTL32 System Dll\0"
+            VALUE "FileVersion", "4.72.3110.1\0"
+            VALUE "InternalName", "COMCTL32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "COMCTL32.DLL\0"
+            VALUE "ProductName", "Odin32 - COMCTL32\0"
+            VALUE "ProductVersion", "4.72.3110.1\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/comctl32/rsrc.rc
===================================================================
--- trunk/src/comctl32/rsrc.rc	(revision 3028)
+++ 	(revision )
@@ -1,963 +1,0 @@
-#include "winuser.h"
-#include "comctl32.h"
-#include "odinrsrc.h"
-
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 292, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
-FONT 8, "MS Sans Serif"
-BEGIN
-  DEFPUSHBUTTON "OK",     IDOK,72,138,50,14
-  PUSHBUTTON    "Cancel", IDCANCEL,127,138,50,14
-  PUSHBUTTON    "&Apply", IDC_APPLY_BUTTON,181,138,50,14
-  PUSHBUTTON    "Help",   IDHELP,235,138,50,14,WS_TABSTOP|WS_GROUP
-  CONTROL       "Tab",    IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_TABSTOP,7,7,278,125
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 292, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Sans Serif"
-BEGIN
-  DEFPUSHBUTTON "Finish",  IDC_FINISH_BUTTON,121,138,50,14
-  DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
-  PUSHBUTTON    "< &Back", IDC_BACK_BUTTON,71,138,50,14
-  PUSHBUTTON    "Cancel",  IDCANCEL,178,138,50,14
-  PUSHBUTTON    "Help",    IDHELP,235,138,50,14,WS_GROUP
-  LTEXT         "",        IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
-  CONTROL       "Tab",     IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Customize Toolbar"
-FONT 8, "MS Sans Serif"
-BEGIN
-  DEFPUSHBUTTON "&Close",     IDCANCEL,308,6,44,14
-  PUSHBUTTON    "R&eset",     IDC_RESET_BTN,308,23,44,14
-  PUSHBUTTON    "&Help",      IDC_HELP_BTN,308,40,44,14
-  PUSHBUTTON    "Move &Up",   IDC_MOVEUP_BTN,308,74,44,14
-  PUSHBUTTON    "Move &Down", IDC_MOVEDN_BTN,308,91,44,14
-  LTEXT         "A&vailable buttons:", -1,4,5,84,10
-  LISTBOX       IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-  PUSHBUTTON    "&Add ->",    IDOK, 131, 42, 44, 14
-  PUSHBUTTON    "<- &Remove", IDC_REMOVE_BTN,131,62,44,14
-  LTEXT         "&Toolbar buttons:", -1,182,5,78,10
-  LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-IDD_MCMONTHMENU MENU LOADONCALL DISCARDABLE
-{
-    POPUP ""
-    BEGIN
-        MENUITEM "&January", IDM_JAN
-        MENUITEM "&February", IDM_FEB
-        MENUITEM "&March", IDM_MAR
-        MENUITEM "&April", IDM_APR
-        MENUITEM "&May", IDM_MAY
-        MENUITEM "J&une", IDM_JUN
-        MENUITEM "Ju&ly", IDM_JUL
-        MENUITEM "Au&gust", IDM_AUG
-        MENUITEM "&September", IDM_SEP
-        MENUITEM "&October", IDM_OCT
-        MENUITEM "&November", IDM_NOV
-        MENUITEM "&December", IDM_DEC
-    END
-}
-
-IDT_CHECK BITMAP LOADONCALL DISCARDABLE
-{ 
- '42 4D 8E 01 00 00 00 00 00 00 5E 00 00 00 28 00'
- '00 00 1F 00 00 00 10 00 00 00 01 00 04 00 02 00'
- '00 00 30 01 00 00 01 00 00 00 01 00 00 00 0A 00'
- '00 00 0A 00 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 80 00 00 00 C0 C0 C0 00 80 80 80 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF FF FF 00 1F 99'
- '00 00 01 99 0D 11 02 99 0E 11 01 99 00 00 01 99'
- '0D 11 02 99 0E 11 01 99 00 00 01 99 02 11 09 99'
- '02 11 02 99 02 11 0A 99 02 11 01 99 00 00 01 99'
- '02 11 09 99 02 11 02 99 02 11 0A 99 02 11 01 99'
- '00 00 01 99 02 11 09 99 02 11 02 99 02 11 03 99'
- '02 00 05 99 02 11 01 99 00 00 01 99 02 11 09 99'
- '02 11 02 99 02 11 03 99 03 00 04 99 02 11 01 99'
- '00 00 01 99 02 11 09 99 02 11 02 99 02 11 02 99'
- '04 00 04 99 02 11 01 99 00 00 01 99 02 11 09 99'
- '02 11 02 99 02 11 01 99 02 00 02 99 02 00 03 99'
- '02 11 01 99 00 00 01 99 02 11 09 99 02 11 02 99'
- '02 11 02 00 04 99 02 00 02 99 02 11 01 99 00 00'
- '01 99 02 11 09 99 02 11 02 99 02 11 01 00 06 99'
- '02 00 01 99 02 11 01 99 00 00 01 99 02 11 09 99'
- '02 11 02 99 02 11 07 99 02 00 01 99 01 00 01 11'
- '01 99 00 00 01 99 02 11 09 99 02 11 02 99 02 11'
- '08 99 01 00 01 99 01 00 01 11 01 99 00 00 01 99'
- '0D 11 02 99 0A 11 02 00 02 11 01 99 00 00 01 99'
- '0D 11 02 99 0E 11 01 99 00 00 1F 99 00 01'
-}
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_CLOSE    "Close"
-}
-
-IDB_STD_SMALL BITMAP LOADONCALL DISCARDABLE
-{
- '42 4D 20 07 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 F0 00 00 00 10 00 00 00 01 00 04 00 02 00'
- '00 00 AA 06 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 FF FF FF 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 00'
- '00 00 80 80 80 00 C0 C0 C0 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 00 66 66 00 CC 88 02 44 22 88 00 00 04 88'
- '00 04 84 48 1E 88 0A 44 52 88 0C 66 02 68 0C 66'
- '02 88 0E 66 08 88 00 04 86 68 12 88 04 84 02 48'
- '08 88 02 44 08 88 0A 66 00 04 68 88 00 00 04 88'
- '00 08 48 84 88 44 0A 88 02 84 08 44 02 86 04 66'
- '02 40 06 00 02 04 22 88 02 86 0A 88 00 04 68 88'
- '0A 66 00 04 68 88 0A 66 02 68 04 88 00 04 86 33'
- '06 66 00 08 88 63 68 60 08 00 00 08 06 86 66 60'
- '08 00 02 06 08 88 00 04 86 68 12 88 00 06 48 44'
- '48 00 06 88 00 04 84 44 06 88 02 86 08 88 04 86'
- '02 88 00 00 04 88 02 48 04 84 00 04 88 48 08 88'
- '02 84 06 00 00 04 04 67 04 37 02 40 06 66 02 04'
- '22 88 00 04 66 68 0C 88 02 60 08 00 00 06 68 88'
- '66 00 08 33 02 36 04 88 00 04 86 33 06 66 00 08'
- '88 63 68 60 06 00 06 66 00 08 68 60 66 06 04 66'
- '02 06 08 88 02 66 04 88 00 04 44 48 0A 88 04 84'
- '02 44 04 88 04 66 00 04 44 48 06 88 0C 66 04 68'
- '00 00 04 88 02 48 04 84 00 04 88 48 08 88 00 04'
- '84 06 04 66 00 04 04 63 04 73 02 40 06 00 02 04'
- '22 88 04 66 06 88 02 86 04 88 02 60 08 00 00 08'
- '68 88 6B 63 08 33 00 08 68 88 86 33 06 66 00 08'
- '88 63 68 60 04 00 00 0C 06 78 87 66 88 60 08 00'
- '02 06 04 88 00 06 68 88 66 00 04 88 00 04 44 48'
- '06 88 04 66 00 10 48 44 48 88 86 78 07 64 04 88'
- '00 06 18 88 68 00 04 88 00 0A 8B BB 88 66 68 00'
- '00 00 04 88 00 0E 84 44 84 88 48 88 86 00 04 66'
- '02 64 06 00 00 04 04 67 04 37 00 06 40 66 60 00'
- '04 44 0C 88 02 48 04 88 02 84 0E 88 00 04 86 66'
- '06 88 02 68 04 88 02 60 08 00 00 08 68 88 60 B6'
- '08 33 00 08 36 88 86 33 08 66 00 06 63 68 60 00'
- '04 00 00 10 67 88 E7 76 88 60 66 06 04 66 02 06'
- '04 88 00 06 66 86 68 00 0C 88 00 0A 66 88 80 74'
- '44 00 04 88 00 12 67 88 80 76 88 81 18 88 68 00'
- '04 88 00 06 87 77 88 00 04 68 00 00 06 88 04 84'
- '02 44 04 88 02 86 04 00 00 04 04 06 04 66 00 04'
- '04 63 04 73 02 40 04 00 00 06 40 48 88 00 04 44'
- '02 48 04 88 02 48 04 88 02 84 04 88 02 84 04 44'
- '06 88 00 0A 66 68 88 86 68 00 04 88 02 60 08 00'
- '00 0A 68 88 6B 0B 63 00 08 33 00 04 68 86 0C 33'
- '00 04 68 60 04 00 00 0C 68 88 87 86 88 60 08 00'
- '02 06 04 88 04 66 02 68 04 88 00 0A 44 48 88 86'
- '78 00 04 88 00 04 07 68 04 88 02 68 04 88 00 04'
- '06 88 04 11 02 18 0C 66 00 04 68 86 00 00 06 88'
- '00 04 84 64 06 88 00 08 86 06 66 64 06 00 00 04'
- '04 67 04 37 02 40 04 00 02 44 04 88 04 44 06 88'
- '02 84 04 88 02 48 06 88 04 44 06 88 00 08 86 66'
- '88 66 06 88 02 60 08 00 00 0A 68 88 60 B0 B6 00'
- '0A 66 00 04 86 33 08 66 00 06 33 68 60 00 04 00'
- '00 0C 68 E8 87 86 88 60 06 00 00 04 60 06 04 88'
- '08 66 00 0A 88 44 48 88 86 00 06 88 00 04 80 68'
- '04 88 00 12 68 0E 88 86 88 81 18 81 68 00 08 88'
- '06 86 00 00 08 88 02 68 06 88 02 86 04 00 00 06'
- '04 06 60 00 04 44 02 63 04 73 06 44 02 46 04 88'
- '00 04 44 48 06 88 02 84 04 88 02 48 06 88 00 04'
- '84 44 08 88 04 66 02 68 06 88 02 60 08 00 00 06'
- '68 88 6B 00 08 0B 02 68 04 88 00 04 86 36 08 88'
- '00 06 63 68 60 00 04 00 00 16 67 EE 87 76 88 60'
- '66 00 06 86 06 00 04 88 06 66 00 0C 68 88 84 44'
- '88 68 08 88 02 86 04 88 00 08 67 00 88 76 04 88'
- '00 06 18 81 86 00 08 66 04 68 02 66 00 00 06 88'
- '00 04 86 66 06 88 00 08 86 06 66 64 04 00 00 06'
- '40 48 67 00 0A 37 02 36 04 88 00 04 44 84 06 88'
- '02 84 04 88 02 48 06 88 00 04 48 44 08 88 00 04'
- '86 66 08 88 02 60 08 00 00 06 68 88 60 00 08 B0'
- '02 68 04 88 00 04 86 36 08 88 00 06 63 68 60 00'
- '04 00 00 10 06 78 87 68 88 60 68 60 04 68 00 06'
- '66 68 44 00 06 66 06 88 00 06 44 48 68 00 08 88'
- '02 86 04 88 00 08 86 78 87 68 06 88 00 06 81 88'
- '60 00 06 00 02 06 04 86 00 00 06 88 04 86 06 88'
- '02 86 04 00 02 04 04 00 00 08 44 88 63 76 06 66'
- '00 04 67 76 04 88 00 06 48 88 44 00 04 88 02 48'
- '04 88 02 84 04 88 00 06 44 88 84 00 08 88 04 66'
- '02 68 06 88 02 60 08 00 00 08 68 88 6B 0B 06 66'
- '02 68 04 88 00 04 86 36 08 88 00 06 63 68 60 00'
- '06 00 04 66 04 88 00 04 60 06 06 86 00 06 88 86'
- '44 00 04 66 00 10 68 84 44 88 84 44 68 0E 06 88'
- '02 86 06 88 04 66 00 04 88 81 08 88 00 04 86 06'
- '04 66 00 06 06 66 68 00 00 00 06 88 00 06 66 86'
- '68 00 04 88 00 08 86 06 60 64 04 44 00 08 48 88'
- '67 76 06 88 00 04 67 36 0A 88 04 44 08 88 04 44'
- '0C 88 00 08 86 66 88 66 06 88 02 60 04 00 00 0C'
- '06 66 68 88 86 66 08 88 00 08 66 68 86 36 08 88'
- '00 06 63 68 60 00 08 00 02 06 04 88 04 66 06 68'
- '04 88 02 44 04 66 00 10 88 84 44 88 84 44 68 0E'
- '06 88 02 86 0C 88 00 06 81 88 18 00 04 88 02 86'
- '08 00 00 04 68 88 00 00 06 88 00 06 68 88 68 00'
- '04 88 02 86 04 00 00 04 60 68 06 88 00 0E 63 73'
- '6B 66 B6 73 76 00 24 88 00 0C 86 66 68 88 86 68'
- '04 88 02 60 04 00 04 06 10 88 00 08 86 68 86 36'
- '08 88 00 06 66 68 60 00 06 00 04 66 08 88 04 86'
- '06 88 00 18 44 66 68 88 84 44 88 84 44 86 00 EE'
- '04 88 02 68 0C 88 00 06 81 88 11 00 06 88 02 60'
- '04 66 00 06 60 68 88 00 00 00 06 88 00 06 68 88'
- '68 00 04 88 02 86 04 00 02 66 08 88 02 86 04 66'
- '02 BB 04 66 02 68 24 88 04 66 06 88 02 66 04 88'
- '02 60 04 00 00 04 06 68 0C 88 00 04 68 88 04 68'
- '00 04 86 36 08 88 04 68 02 60 06 00 04 68 0A 88'
- '02 68 04 88 00 06 86 44 66 00 06 88 06 44 00 0E'
- '48 86 70 00 88 87 68 00 0E 88 04 11 02 18 04 88'
- '02 60 06 00 00 04 06 88 00 00 06 88 00 06 68 88'
- '68 00 04 88 02 86 04 66 02 68 0C 88 00 06 86 66'
- '68 00 28 88 00 04 66 68 08 88 00 04 68 88 08 66'
- '0E 88 00 04 86 66 04 88 02 86 0C 66 00 04 68 60'
- '06 00 02 66 0C 88 02 86 04 66 00 06 68 44 68 00'
- '06 88 02 84 04 44 04 88 02 66 04 88 02 66 12 88'
- '02 11 06 88 02 86 08 66 02 88 00 00 90 88 08 66'
- '02 68 2A 88 04 66 14 88 02 18 12 88 00 00 00 01'
-}
-
-IDB_STD_LARGE BITMAP LOADONCALL DISCARDABLE
-{
- '42 4D D6 0A 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 68 01 00 00 18 00 00 00 01 00 04 00 02 00'
- '00 00 60 0A 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 80'
- '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 FF 77 69 77 00 00 07 77 03 44'
- 'FF 77 5F 77 00 00 06 77 01 47 03 77 01 47 14 77'
- '0E 44 5F 77 01 07 06 77 11 00 1F 77 12 00 19 77'
- '02 00 03 77 10 00 30 77 02 44 10 77 02 44 0C 77'
- '10 00 05 77 00 00 06 77 01 47 03 77 01 47 04 77'
- '03 44 0D 77 01 4F 0C FF 01 47 0D 77 0B 44 34 77'
- '04 00 16 77 01 0F 0F FF 01 07 04 77 11 00 09 77'
- '01 03 03 33 09 00 03 77 00 04 03 30 04 77 10 00'
- '03 77 03 00 03 77 01 0F 0E FF 01 07 0E 77 03 00'
- '1E 77 03 47 01 47 0E 77 03 47 01 47 0A 77 01 07'
- '0E 77 04 07 03 77 00 00 06 77 01 47 03 77 01 47'
- '03 77 01 47 03 77 01 47 0C 77 01 4F 0C FF 01 47'
- '0D 77 01 4F 09 FF 01 47 34 77 05 00 0D 77 01 07'
- '07 77 01 0F 0F FF 01 07 04 77 02 00 0F 33 01 07'
- '08 77 01 03 03 33 09 00 03 77 00 04 03 30 04 77'
- '01 0F 0E FF 01 07 02 77 04 00 03 77 01 0F 0E FF'
- '01 07 0E 77 03 00 04 77 03 44 16 77 03 47 02 44'
- '0D 77 03 47 02 44 0A 77 01 07 0E 77 02 07 03 70'
- '02 77 00 00 06 77 01 47 03 77 01 47 03 77 01 47'
- '03 77 01 47 0C 77 01 4F 02 FF 08 00 01 FF 02 F4'
- '0D 77 02 4F 07 00 02 F4 34 77 05 00 0C 77 01 07'
- '08 77 01 0F 0F FF 01 07 04 77 03 0F 0F 33 01 07'
- '07 77 01 03 03 33 09 00 03 77 00 04 03 30 04 77'
- '01 0F 0A FF 0A 00 04 77 00 04 0F F0 03 0F 06 00'
- '01 FF 02 F0 0D 77 03 00 04 77 05 44 14 77 03 47'
- '02 44 0D 77 03 47 02 44 0A 77 12 00 01 77 03 70'
- '01 70 00 00 06 77 01 47 03 77 01 47 03 77 01 47'
- '03 77 01 47 06 77 06 00 01 4F 0C FF 01 47 06 77'
- '07 00 01 4F 09 FF 01 47 35 77 05 00 0A 77 02 00'
- '08 77 01 0F 0F FF 01 07 04 77 00 04 0B F0 0F 33'
- '01 07 06 77 01 03 03 33 09 00 03 77 00 04 03 30'
- '04 77 01 0F 09 FF 02 08 03 77 01 80 04 00 05 77'
- '01 0F 0E FF 01 07 07 77 01 07 05 77 03 00 05 77'
- '03 44 14 77 03 47 02 44 09 77 04 00 03 47 02 44'
- '0B 77 01 07 10 77 01 00 02 07 03 70 00 00 07 77'
- '04 44 03 77 01 47 03 77 01 47 06 77 01 0F 05 FF'
- '01 4F 02 FF 08 00 01 FF 02 F4 05 77 01 03 07 38'
- '02 4F 07 00 02 F4 12 77 02 44 0D 77 02 44 13 77'
- '04 00 09 77 02 00 09 77 01 0F 0F FF 01 07 04 77'
- '01 0F 03 FB 01 03 0F 33 01 07 05 77 01 03 03 33'
- '09 00 03 77 00 04 03 30 04 77 01 0F 08 FF 00 0A'
- '08 77 EE 88 00 77 06 77 00 04 0F F0 03 0F 06 00'
- '01 FF 02 F0 07 77 02 00 03 77 03 00 15 77 05 00'
- '01 77 04 74 02 44 08 77 02 00 03 77 02 F8 03 44'
- '0C 77 01 07 0B 77 03 BB 01 77 07 70 00 00 0A 77'
- '01 47 03 77 04 44 07 77 01 0F 05 FF 01 4F 0C FF'
- '01 47 05 77 01 08 07 83 01 4F 09 FF 01 47 14 77'
- '01 47 0B 77 01 47 16 77 04 00 07 77 03 00 09 77'
- '01 0F 0F FF 01 07 04 77 01 0B 04 BF 01 03 0F 33'
- '01 07 04 77 01 03 03 33 0D 00 01 33 02 30 04 77'
- '01 0F 07 FF 02 08 05 77 00 04 E7 80 06 77 01 0F'
- '0E FF 01 07 07 77 03 00 02 77 03 00 06 77 03 44'
- '0A 77 02 00 05 77 01 00 02 07 03 44 08 77 02 08'
- '05 77 01 F8 02 80 0D 77 01 07 0B 77 03 88 01 77'
- '03 70 02 70 02 07 00 00 0A 77 01 44 03 47 01 47'
- '0A 77 01 0F 02 FF 03 00 01 4F 02 FF 08 00 01 FF'
- '02 F4 05 77 01 03 07 38 02 4F 03 00 02 FF 04 44'
- '06 77 06 44 09 77 01 47 09 77 01 47 09 77 06 44'
- '09 77 04 00 05 77 03 00 0A 77 01 0F 0F FF 01 07'
- '04 77 01 0F 05 FB 01 03 0F 33 01 07 03 77 01 03'
- '12 33 01 07 04 77 01 0F 07 FF 01 07 06 77 02 8E'
- '03 70 05 77 00 04 0F F0 03 0F 06 00 01 FF 02 F0'
- '07 77 07 00 07 77 03 44 09 77 02 08 05 77 01 FF'
- '02 F8 03 44 09 77 01 07 07 77 02 F0 06 77 01 17'
- '06 77 13 00 01 77 03 70 00 00 0B 77 04 47 0A 77'
- '01 0F 05 FF 01 4F 0C FF 01 47 05 77 01 08 07 83'
- '01 4F 06 FF 03 4F 07 77 05 44 0B 77 01 47 07 77'
- '01 47 0B 77 05 44 0A 77 04 00 03 77 03 00 0B 77'
- '01 0F 0F FF 01 07 04 77 01 0B 06 BF 01 03 0F 33'
- '00 04 07 70 12 33 01 07 04 77 01 0F 07 FF 01 07'
- '06 77 02 8E 03 70 05 77 01 0F 0E FF 01 07 07 77'
- '0B 00 03 77 03 44 08 77 02 08 08 77 01 F8 02 80'
- '09 77 01 07 0A 77 01 07 04 77 02 11 06 77 01 07'
- '10 77 04 07 02 70 00 00 0B 77 03 40 0B 77 01 0F'
- '02 FF 03 00 01 4F 02 FF 08 00 01 FF 02 F4 05 77'
- '01 03 07 38 01 4F 06 FF 02 44 08 77 04 44 0C 77'
- '01 47 07 77 01 47 0C 77 04 44 0B 77 04 00 01 70'
- '03 00 0C 77 01 0F 0F FF 01 07 04 77 01 0F 07 FB'
- '10 00 01 77 02 70 03 33 0C 00 03 33 01 07 04 77'
- '01 0F 07 FF 01 07 03 7E 03 77 02 87 03 70 05 77'
- '00 04 0F F0 03 0F 06 00 01 FF 02 F0 07 77 0A 00'
- '05 77 03 44 07 77 01 07 0A 77 02 F0 09 77 01 07'
- '0A 77 01 07 03 77 06 11 04 77 01 07 0F 77 02 07'
- '04 70 00 00 0C 77 01 07 0C 77 01 0F 05 FF 01 4F'
- '0C FF 01 47 05 77 01 08 07 83 08 44 09 77 04 44'
- '0C 77 01 47 07 77 01 47 0C 77 04 44 0C 77 06 00'
- '0D 77 01 0F 0F FF 01 07 04 77 01 0B 10 BF 01 07'
- '08 77 00 04 03 30 0C 77 00 04 03 30 04 77 01 0F'
- '07 FF 01 08 02 8E 04 77 03 87 01 07 06 77 01 0F'
- '0E FF 01 07 07 77 09 00 07 77 03 44 05 77 01 07'
- '0B 77 01 F7 03 70 07 77 00 04 07 FE 07 77 01 07'
- '04 77 02 11 03 77 01 17 04 77 0F 00 03 70 02 70'
- '01 00 00 00 0B 77 03 00 0B 77 01 0F 02 FF 03 00'
- '01 4F 02 FF 04 00 02 FF 05 44 05 77 01 03 0E 38'
- '01 07 09 77 01 44 02 47 03 74 0A 77 01 47 07 77'
- '01 47 0B 77 00 05 47 74 47 88 0D 77 04 00 0E 77'
- '01 0F 0F FF 01 07 04 77 01 0F 10 FB 01 07 08 77'
- '00 04 03 30 0C 77 00 04 03 30 04 77 01 0F 08 FF'
- '00 09 08 EE 77 88 07 68 07 77 01 0F 09 FF 01 0F'
- '04 FF 01 07 07 77 08 00 02 77 03 44 04 77 03 44'
- '04 77 01 07 03 7F 0A 77 01 07 08 77 00 04 07 FE'
- '07 77 01 07 05 77 01 17 03 77 01 17 05 77 01 0F'
- '0C FF 01 00 04 07 02 70 00 00 0B 77 04 07 0A 77'
- '01 0F 05 FF 01 4F 08 FF 00 04 4F F4 06 77 01 08'
- '0E 83 01 07 09 77 01 47 04 77 01 47 09 77 01 47'
- '09 77 01 47 09 77 01 47 04 77 01 47 0C 77 06 00'
- '0D 77 01 0F 0F FF 01 07 04 77 01 0B 10 BF 01 07'
- '08 77 00 04 03 30 0C 77 00 04 03 30 04 77 01 0F'
- '09 FF 02 08 03 77 02 80 08 77 01 0F 03 FF 02 00'
- '03 FF 03 07 03 FF 01 07 07 77 07 00 03 77 03 44'
- '04 77 04 44 03 77 00 04 07 FE 0A 77 01 07 09 77'
- '00 05 0F FE E7 88 04 77 01 07 0A 77 01 17 05 77'
- '01 0F 02 FF 08 00 02 FF 03 00 04 70 00 00 0A 77'
- '01 00 03 07 01 07 0A 77 01 0F 02 FF 03 00 01 4F'
- '08 FF 03 4F 07 77 01 03 0E 38 01 07 0F 77 02 44'
- '05 77 02 44 0B 77 02 44 05 77 02 44 10 77 04 00'
- '02 77 03 00 0C 77 01 0F 0F FF 01 07 04 77 01 0F'
- '06 FB 0B 00 08 77 00 04 03 30 0C 77 00 04 03 30'
- '04 77 01 0F 0A FF 05 00 09 77 01 0F 03 FF 03 07'
- '01 F0 05 07 03 00 02 44 05 77 06 00 04 77 03 44'
- '04 77 04 44 03 77 00 05 07 FF E7 00 09 77 01 07'
- '09 77 02 08 03 FF 03 77 02 80 03 77 01 17 06 77'
- '01 17 06 77 01 0F 0C FF 05 00 01 70 00 00 0A 77'
- '01 07 03 77 01 07 0A 77 01 0F 05 FF 01 4F 08 FF'
- '02 44 08 77 01 08 02 83 0A 00 01 83 02 30 11 77'
- '05 44 0F 77 05 44 11 77 04 00 04 77 03 00 0B 77'
- '01 0F 0A FF 06 00 05 77 01 0F 04 FB 01 07 13 77'
- '00 04 03 30 0C 77 00 04 03 30 04 77 01 0F 0E FF'
- '01 07 09 77 01 0F 04 FF 08 07 00 05 77 04 47 00'
- '05 77 05 00 05 77 03 44 04 77 04 44 03 77 00 05'
- '07 7F E7 63 09 77 01 07 0A 77 02 00 04 77 02 00'
- '04 77 01 17 06 77 01 17 06 77 01 0F 02 FF 08 00'
- '01 FF 02 F0 05 77 00 00 09 77 02 00 03 77 02 00'
- '09 77 01 0F 02 FF 03 00 0A 44 09 77 00 04 03 80'
- '08 77 00 04 03 80 39 77 05 00 07 77 02 00 0A 77'
- '01 0F 0A FF 01 0F 03 FF 01 07 07 77 04 00 0C 77'
- '05 00 03 77 00 04 03 30 0C 77 00 04 03 30 04 77'
- '01 0F 0A FF 05 00 09 77 07 00 05 70 04 77 02 44'
- '05 77 04 00 07 77 03 44 02 77 04 44 05 77 00 06'
- '07 FF EE 77 06 77 01 07 0D 77 04 00 06 77 01 17'
- '0E 77 01 0F 0C FF 01 07 04 77 00 00 09 77 01 07'
- '05 77 01 07 09 77 01 0F 08 FF 00 04 0F F0 0C 77'
- '01 08 03 83 00 08 0B B0 0B B0 03 38 01 07 38 77'
- '05 00 09 77 02 00 09 77 01 0F 0A FF 00 04 0F F0'
- '19 77 04 00 03 77 00 04 03 30 0C 77 00 04 03 30'
- '04 77 01 0F 0A FF 00 04 0F F0 11 77 04 07 05 77'
- '02 44 05 77 03 00 09 77 07 44 06 77 01 08 02 88'
- '03 FF 01 E7 04 77 02 80 17 77 01 17 03 77 01 17'
- '0A 77 01 0F 02 FF 08 00 01 FF 02 F0 04 77 00 00'
- '09 77 01 07 05 77 01 07 09 77 01 0F 08 FF 03 0F'
- '0E 77 05 00 04 BB 05 00 38 77 05 00 0B 77 02 00'
- '08 77 01 0F 0A FF 03 0F 1B 77 03 00 03 77 00 04'
- '03 30 0C 77 04 00 04 77 01 0F 0A FF 03 0F 13 77'
- '01 07 06 77 01 04 02 44 05 77 02 00 18 77 00 04'
- '08 77 03 FF 00 04 77 80 18 77 01 17 03 77 02 11'
- '0A 77 01 0F 0C FF 01 07 03 77 00 00 09 77 01 07'
- '05 77 01 07 09 77 01 0F 08 FF 02 00 13 77 06 00'
- '3B 77 05 00 0E 77 02 00 06 77 01 0F 0A FF 02 00'
- '14 77 01 07 06 77 03 07 01 07 03 77 00 04 03 30'
- '0C 77 00 04 07 F0 04 77 01 0F 0A FF 02 00 15 77'
- '06 00 01 74 02 44 05 77 01 07 1A 77 02 00 05 77'
- '02 00 1A 77 06 11 0A 77 0D 00 03 77 00 00 09 77'
- '01 07 05 77 01 07 09 77 0A 00 55 77 04 00 17 77'
- '0C 00 16 77 01 07 04 77 01 07 03 77 01 07 03 77'
- '14 00 04 77 0C 00 41 77 05 00 1F 77 02 11 1B 77'
- '00 00 B6 77 04 00 91 77 01 17 1C 77 00 00 FF 77'
- '69 77 00 00 00 01'
-}
-
-/* BINRES idb_view_small.bmp */
-IDB_VIEW_SMALL BITMAP LOADONCALL DISCARDABLE
-{
- '42 4D 36 10 00 00 00 00 00 00 36 04 00 00 28 00'
- '00 00 C0 00 00 00 10 00 00 00 01 00 08 00 00 00'
- '00 00 00 0C 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
- '00 00 C0 C0 C0 00 C0 DC C0 00 F0 CA A6 00 04 04'
- '04 00 08 08 08 00 0C 0C 0C 00 11 11 11 00 16 16'
- '16 00 1C 1C 1C 00 22 22 22 00 29 29 29 00 55 55'
- '55 00 4D 4D 4D 00 42 42 42 00 39 39 39 00 80 7C'
- 'FF 00 50 50 FF 00 93 00 D6 00 FF EC CC 00 C6 D6'
- 'EF 00 D6 E7 E7 00 90 A9 AD 00 00 00 33 00 00 00'
- '66 00 00 00 99 00 00 00 CC 00 00 33 00 00 00 33'
- '33 00 00 33 66 00 00 33 99 00 00 33 CC 00 00 33'
- 'FF 00 00 66 00 00 00 66 33 00 00 66 66 00 00 66'
- '99 00 00 66 CC 00 00 66 FF 00 00 99 00 00 00 99'
- '33 00 00 99 66 00 00 99 99 00 00 99 CC 00 00 99'
- 'FF 00 00 CC 00 00 00 CC 33 00 00 CC 66 00 00 CC'
- '99 00 00 CC CC 00 00 CC FF 00 00 FF 66 00 00 FF'
- '99 00 00 FF CC 00 33 00 00 00 33 00 33 00 33 00'
- '66 00 33 00 99 00 33 00 CC 00 33 00 FF 00 33 33'
- '00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33'
- 'CC 00 33 33 FF 00 33 66 00 00 33 66 33 00 33 66'
- '66 00 33 66 99 00 33 66 CC 00 33 66 FF 00 33 99'
- '00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99'
- 'CC 00 33 99 FF 00 33 CC 00 00 33 CC 33 00 33 CC'
- '66 00 33 CC 99 00 33 CC CC 00 33 CC FF 00 33 FF'
- '33 00 33 FF 66 00 33 FF 99 00 33 FF CC 00 33 FF'
- 'FF 00 66 00 00 00 66 00 33 00 66 00 66 00 66 00'
- '99 00 66 00 CC 00 66 00 FF 00 66 33 00 00 66 33'
- '33 00 66 33 66 00 66 33 99 00 66 33 CC 00 66 33'
- 'FF 00 66 66 00 00 66 66 33 00 66 66 66 00 66 66'
- '99 00 66 66 CC 00 66 99 00 00 66 99 33 00 66 99'
- '66 00 66 99 99 00 66 99 CC 00 66 99 FF 00 66 CC'
- '00 00 66 CC 33 00 66 CC 99 00 66 CC CC 00 66 CC'
- 'FF 00 66 FF 00 00 66 FF 33 00 66 FF 99 00 66 FF'
- 'CC 00 CC 00 FF 00 FF 00 CC 00 99 99 00 00 99 33'
- '99 00 99 00 99 00 99 00 CC 00 99 00 00 00 99 33'
- '33 00 99 00 66 00 99 33 CC 00 99 00 FF 00 99 66'
- '00 00 99 66 33 00 99 33 66 00 99 66 99 00 99 66'
- 'CC 00 99 33 FF 00 99 99 33 00 99 99 66 00 99 99'
- '99 00 99 99 CC 00 99 99 FF 00 99 CC 00 00 99 CC'
- '33 00 66 CC 66 00 99 CC 99 00 99 CC CC 00 99 CC'
- 'FF 00 99 FF 00 00 99 FF 33 00 99 CC 66 00 99 FF'
- '99 00 99 FF CC 00 99 FF FF 00 CC 00 00 00 99 00'
- '33 00 CC 00 66 00 CC 00 99 00 CC 00 CC 00 99 33'
- '00 00 CC 33 33 00 CC 33 66 00 CC 33 99 00 CC 33'
- 'CC 00 CC 33 FF 00 CC 66 00 00 CC 66 33 00 99 66'
- '66 00 CC 66 99 00 CC 66 CC 00 99 66 FF 00 CC 99'
- '00 00 CC 99 33 00 CC 99 66 00 CC 99 99 00 CC 99'
- 'CC 00 CC 99 FF 00 CC CC 00 00 CC CC 33 00 CC CC'
- '66 00 CC CC 99 00 CC CC CC 00 CC CC FF 00 CC FF'
- '00 00 CC FF 33 00 99 FF 66 00 CC FF 99 00 CC FF'
- 'CC 00 CC FF FF 00 CC 00 33 00 FF 00 66 00 FF 00'
- '99 00 CC 33 00 00 FF 33 33 00 FF 33 66 00 FF 33'
- '99 00 FF 33 CC 00 FF 33 FF 00 FF 66 00 00 FF 66'
- '33 00 CC 66 66 00 FF 66 99 00 FF 66 CC 00 CC 66'
- 'FF 00 FF 99 00 00 FF 99 33 00 FF 99 66 00 FF 99'
- '99 00 FF 99 CC 00 FF 99 FF 00 FF CC 00 00 FF CC'
- '33 00 FF CC 66 00 FF CC 99 00 FF CC CC 00 FF CC'
- 'FF 00 FF FF 33 00 CC FF 66 00 FF FF 99 00 FF FF'
- 'CC 00 66 66 FF 00 66 FF 66 00 66 FF FF 00 FF 66'
- '66 00 FF 66 FF 00 FF FF 66 00 21 00 A5 00 5F 5F'
- '5F 00 77 77 77 00 86 86 86 00 96 96 96 00 CB CB'
- 'CB 00 B2 B2 B2 00 D7 D7 D7 00 DD DD DD 00 E3 E3'
- 'E3 00 EA EA EA 00 F1 F1 F1 00 F8 F8 F8 00 F0 FB'
- 'FF 00 A4 A0 A0 00 80 80 80 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 00'
- '00 00 00 00 00 07 07 07 07 04 04 04 07 07 07 07'
- '07 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
- '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 04 04 04 04 07 07 07'
- '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
- '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 01 07 07 07 07 92 92 92 92 92 92 92 92'
- '92 92 92 92 92 07 07 07 07 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 07 07 07 00 07 00 07 00 07 00'
- '07 00 07 00 07 00 07 07 6D 6D 6D 6D 6D 6D 6D 6D'
- '6D 6D 6D 6D 6D 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 04 FF 04 07 00 00 00'
- '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
- '00 00 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
- '00 07 00 00 00 07 07 07 04 04 07 07 04 04 07 07'
- '07 07 01 01 01 07 04 FF FF FF FF FF FF FF 04 07'
- '07 07 01 01 01 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 01 01 01 07 00 00 00 00 00 00 00 00 07 07'
- '07 07 01 01 01 07 07 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 92 07 07 07 07 00 07 EC EC EC EC EC'
- 'EC EC EC EC EC 00 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 6D 07 07 07 07 07 07 07 07 07 07 07'
- '04 04 04 04 07 07 07 07 07 04 04 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
- '00 00 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 04 04 07 07 07 07 07 07'
- '07 01 01 01 01 01 04 FF FF FF FF FF FF FF 04 07'
- '07 01 01 01 01 01 07 07 07 07 07 07 07 07 07 07'
- '07 01 01 01 01 01 00 FF FF FF FF FF FF 00 07 07'
- '07 01 01 01 01 01 07 00 FF DD DD DD DD D6 D6 D6'
- 'D6 D6 D6 00 92 07 07 07 07 00 07 07 07 07 07 07'
- '07 07 07 07 EC 00 07 07 07 00 07 07 00 07 00 07'
- '00 07 00 07 07 00 07 00 FF DD DD DD DD D6 D6 D6'
- 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
- '04 FF FF 04 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 04 04 04 04 04 04 07 07'
- '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
- '07 07 07 01 07 07 07 00 00 00 00 00 00 00 00 00'
- '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 07 07'
- '07 07 07 01 07 07 07 00 FF DD DD DD DD DD DD D6'
- 'D6 D6 D6 00 92 07 07 07 07 00 07 EC EC EC EC EC'
- 'EC EC EC EC EC 00 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 00 FF DD DD DD DD DD DD D6'
- 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
- '04 FF FF 04 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 04 04 07 07 04 04 07 07'
- '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
- '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 00'
- '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 04 04'
- '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
- 'D6 D6 D6 00 92 07 07 07 07 00 07 07 07 07 07 07'
- '07 07 07 07 EC 00 07 07 07 00 07 07 00 07 00 07'
- '00 07 00 07 07 00 07 00 FF DD DD DD DD DD DD DD'
- 'D6 D6 D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
- '04 FF 04 04 07 07 07 07 07 07 07 07 07 07 04 04'
- '04 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
- '07 07 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
- '00 07 00 00 00 07 07 07 07 04 04 04 04 07 07 07'
- '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
- '07 07 07 01 07 07 04 FF 07 FF 07 FF 07 07 04 00'
- '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 FB FF'
- '04 07 07 01 07 07 07 00 FF DD DD DD DD 1F 1F 1F'
- 'D6 D6 D6 00 92 07 00 07 07 00 07 EC EC EC EC EC'
- 'EC EC 02 02 EC 00 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 00 FF DD DD DD DD DD DD DD'
- 'D6 FB D6 00 6D 07 07 00 00 00 00 00 00 07 07 07'
- '04 04 04 07 07 07 07 07 07 07 07 07 07 07 04 FF'
- '04 07 00 00 00 07 07 07 FF FF 00 07 00 00 00 00'
- '00 00 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
- '07 07 07 01 07 07 04 07 FF 01 FF 01 01 07 04 00'
- '07 07 07 01 07 07 00 FF FF FF FF FF FF 00 FF FB'
- '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
- '1F D6 D6 00 92 07 07 00 07 00 07 00 EC EC EC EC'
- 'EC EC FA FA EC 00 07 07 07 00 07 07 07 07 07 07'
- '00 07 00 07 07 00 07 00 FF DD DD DD DD DD DD DD'
- 'D6 FB D6 00 6D 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 04 04'
- '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
- '00 00 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 01 07 07 04 FF FF FF FF FF FF FF 04 07'
- '07 07 07 01 07 07 04 FF 07 01 07 01 07 FF 04 00'
- '07 07 07 01 07 07 00 FF FF FF 00 00 00 00 FB FF'
- '04 07 07 01 07 07 07 00 FF DD DD DD DD DD DD DD'
- 'DD 1F D6 00 92 07 07 07 00 00 00 07 07 07 07 07'
- '07 07 07 07 07 00 01 01 07 07 01 01 07 07 07 07'
- '07 07 07 07 07 07 07 00 FF DD DD DD DD DD FB DD'
- 'DD FB D6 92 FB 07 07 07 04 04 04 04 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
- '07 07 07 07 07 07 07 00 00 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 04 04 04 04 04 07 07'
- '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
- '07 07 07 01 07 07 04 07 01 01 FF 07 01 07 04 00'
- '07 07 07 01 07 07 00 FF FF FF 00 FF 00 FB FF FB'
- '04 07 07 01 07 07 07 00 FF FF FF FF FF FF FF FF'
- 'FF 1F C3 00 07 07 00 00 07 07 00 00 00 00 00 00'
- '00 00 00 00 00 00 07 01 01 01 01 07 07 00 07 00'
- '07 00 07 00 07 00 07 00 FF FF FF FF FF FF FF FB'
- 'FF FB C3 FB 07 07 07 07 04 FF FF 04 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 FF 00 07 00 00 00 00 07 00'
- '00 07 00 00 00 07 07 07 04 04 07 07 04 04 07 07'
- '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 01 07 07 04 FF 07 01 07 01 01 FF 04 00'
- '07 07 07 01 07 07 00 FF FF FF 00 00 FB FF FB FF'
- '04 07 07 01 07 07 07 00 D6 D6 D6 D6 D6 D6 D6 00'
- '00 1F 00 00 07 07 07 07 00 07 00 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 01 01 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 00 D6 D6 D6 D6 D6 D6 D6 92'
- 'FB FB FB 92 92 07 07 07 04 FF FF 04 07 07 07 07'
- '07 07 07 07 07 07 07 04 04 04 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 00 00 00 07 07 07 07 07'
- '07 07 07 07 07 07 07 FF 00 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 04 04 07 07 04 04 07 07'
- '07 07 07 01 07 07 07 07 07 07 07 04 04 04 04 07'
- '07 07 07 01 07 07 04 07 FF 07 FF 07 FF 07 04 00'
- '07 07 07 01 07 07 00 00 00 00 00 FB FF 04 04 04'
- '04 07 07 01 07 07 07 07 00 D6 D6 D6 D6 D6 00 07'
- '07 1F 07 07 07 07 07 00 07 00 07 00 07 07 07 07'
- '07 07 07 07 07 07 07 01 01 01 01 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 00 D6 D6 D6 D6 FB FB FB'
- 'FB FB FB FB FB FB 07 07 04 FF 04 04 07 07 07 07'
- '07 07 07 07 07 07 07 04 FF 04 07 00 00 00 07 07'
- '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
- '00 00 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 04 04 04 04 04 07 07'
- '07 07 07 01 07 07 07 07 07 07 07 04 FF FF 04 07'
- '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 00'
- '07 07 07 01 07 07 07 07 07 04 FB FF FB 04 FB 04'
- '07 07 07 01 07 07 07 07 07 00 00 00 00 00 07 07'
- '07 1F 07 07 07 07 00 07 07 07 07 07 00 07 07 07'
- '07 07 07 07 07 07 01 01 07 07 01 01 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 00 00 00 00 00 07 92'
- 'FB FB FB 92 07 07 07 07 04 04 04 07 07 07 07 07'
- '07 07 07 07 07 07 07 04 04 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 FF FF 00 07 00 00 00 00'
- '00 00 07 07 07 07 92 92 92 92 92 92 92 92 92 92'
- '92 92 92 92 92 92 07 07 07 07 07 07 04 04 07 07'
- '07 07 07 01 07 07 07 07 07 07 07 04 FF FF 04 07'
- '07 07 07 01 07 07 04 FC 04 FC FC FC 04 FC 04 00'
- '07 07 07 01 07 07 07 07 07 04 FF FB FF 04 04 07'
- '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 1F'
- '1F 1F 1F 1F 07 07 07 07 07 00 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 FF FB'
- '07 FB 07 FB 92 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 FF FF 00 07 07 07 07 07'
- '07 07 07 07 07 07 92 FF FF 92 FF FF FF FF 92 FF'
- 'FF 92 FF FF FF 92 07 07 07 04 04 04 04 07 07 07'
- '07 07 07 01 07 07 07 07 07 07 07 04 04 04 04 07'
- '07 07 07 01 07 07 04 04 04 04 04 04 04 04 04 07'
- '07 07 07 01 07 07 07 07 07 04 04 04 04 04 07 07'
- '07 07 07 01 07 07 07 07 07 07 07 07 07 07 07 07'
- '1F 1F 1F 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 FB 07'
- '07 FB 07 07 FB 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 92 92 92 92 92 92 92 92 92 92'
- '92 92 92 92 92 92 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 1F 07 07 07 07 07 07 07 00 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 07 07 07 07 07 07 07 07 07 07 07 07 07 07 07'
- '07 FB 07 07 07 07'
-}
-
-IDB_VIEW_LARGE BITMAP LOADONCALL MOVEABLE DISCARDABLE
-{
- '42 4D DE 08 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 20 01 00 00 18 00 00 00 01 00 04 00 02 00'
- '00 00 68 08 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
- '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 FE 77 22 77 00 00 78 77 0E 44'
- '04 77 02 71 16 77 02 71 16 77 02 71 64 77 00 00'
- '0C 77 02 70 08 00 08 77 04 44 0E 77 00 06 74 44'
- '47 00 06 77 04 44 08 77 00 04 74 77 04 00 00 0E'
- '07 00 07 00 07 00 07 00 08 77 06 44 06 77 02 71'
- '04 77 02 4F 0A FF 02 F4 04 77 00 04 11 17 14 77'
- '00 04 11 17 14 77 00 04 11 17 62 77 00 00 1E 77'
- '00 04 4F F4 0E 77 00 06 74 FF 47 00 06 77 00 04'
- '4F F4 24 77 00 0A 74 44 77 74 47 00 04 77 00 08'
- '11 17 77 4F 0A FF 00 06 F4 77 71 00 04 11 12 77'
- '02 71 04 11 12 77 02 71 04 11 00 04 77 70 16 00'
- '30 77 12 00 02 07 04 77 00 00 0E 77 06 44 02 47'
- '08 77 00 06 4F F4 70 00 06 00 06 77 00 06 74 FF'
- '47 00 04 00 00 08 07 4F F4 70 04 00 00 06 77 74'
- '77 00 04 00 00 0E 07 00 07 00 07 00 07 00 06 77'
- '00 04 74 44 08 77 02 71 04 11 00 04 77 4F 0A FF'
- '00 04 F4 77 06 11 02 17 10 77 06 11 02 17 10 77'
- '06 11 00 04 17 70 14 BF 02 B0 04 77 12 00 02 07'
- '04 77 14 07 02 0F 10 BF 02 07 04 77 00 00 0E 77'
- '02 4F 04 FF 02 47 08 77 00 04 4F 44 0E 77 00 06'
- '74 F4 47 00 06 77 00 04 4F 44 24 77 00 04 74 44'
- '08 77 06 11 00 04 17 4F 0A FF 02 F4 04 77 02 71'
- '16 77 02 71 16 77 02 71 04 77 02 70 14 FB 02 F0'
- '04 77 02 07 10 88 02 07 18 77 02 0B 10 FB 02 07'
- '04 77 00 00 0E 77 02 4F 04 FF 02 47 08 77 00 04'
- '44 47 0E 77 00 04 74 44 08 77 00 04 44 47 08 77'
- '00 04 74 77 04 00 00 0E 07 00 07 00 07 00 07 00'
- '06 77 02 74 06 44 02 47 04 77 02 71 04 77 02 4F'
- '0A FF 02 F4 04 77 02 71 16 77 02 71 04 77 02 74'
- '08 44 02 47 06 77 02 71 04 77 02 70 14 BF 02 B0'
- '04 77 02 07 0E 77 00 04 78 07 04 77 02 07 0E 70'
- '00 06 77 07 0F 00 10 BF 02 07 04 77 00 00 0E 77'
- '02 4F 04 FF 02 47 4E 77 00 0A 74 44 77 44 47 00'
- '04 77 02 71 04 77 02 4F 0A FF 02 F4 04 77 02 71'
- '16 77 02 71 04 77 02 74 08 FF 02 47 06 77 02 71'
- '04 77 02 70 06 FB 0C 00 00 04 FB F0 04 77 02 07'
- '10 88 02 07 18 77 02 0B 10 FB 02 07 04 77 00 00'
- '0E 77 02 4F 04 FF 02 47 32 77 00 04 74 77 04 00'
- '00 0E 07 00 07 00 07 00 07 00 06 77 00 0A 74 44'
- '77 44 47 00 04 77 02 71 04 77 02 4F 0A FF 02 F4'
- '04 77 02 71 08 77 0A 00 04 77 02 71 04 77 02 74'
- '08 FF 02 47 06 77 02 71 04 77 02 70 06 BF 02 0F'
- '0C BF 02 B0 04 77 02 07 0E 77 00 04 78 07 04 77'
- '02 07 0E 70 00 06 77 07 0F 00 10 BF 02 07 04 77'
- '00 00 0E 77 00 08 4F FF 44 47 1A 77 00 06 74 44'
- '47 00 06 77 04 44 26 77 06 44 06 77 02 71 04 77'
- '02 4F 0A FF 02 F4 04 77 02 71 06 77 02 74 08 44'
- '02 40 04 77 02 71 04 77 02 74 08 FF 02 47 06 77'
- '02 71 04 77 02 70 06 FB 02 0B 0C FB 02 F0 04 77'
- '02 07 10 88 02 07 18 77 02 0B 10 FB 02 07 04 77'
- '00 00 0E 77 00 06 4F FF 44 00 0E 77 00 06 74 44'
- '47 00 08 77 00 06 74 FF 47 00 06 77 00 04 4F F4'
- '08 77 00 04 74 77 04 00 00 0E 07 00 07 00 07 00'
- '07 00 14 77 02 71 04 77 02 4F 0A FF 02 F4 04 77'
- '02 71 06 77 02 74 08 F7 02 40 04 77 02 71 04 77'
- '02 74 08 FF 04 44 00 06 47 77 71 00 04 77 02 70'
- '06 BF 02 0F 0C BF 00 08 B0 07 77 07 10 88 02 07'
- '04 77 02 07 10 77 00 04 07 0F 10 BF 02 07 04 77'
- '00 00 02 77 08 00 00 04 07 77 04 44 02 47 0E 77'
- '00 06 74 FF 47 00 08 77 00 06 74 FF 47 00 04 00'
- '00 08 07 4F F4 70 04 00 2C 77 02 71 04 77 02 4F'
- '0A FF 02 F4 04 77 02 71 06 77 02 74 08 7F 02 40'
- '04 77 02 71 04 77 02 74 08 FF 00 0A 4F BF 47 77'
- '71 00 04 77 00 06 70 FB F0 00 06 00 0A FB 00 0A'
- 'F0 70 77 07 80 00 0A 88 00 10 82 28 07 71 17 77'
- '71 17 06 77 04 70 04 77 02 0B 10 FB 00 06 07 77'
- '07 00 00 00 22 77 00 06 74 FF 47 00 06 00 00 08'
- '07 74 F4 47 06 77 00 04 4F 44 08 77 00 04 74 77'
- '04 00 00 0E 07 00 07 00 07 00 07 00 14 77 02 71'
- '04 77 02 4F 0A FF 02 F4 04 77 02 71 06 77 00 0C'
- '74 F7 17 11 17 40 04 77 02 71 04 77 02 74 08 FF'
- '00 0A 4B FB 47 77 71 00 04 77 02 70 04 BF 04 00'
- '02 0F 0A BF 00 04 B0 77 04 07 02 08 0A 88 00 0E'
- '8A A8 07 77 11 77 11 00 0E 77 00 04 07 0F 0C BF'
- '00 0A B0 BF 07 70 77 00 00 00 00 04 77 74 06 44'
- '18 77 00 06 74 F4 47 00 08 77 00 04 74 44 08 77'
- '00 04 44 47 26 77 06 44 02 47 04 77 02 71 04 77'
- '0E 44 04 77 02 71 06 77 00 0C 74 7F 1F 18 7F 40'
- '04 77 02 71 04 77 02 74 08 FF 00 0A 4F BF 47 77'
- '71 00 04 77 02 70 04 FB 00 04 F0 00 0C FB 00 08'
- 'F0 77 70 00 0E 77 00 0C 78 07 77 71 11 17 10 77'
- '02 0B 0E FB 02 0B 04 07 02 77 00 00 00 04 77 74'
- '04 FF 02 F4 18 77 00 04 74 44 22 77 00 04 74 77'
- '04 00 00 0E 07 00 07 00 07 00 07 00 06 77 00 0A'
- '74 44 77 44 47 00 04 77 02 71 16 77 02 71 06 77'
- '00 0C 74 F7 17 F1 87 40 04 77 02 71 04 77 02 74'
- '04 FF 00 0E F4 44 4B FB 47 77 71 00 04 77 02 70'
- '06 BF 02 0F 0C BF 00 08 B0 00 07 70 10 00 02 07'
- '04 77 00 04 11 77 10 07 02 0F 0E BF 00 04 B0 00'
- '04 77 00 00 00 04 77 74 04 FF 02 F4 5A 77 00 0A'
- '74 44 77 44 47 00 04 77 02 71 16 77 02 71 06 77'
- '00 0C 74 71 1F 7F 1F 40 04 77 02 71 04 77 02 74'
- '04 FF 04 F4 04 BF 00 06 47 77 71 00 04 77 02 70'
- '14 FB 00 04 F0 77 04 70 14 77 00 06 71 11 17 00'
- '10 77 12 00 00 06 77 00 07 00 00 00 00 04 77 74'
- '04 FF 02 F4 0E 77 00 06 74 44 47 00 12 77 00 06'
- '74 44 47 00 06 77 04 44 08 77 00 04 74 77 04 00'
- '00 0E 07 00 07 00 07 00 07 00 06 77 00 0A 74 44'
- '77 44 47 00 04 77 02 71 0A 77 02 74 04 44 02 47'
- '04 77 02 71 06 77 00 0C 74 F7 17 11 87 40 04 77'
- '02 71 04 77 02 74 04 FF 00 04 F4 4B 04 FB 00 06'
- '47 77 71 00 04 77 02 70 14 BF 00 04 B0 77 06 07'
- '12 77 00 06 11 77 11 00 10 77 02 70 08 FB 02 07'
- '04 77 04 70 04 77 00 00 00 04 77 74 04 FF 02 F4'
- '0E 77 00 06 74 FF 47 00 12 77 00 06 74 FF 47 00'
- '06 77 00 04 4F F4 24 77 00 0A 74 44 77 44 47 00'
- '04 77 02 71 0A 77 02 74 04 FF 02 47 04 77 02 71'
- '06 77 02 74 08 7F 02 40 04 77 02 71 04 77 02 74'
- '06 44 06 BF 00 06 47 77 71 00 04 77 02 70 14 00'
- '00 04 07 70 04 77 02 70 10 77 00 0A 71 17 77 71'
- '17 00 10 77 02 0F 04 BF 02 B0 06 77 06 07 02 77'
- '00 00 00 0A 77 74 FF F4 44 00 0E 77 00 06 74 FF'
- '47 00 06 00 02 07 0A 77 00 06 74 FF 47 00 04 00'
- '00 08 07 4F F4 70 04 00 00 04 77 74 14 44 08 77'
- '06 44 02 47 04 77 02 71 0A 77 02 74 04 FF 02 47'
- '04 77 02 71 06 77 02 74 08 F7 02 40 04 77 02 71'
- '08 77 02 74 04 FB 00 0A F4 44 47 77 71 00 06 77'
- '02 0F 08 BF 02 07 0A 77 00 0A 07 77 07 77 07 00'
- '28 77 02 70 04 00 02 07 04 77 02 70 04 77 00 04'
- '70 77 00 00 00 0A 77 74 FF F4 47 00 0E 77 00 06'
- '74 F4 47 00 12 77 00 06 74 F4 47 00 06 77 00 04'
- '4F 44 2A 77 00 04 44 47 04 77 02 71 0A 77 02 74'
- '04 FF 02 47 04 77 02 71 06 77 02 74 08 44 02 40'
- '04 77 02 71 08 77 02 74 04 BF 00 04 B4 F4 04 77'
- '02 71 06 77 02 70 06 FB 02 F0 4A 77 00 0A 07 77'
- '07 77 07 00 00 00 00 04 77 74 04 44 10 77 00 04'
- '74 44 14 77 00 04 74 44 08 77 00 04 44 47 0C 77'
- '04 00 00 08 70 00 70 00 0E 77 06 44 06 77 02 71'
- '0A 77 02 74 04 FF 02 47 04 77 02 71 06 77 00 0C'
- '74 CC 4C C4 CC 40 04 77 02 71 08 77 02 74 04 FB'
- '00 04 F4 47 04 77 02 71 08 77 06 00 02 07 10 77'
- '02 07 42 77 00 00 7E 77 02 74 04 44 02 47 04 77'
- '02 71 06 77 02 74 08 44 02 47 04 77 02 71 08 77'
- '02 74 06 44 06 77 02 71 5E 77 02 07 04 77 00 00'
- 'FE 77 22 77 00 00 FE 77 22 77 00 00 00 01'
-}
-
-IDB_HIST_SMALL BITMAP LOADONCALL DISCARDABLE
-{
- '42 4D 6C 02 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 50 00 00 00 10 00 00 00 01 00 04 00 02 00'
- '00 00 F6 01 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 FF FF FF 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 00'
- '00 00 80 80 80 00 C0 C0 C0 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 00 66 66 00 50 88 00 00 20 88 0E 66 02 68'
- '04 88 0C 66 10 88 00 00 20 88 02 60 0C B0 02 68'
- '04 88 02 60 08 B0 00 04 B6 88 0C 44 02 48 00 00'
- '20 88 02 6B 04 0B 02 04 06 0B 02 68 04 88 00 04'
- '6B 0B 06 4B 00 0A 06 88 40 00 40 00 06 00 02 48'
- '00 00 08 88 02 86 0C 88 02 68 08 88 00 04 60 B0'
- '06 B4 04 B0 02 68 04 88 00 14 60 B0 B4 44 B0 B6'
- '88 40 00 40 06 00 02 48 00 00 08 88 02 66 0C 88'
- '02 66 08 88 02 6B 04 0B 00 04 44 4B 04 0B 02 68'
- '04 66 00 1C 6B 0B 44 B4 4B 06 88 40 60 40 06 66'
- '00 48 00 00 06 88 00 04 86 66 0C 88 00 04 66 68'
- '06 88 00 28 60 B0 44 40 44 40 B0 68 60 00 60 B0'
- 'B4 44 B0 B6 88 40 00 40 06 00 02 48 00 00 06 88'
- '04 66 0C 88 04 66 06 88 02 6B 04 0B 00 04 44 4B'
- '04 0B 00 0A 68 60 44 6B 0B 00 06 4B 00 12 06 88'
- '40 60 40 06 66 00 48 00 00 00 04 88 02 86 04 66'
- '0C 88 04 66 02 68 04 88 00 04 60 B0 06 B4 04 B0'
- '00 08 68 60 00 60 08 B0 00 0A B6 88 40 00 40 00'
- '06 00 02 48 00 00 06 88 04 66 0C 88 04 66 06 88'
- '02 6B 04 0B 02 04 06 0B 00 06 68 60 44 00 0C 66'
- '00 10 88 40 60 40 06 66 00 48 00 00 06 88 00 04'
- '86 66 0C 88 00 04 66 68 06 88 02 60 0C B0 00 08'
- '68 60 00 06 04 B0 02 68 06 88 00 06 40 00 40 00'
- '06 00 02 48 00 00 08 88 02 66 0C 88 02 66 08 88'
- '0E 66 00 08 88 60 22 04 04 66 00 04 88 86 04 88'
- '00 06 40 00 40 00 06 00 02 48 00 00 08 88 02 86'
- '0C 88 02 68 08 88 02 86 04 B0 02 B6 08 88 00 04'
- '60 22 04 00 00 06 68 88 86 00 04 88 0C 44 02 48'
- '00 00 22 88 04 66 02 68 08 88 00 0C 60 22 04 40'
- '68 86 04 66 02 88 0C 44 02 48 00 00 30 88 02 60'
- '06 00 00 06 68 88 86 00 12 88 00 00 30 88 08 66'
- '00 06 68 88 86 00 12 88 00 00 00 01'
-}
-
-IDB_HIST_LARGE BITMAP LOADONCALL DISCARDABLE
-{
- '42 4D 60 04 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 78 00 00 00 18 00 00 00 01 00 04 00 02 00'
- '00 00 EA 03 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 FF FF FF 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 00 00'
- '00 00 80 80 80 00 C0 C0 C0 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 00 66 66 00 78 88 00 00 78 88 00 00 30 88'
- '02 86 14 66 08 88 02 86 10 66 18 88 00 00 30 88'
- '00 16 86 0B B0 BB 0B B0 BB 0B B0 BB 06 00 08 88'
- '00 12 86 0B B0 BB 0B B0 BB 0B B6 00 18 88 00 00'
- '30 88 00 16 86 0B B0 BB 0B B0 BB 0B B0 BB 06 00'
- '08 88 00 12 86 0B B0 BB 0B B0 BB 0B B6 00 18 88'
- '00 00 30 88 00 16 86 B0 0B 00 B0 04 00 B0 0B 00'
- 'B6 00 08 88 00 12 86 B0 0B 44 B4 4B 44 B0 06 00'
- '18 88 00 00 0E 88 02 68 10 88 00 04 86 68 0C 88'
- '00 16 86 0B B0 BB 4B B4 BB 4B B0 BB 06 00 08 88'
- '00 08 86 0B B0 BB 04 44 00 06 BB 0B B6 00 04 88'
- '02 84 0C 44 02 48 04 88 00 00 0E 88 02 68 10 88'
- '00 04 86 68 0C 88 00 16 86 0B B0 BB 4B B4 BB 4B'
- 'B0 BB 06 00 08 88 00 08 86 0B B0 BB 04 44 00 06'
- 'BB 0B B6 00 04 88 00 06 84 00 04 00 08 00 02 48'
- '04 88 00 00 0C 88 00 04 66 68 10 88 00 04 86 66'
- '0C 88 00 0A 86 B0 0B 00 B4 00 04 44 00 0C B0 0B'
- '00 B6 88 86 06 66 00 10 B0 0B 44 4B B4 44 B0 06'
- '04 88 00 06 84 00 04 00 08 00 02 48 04 88 00 00'
- '0A 88 00 06 86 66 68 00 10 88 02 86 04 66 0A 88'
- '00 06 86 0B B0 00 04 44 02 40 04 44 00 0A 40 BB'
- '06 88 86 00 04 00 00 08 06 0B B0 BB 04 44 00 06'
- 'BB 0B B6 00 04 88 00 08 84 06 04 00 04 66 00 04'
- '00 48 04 88 00 00 0A 88 00 06 86 66 68 00 10 88'
- '02 86 04 66 0A 88 00 06 86 0B B0 00 04 44 02 40'
- '04 44 00 0A 40 BB 06 88 86 00 04 00 00 08 06 0B'
- 'B0 BB 04 44 00 06 BB 0B B6 00 04 88 00 06 84 00'
- '04 00 08 00 02 48 04 88 00 00 08 88 02 86 04 66'
- '02 68 10 88 02 86 04 66 02 68 08 88 00 0A 86 B0'
- '0B 00 B4 00 04 44 00 22 B0 0B 00 B6 88 86 04 44'
- '46 B0 0B 44 B4 4B 44 B0 06 00 04 88 00 08 84 06'
- '04 00 04 66 00 04 00 48 04 88 00 00 08 88 06 66'
- '02 68 10 88 02 86 06 66 02 68 06 88 00 1A 86 0B'
- 'B0 BB 4B B4 BB 4B B0 BB 06 88 86 00 04 00 00 12'
- '06 0B B0 BB 0B B0 BB 0B B6 00 04 88 00 06 84 00'
- '04 00 08 00 02 48 04 88 00 00 08 88 06 66 02 68'
- '10 88 02 86 06 66 02 68 06 88 00 1A 86 0B B0 BB'
- '4B B4 BB 4B B0 BB 06 88 86 00 04 00 00 12 06 0B'
- 'B0 BB 0B B0 BB 0B B6 00 04 88 00 08 84 06 04 00'
- '04 66 00 04 00 48 04 88 00 00 08 88 02 86 04 66'
- '02 68 10 88 02 86 04 66 02 68 08 88 00 20 86 B0'
- '0B 00 B0 04 00 B0 0B 00 B6 88 86 04 44 46 10 66'
- '04 88 00 06 84 00 04 00 08 00 02 48 04 88 00 00'
- '0A 88 00 06 86 66 68 00 10 88 02 86 04 66 0A 88'
- '00 1A 86 0B B0 BB 0B B0 BB 0B B0 BB 06 88 86 00'
- '06 00 00 08 6B B0 BB 06 0C 88 00 06 84 00 04 00'
- '08 00 02 48 04 88 00 00 0A 88 00 06 86 66 68 00'
- '10 88 02 86 04 66 0A 88 00 1A 86 0B B0 BB 0B B0'
- 'BB 0B B0 BB 06 88 86 00 06 00 00 08 6B B0 BB 06'
- '0C 88 02 84 0C 44 02 48 04 88 00 00 0C 88 00 04'
- '66 68 10 88 00 04 86 66 0C 88 02 86 14 66 00 0C'
- '88 86 02 22 00 46 04 66 02 68 04 88 02 68 06 88'
- '02 84 0C 44 02 48 04 88 00 00 0E 88 02 68 10 88'
- '00 04 86 68 0E 88 00 0A 6B B0 BB 0B B6 00 0C 88'
- '00 06 86 02 22 00 06 00 02 68 06 88 02 68 1A 88'
- '00 00 0E 88 02 68 10 88 00 04 86 68 0E 88 00 0A'
- '6B B0 BB 0B B6 00 0C 88 00 06 86 02 22 00 06 00'
- '02 68 06 88 02 68 1A 88 00 00 32 88 02 86 06 66'
- '02 68 0C 88 00 12 86 02 22 00 44 40 68 88 86 00'
- '06 66 14 88 00 04 87 88 00 00 48 88 02 86 0A 00'
- '02 68 06 88 02 68 16 88 00 04 87 88 00 00 48 88'
- '02 86 0A 00 02 68 06 88 02 68 1A 88 00 00 48 88'
- '02 86 0A 66 02 68 06 88 02 68 1A 88 00 00 00 01'
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3 user32.dll)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "COMCTL32 System Dll\0"
-            VALUE "FileVersion", "4.72.3110.1\0"
-            VALUE "InternalName", "COMCTL32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "COMCTL32.DLL\0"
-            VALUE "ProductName", "Odin32 - COMCTL32\0"
-            VALUE "ProductVersion", "4.72.3110.1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/comdlg32/cdlg_Ca.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Ca.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Ca.orc	(revision 3031)
@@ -0,0 +1,193 @@
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Obrir"
+FONT 8, "Helv"
+{
+ LTEXT "&Nom:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Directoris:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Tipus de fitxers:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Unitats:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anul·lació", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Només &lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Anomenar i desar..."
+FONT 8, "Helv"
+{
+ LTEXT "&Nom:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Directoris:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Desar fitxer en f&ormat:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Unitats:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anul·lació", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Fer-ne còpia", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Impressió"
+FONT 8, "Helv"
+{
+ LTEXT "Impressora:", 1088, 6, 6, 40, 9
+ LTEXT "Impressió del document", 1089, 60, 6, 150, 9
+ GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Sencer", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&Part seleccionada", 1057, 16, 60, 60, 12
+ RADIOBUTTON "Pà&gines", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anul·lació", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configuració", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "P&rimera:", 1090, 60, 80, 30, 9
+ LTEXT "Ú&ltima:", 1091, 120, 80, 30, 9
+ LTEXT "&Qualitat:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Imprimir en un &fitxer", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "S&eparar les còpies", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configuració de la impressió"
+FONT 8, "Helv"
+{
+ GROUPBOX "Impressora:", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "Impressora per &defecte", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Impressora &especificada:", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anul·lació", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Opcions", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientació", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Horitzontal", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Mida", 1089, 130, 95, 30, 9
+ LTEXT "A&limentació:", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tipus de lletra"
+FONT 8, "Helv"
+{
+    LTEXT           "&Tipus de lletra:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Estil del tipus de lletra:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Grandària:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "D'acord",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Anul·lació",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "A&plicar", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "A&juda" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Efectes",1072,6,72,84,34,WS_GROUP
+    CHECKBOX        "&Barrar-lo", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Subratllar-lo", 1041, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Color:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Exemple",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Color"
+FONT 8, "Helv"
+{
+ LTEXT "Colors &básics:", 1088, 4, 4, 140, 10
+ LTEXT "Colors person&alitzats:", 1089, 4, 106, 140, 10
+ LTEXT "Color Sòl&id", 1090, 150, 151, 48, 10
+ LTEXT   "&Roig:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Verd:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "Bla&u:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Tint:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Llum.:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "D'acord",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anul·lació", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038,100,166, 44, 14
+ PUSHBUTTON "Afegir als &colors personalitzats", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definir colors personalitzats >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cerca"
+FONT 8, "Helv"
+{
+ LTEXT "&Cercar:",  -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "C&ercar mots sencers", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Distingir majúscules de minúscules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direcció", 1072, 107, 26, 68, 28
+ CONTROL "&Amunt", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "A&vall", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "&Continuació", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anul·lació", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Substitució"
+FONT 8, "Helv"
+{
+ LTEXT "&Cercar:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Substituir per:", 1090, -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Cercar &mots sencers", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Distingir majúscules de minúscules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "C&ontinucació", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "S&ubstitució", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Substitució &automàtica", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Tancar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Ca.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Ca.rc	(revision 3028)
+++ 	(revision )
@@ -1,193 +1,0 @@
-LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Obrir"
-FONT 8, "Helv"
-{
- LTEXT "&Nom:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directoris:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Tipus de fitxers:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Unitats:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anul·lació", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Només &lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Anomenar i desar..."
-FONT 8, "Helv"
-{
- LTEXT "&Nom:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directoris:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Desar fitxer en f&ormat:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Unitats:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "D'acord", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anul·lació", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Fer-ne còpia", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Impressió"
-FONT 8, "Helv"
-{
- LTEXT "Impressora:", 1088, 6, 6, 40, 9
- LTEXT "Impressió del document", 1089, 60, 6, 150, 9
- GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Sencer", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Part seleccionada", 1057, 16, 60, 60, 12
- RADIOBUTTON "Pà&gines", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anul·lació", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Configuració", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "P&rimera:", 1090, 60, 80, 30, 9
- LTEXT "Ú&ltima:", 1091, 120, 80, 30, 9
- LTEXT "&Qualitat:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Imprimir en un &fitxer", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "S&eparar les còpies", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Configuració de la impressió"
-FONT 8, "Helv"
-{
- GROUPBOX "Impressora:", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "Impressora per &defecte", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Impressora &especificada:", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "D'acord", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anul·lació", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Opcions", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientació", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Horitzontal", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Mida", 1089, 130, 95, 30, 9
- LTEXT "A&limentació:", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tipus de lletra"
-FONT 8, "Helv"
-{
-    LTEXT           "&Tipus de lletra:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Estil del tipus de lletra:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Grandària:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "D'acord",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Anul·lació",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "A&plicar", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "A&juda" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Efectes",1072,6,72,84,34,WS_GROUP
-    CHECKBOX        "&Barrar-lo", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Subratllar-lo", 1041, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "&Color:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Exemple",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Color"
-FONT 8, "Helv"
-{
- LTEXT "Colors &básics:", 1088, 4, 4, 140, 10
- LTEXT "Colors person&alitzats:", 1089, 4, 106, 140, 10
- LTEXT "Color Sòl&id", 1090, 150, 151, 48, 10
- LTEXT   "&Roig:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Verd:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "Bla&u:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Tint:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Llum.:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "D'acord",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anul·lació", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", 1038,100,166, 44, 14
- PUSHBUTTON "Afegir als &colors personalitzats", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Definir colors personalitzats >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cerca"
-FONT 8, "Helv"
-{
- LTEXT "&Cercar:",  -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "C&ercar mots sencers", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Distingir majúscules de minúscules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direcció", 1072, 107, 26, 68, 28
- CONTROL "&Amunt", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "A&vall", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Continuació", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anul·lació", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Substitució"
-FONT 8, "Helv"
-{
- LTEXT "&Cercar:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Substituir per:", 1090, -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Cercar &mots sencers", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Distingir majúscules de minúscules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "C&ontinucació", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "S&ubstitució", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Substitució &automàtica", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Tancar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Cs.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Cs.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Cs.orc	(revision 3031)
@@ -0,0 +1,163 @@
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Otevøení souboru"
+FONT 8, "Helv"
+{
+ LTEXT "&jméno souboru:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Adresáøe:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Typ zobrazených souborù:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Diskové jednotky:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Otevøít", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Storno", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Nápovìda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Pouze pro ètení", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ulo pod jménem..."
+FONT 8, "Helv"
+{
+ LTEXT "&Jméno souboru:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Adresáøe:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Typ zobrazených souborù:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Diskové jednotky:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ulo pod jménem", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Storno", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Nápovìda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Pouze pro ètení", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tisk"
+FONT 8, "Helv"
+{
+ LTEXT "Tiskárna:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Rozsah tisku", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "Vytiskni v&e", 1056, 16, 45, 60, 12
+ RADIOBUTTON "Vytiskni &výbìr", 1057, 16, 60, 60, 12
+ RADIOBUTTON "Vytiskni &zadané stránky", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Tiskni", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Storno", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Nastavit...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Od:", 1090, 60, 80, 30, 9
+ LTEXT "&Do:", 1091, 120, 80, 30, 9
+ LTEXT "Kvalita &tisku:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Tisk do so&uboru", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Kondenzované", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Nastavení zpùsobu tisku"
+FONT 8, "Helv"
+{
+ GROUPBOX "Tiskárna", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Pøedvolená tiskárna", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Specifická &tiskárna", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Storno", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Dalí volby...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientace", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Na &výku", 1058, 50, 100, 40, 12
+ RADIOBUTTON "Na íø&ku", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papír", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Formát", 1089, 130, 95, 30, 9
+ LTEXT "&Odkud", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Písmo"
+FONT 8, "Helv"
+{
+ LTEXT "Písmo:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Storno", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Barvy"
+FONT 8, "Helv"
+{
+ LTEXT "&Základní barvy:", 1088, 6, 6, 40, 9
+ LTEXT "&Barvy na zakázku:", 1089, 6, 126, 40, 9
+ LTEXT "Barva|Spoj&itá", 1090, 100, 146, 40, 9
+ LTEXT "&Odstín:", 1091, 150, 126, 40, 9
+ LTEXT "&Sytost:", 1092, 150, 146, 40, 9
+ LTEXT "&Jas:", 1093, 150, 166, 40, 9
+ LTEXT "Èe&rvená:", 1094, 150, 126, 40, 9
+ LTEXT "&Zelená:", 1095, 150, 146, 40, 9
+ LTEXT "&Modrá:", 1096, 150, 166, 40, 9
+ DEFPUSHBUTTON "Ok", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Pøidat barvu", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Vyøadit barvu", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Storno", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Hledání"
+FONT 8, "Helv"
+{
+ LTEXT "&Vyhledat:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Pouze &celá slova", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Rozliovat malá a velká písmena", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Smìr", 1072, 107, 26, 68, 28
+ CONTROL "N&ahoru", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Dolu", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "Vyhledat d&alí", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Zavøít", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Nápovìda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Zámìna"
+FONT 8, "Helv"
+{
+ LTEXT "&Vyhledat:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Zamìnit za:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Pouze &celá slova", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Rozliovat malá a velká písmena", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "Vyhledat d&alí", 1, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Za&mìnit", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Zamìnit ve vý&bìru", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Zavøít", 2, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Nápovìda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Cs.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Cs.rc	(revision 3028)
+++ 	(revision )
@@ -1,163 +1,0 @@
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Otevøení souboru"
-FONT 8, "Helv"
-{
- LTEXT "&jméno souboru:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Adresáøe:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Typ zobrazených souborù:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Diskové jednotky:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Otevøít", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Storno", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Nápovìda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Pouze pro ètení", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ulo pod jménem..."
-FONT 8, "Helv"
-{
- LTEXT "&Jméno souboru:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Adresáøe:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Typ zobrazených souborù:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Diskové jednotky:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ulo pod jménem", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Storno", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Nápovìda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Pouze pro ètení", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tisk"
-FONT 8, "Helv"
-{
- LTEXT "Tiskárna:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Rozsah tisku", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "Vytiskni v&e", 1056, 16, 45, 60, 12
- RADIOBUTTON "Vytiskni &výbìr", 1057, 16, 60, 60, 12
- RADIOBUTTON "Vytiskni &zadané stránky", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Tiskni", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Storno", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Nastavit...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Od:", 1090, 60, 80, 30, 9
- LTEXT "&Do:", 1091, 120, 80, 30, 9
- LTEXT "Kvalita &tisku:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Tisk do so&uboru", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Kondenzované", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Nastavení zpùsobu tisku"
-FONT 8, "Helv"
-{
- GROUPBOX "Tiskárna", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Pøedvolená tiskárna", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Specifická &tiskárna", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Storno", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Dalí volby...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientace", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "Na &výku", 1058, 50, 100, 40, 12
- RADIOBUTTON "Na íø&ku", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papír", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Formát", 1089, 130, 95, 30, 9
- LTEXT "&Odkud", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Písmo"
-FONT 8, "Helv"
-{
- LTEXT "Písmo:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Storno", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Barvy"
-FONT 8, "Helv"
-{
- LTEXT "&Základní barvy:", 1088, 6, 6, 40, 9
- LTEXT "&Barvy na zakázku:", 1089, 6, 126, 40, 9
- LTEXT "Barva|Spoj&itá", 1090, 100, 146, 40, 9
- LTEXT "&Odstín:", 1091, 150, 126, 40, 9
- LTEXT "&Sytost:", 1092, 150, 146, 40, 9
- LTEXT "&Jas:", 1093, 150, 166, 40, 9
- LTEXT "Èe&rvená:", 1094, 150, 126, 40, 9
- LTEXT "&Zelená:", 1095, 150, 146, 40, 9
- LTEXT "&Modrá:", 1096, 150, 166, 40, 9
- DEFPUSHBUTTON "Ok", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Pøidat barvu", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Vyøadit barvu", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Storno", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Hledání"
-FONT 8, "Helv"
-{
- LTEXT "&Vyhledat:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Pouze &celá slova", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Rozliovat malá a velká písmena", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Smìr", 1072, 107, 26, 68, 28
- CONTROL "N&ahoru", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Dolu", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "Vyhledat d&alí", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Zavøít", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Nápovìda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Zámìna"
-FONT 8, "Helv"
-{
- LTEXT "&Vyhledat:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Zamìnit za:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Pouze &celá slova", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Rozliovat malá a velká písmena", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "Vyhledat d&alí", 1, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Za&mìnit", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Zamìnit ve vý&bìru", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Zavøít", 2, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Nápovìda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Da.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Da.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Da.orc	(revision 3031)
@@ -0,0 +1,194 @@
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Åbn"
+FONT 8, "Helv"
+{
+ LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Oversigt over filer af type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Drev:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Å&bn", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjælp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Gem som ..."
+FONT 8, "Helv"
+{
+ LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Oversigt over filer af type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Drev:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "&Gem som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjælp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Udskriv"
+FONT 8, "Helv"
+{
+ LTEXT "Printer:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Udskriv område", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Alt", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&Markeret", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Sider", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Udskriv", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Indstilling", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Fra:", 1090, 60, 80, 30, 9
+ LTEXT "&Til:", 1091, 120, 80, 30, 9
+ LTEXT "Udskrifts&kvalitet:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Udskriv til fi&l", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sammentrykket", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Udskriftsindstilling"
+FONT 8, "Helv"
+{
+ GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Standardprinter", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Specifik &printer", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Indstilling", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Po&rtræt", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Landskab", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papir", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "Størrelse", 1089, 130, 95, 30, 9
+ LTEXT "&Kilde", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Skrifttyper"
+FONT 8, "Helv"
+{
+    LTEXT           "Skrifttype&navn:", 1088, 6, 6, 40, 9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Typografi:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Størrelse:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Annuller",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Anvend", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Hjælp" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Effekter",1072,6,72,84,34,WS_GROUP
+    CHECKBOX        "&Gennemstreget", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Understreget", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Farve:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Eksempel",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Farve"
+FONT 8, "Helv"
+{
+ LTEXT "&Grundlæggende farver:",   1088, 4,    4,  140, 10
+ LTEXT "&Selvvalgte farver:",  1089, 4,   106, 140, 10
+ LTEXT "&Ensfarvet",  1090, 150, 151,  48, 10
+ LTEXT   "&Rød:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Grøn:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blå:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Intensitet:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Farvemætning:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lysstyrke:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Hjælp", 1038,100,166, 44, 14
+ PUSHBUTTON "&Tilføj til selvvalgte farver",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definer selvvalgt farve >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Find"
+FONT 8, "Helv"
+{
+ LTEXT "&Find hvad:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Kun hele ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Forskel på store/små &bogstaver", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Retning", 1072, 107, 26, 68, 28
+ CONTROL "&Op", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Ned", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Find næste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjælp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Erstat"
+FONT 8, "Helv"
+{
+ LTEXT "&Find hvad:",  -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Erstat med:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "Forskel på store/små &bogstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "&Find næste", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Erstat", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Erstat &alle", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuller", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjælp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Da.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Da.rc	(revision 3028)
+++ 	(revision )
@@ -1,194 +1,0 @@
-LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Åbn"
-FONT 8, "Helv"
-{
- LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Oversigt over filer af type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Drev:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Å&bn", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjælp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Gem som ..."
-FONT 8, "Helv"
-{
- LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Oversigt over filer af type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Drev:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "&Gem som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjælp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Udskriv"
-FONT 8, "Helv"
-{
- LTEXT "Printer:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Udskriv område", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Alt", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Markeret", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Sider", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Udskriv", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Indstilling", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Fra:", 1090, 60, 80, 30, 9
- LTEXT "&Til:", 1091, 120, 80, 30, 9
- LTEXT "Udskrifts&kvalitet:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Udskriv til fi&l", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Sammentrykket", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Udskriftsindstilling"
-FONT 8, "Helv"
-{
- GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Standardprinter", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Specifik &printer", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Indstilling", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "Po&rtræt", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Landskab", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papir", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "Størrelse", 1089, 130, 95, 30, 9
- LTEXT "&Kilde", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skrifttyper"
-FONT 8, "Helv"
-{
-    LTEXT           "Skrifttype&navn:", 1088, 6, 6, 40, 9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Typografi:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Størrelse:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Annuller",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Anvend", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Hjælp" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Effekter",1072,6,72,84,34,WS_GROUP
-    CHECKBOX        "&Gennemstreget", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Understreget", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "&Farve:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Eksempel",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Farve"
-FONT 8, "Helv"
-{
- LTEXT "&Grundlæggende farver:",   1088, 4,    4,  140, 10
- LTEXT "&Selvvalgte farver:",  1089, 4,   106, 140, 10
- LTEXT "&Ensfarvet",  1090, 150, 151,  48, 10
- LTEXT   "&Rød:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Grøn:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Blå:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Intensitet:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Farvemætning:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lysstyrke:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Hjælp", 1038,100,166, 44, 14
- PUSHBUTTON "&Tilføj til selvvalgte farver",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Definer selvvalgt farve >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Find"
-FONT 8, "Helv"
-{
- LTEXT "&Find hvad:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Kun hele ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Forskel på store/små &bogstaver", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Retning", 1072, 107, 26, 68, 28
- CONTROL "&Op", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Ned", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-
- DEFPUSHBUTTON "&Find næste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjælp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Erstat"
-FONT 8, "Helv"
-{
- LTEXT "&Find hvad:",  -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Erstat med:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- CHECKBOX "Forskel på store/små &bogstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "&Find næste", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Erstat", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Erstat &alle", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuller", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjælp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_De.orc
===================================================================
--- trunk/src/comdlg32/cdlg_De.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_De.orc	(revision 3031)
@@ -0,0 +1,193 @@
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Öffnen"
+FONT 8, "Helv"
+{
+ LTEXT "Datei&name:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Öffnen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Speichern als ..."
+FONT 8, "Helv"
+{
+ LTEXT "Datei&name:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Speichern als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Drucken"
+FONT 8, "Helv"
+{
+ LTEXT "Drucker:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Alles", 1056, 16, 45, 60, 12
+ RADIOBUTTON "A&uswahl", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Seiten", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Drucken", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Von:", 1090, 60, 80, 30, 9
+ LTEXT "&Bis:", 1091, 120, 80, 30, 9
+ LTEXT "Druck&qualität:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "In &Datei drucken", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Verdichtet", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Druckereinrichtung"
+FONT 8, "Helv"
+{
+ GROUPBOX "Drucker", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Standarddrucker", 1056, 16, 20, 80, 12
+ LTEXT "[keiner]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Bestimmter &Drucker", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientierung", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Hochformat", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Querformat", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Größe", 1089, 130, 95, 30, 9
+ LTEXT "P&apierquelle", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+    LTEXT           "Schrift&art:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Schrift&stil:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Schrift&größe:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Zuweisen", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Hilfe" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Darstellung",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Durchgestrichen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Unterstrichen", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Farbe:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Muster",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Farbe"
+FONT 8, "Helv"
+{
+ LTEXT "Gr&undfarben:",   1088, 4,    4,  140, 10
+ LTEXT "Selbs&tdefinierte Farben:",  1089, 4,   106, 140, 10
+ LTEXT "Farbe |  B&asis",  1090, 150, 151,  48, 10
+ LTEXT   "&Rot:", 726 ,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Grün:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blau:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Farbe:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sätt:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "H&ell:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", 1038,100,166, 44, 14
+ PUSHBUTTON "Farbe hin&zufügen",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Farben &definieren >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&a",713,300,200,4,14   /* just a dummy:  'a' is  like  &a  in "B&asis"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Suchen"
+FONT 8, "Helv"
+{
+ LTEXT "S&uchen nach:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Richtung", 1072, 107, 26, 68, 28
+ CONTROL "H&och", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Runter", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "&Nächsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ersetzen"
+FONT 8, "Helv"
+{
+ LTEXT "S&uchen nach:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "&Nächsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ersetzen", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Alle ersetzen", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_De.rc
===================================================================
--- trunk/src/comdlg32/cdlg_De.rc	(revision 3028)
+++ 	(revision )
@@ -1,193 +1,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Öffnen"
-FONT 8, "Helv"
-{
- LTEXT "Datei&name:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Öffnen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Speichern als ..."
-FONT 8, "Helv"
-{
- LTEXT "Datei&name:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Verzeichnisse:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste der Datei&typen:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Laufwerke:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Speichern als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Drucken"
-FONT 8, "Helv"
-{
- LTEXT "Drucker:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Alles", 1056, 16, 45, 60, 12
- RADIOBUTTON "A&uswahl", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Seiten", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Drucken", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Von:", 1090, 60, 80, 30, 9
- LTEXT "&Bis:", 1091, 120, 80, 30, 9
- LTEXT "Druck&qualität:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "In &Datei drucken", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Verdichtet", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Druckereinrichtung"
-FONT 8, "Helv"
-{
- GROUPBOX "Drucker", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Standarddrucker", 1056, 16, 20, 80, 12
- LTEXT "[keiner]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Bestimmter &Drucker", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientierung", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Hochformat", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Querformat", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Größe", 1089, 130, 95, 30, 9
- LTEXT "P&apierquelle", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
-FONT 8, "Helv"
-{
-    LTEXT           "Schrift&art:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Schrift&stil:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Schrift&größe:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Zuweisen", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Hilfe" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Darstellung",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "&Durchgestrichen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Unterstrichen", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "&Farbe:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Muster",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Farbe"
-FONT 8, "Helv"
-{
- LTEXT "Gr&undfarben:",   1088, 4,    4,  140, 10
- LTEXT "Selbs&tdefinierte Farben:",  1089, 4,   106, 140, 10
- LTEXT "Farbe |  B&asis",  1090, 150, 151,  48, 10
- LTEXT   "&Rot:", 726 ,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Grün:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Blau:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Farbe:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sätt:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "H&ell:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038,100,166, 44, 14
- PUSHBUTTON "Farbe hin&zufügen",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Farben &definieren >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&a",713,300,200,4,14   /* just a dummy:  'a' is  like  &a  in "B&asis"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Suchen"
-FONT 8, "Helv"
-{
- LTEXT "S&uchen nach:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur ganze &Worte", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Richtung", 1072, 107, 26, 68, 28
- CONTROL "H&och", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Runter", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Nächsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ersetzen"
-FONT 8, "Helv"
-{
- LTEXT "S&uchen nach:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Ersetzen &durch:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur ganze &Worte", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "&Nächsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ersetzen", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Alle ersetzen", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_En.orc
===================================================================
--- trunk/src/comdlg32/cdlg_En.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_En.orc	(revision 3031)
@@ -0,0 +1,374 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Open"
+FONT 8, "Helv"
+{
+ LTEXT "File &Name:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Directories:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Open", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Save As ..."
+FONT 8, "Helv"
+{
+ LTEXT "File &Name:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Directories:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Save As", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Print"
+FONT 8, "Helv"
+{
+ LTEXT "Printer:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Print Range", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&All", 1056, 16, 45, 60, 12
+ RADIOBUTTON "S&election", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Pages", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Print", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&From:", 1090, 60, 80, 30, 9
+ LTEXT "&To:", 1091, 120, 80, 30, 9
+ LTEXT "Print &Quality:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Print to Fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Print Setup"
+FONT 8, "Helv"
+{
+ GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Specific &Printer", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Po&rtrait", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Landscape", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "Si&ze", 1089, 130, 95, 30, 9
+ LTEXT "&Source", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+    LTEXT           "&Font:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Font St&yle:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Size:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+    PUSHBUTTON      "Cancel",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Apply", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Effects",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "Stri&keout", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Underline", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Color:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Sample",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Color"
+FONT 8, "Helv"
+{
+ LTEXT "&Basic Colors:",   1088, 4,    4,  140, 10
+ LTEXT "&Custom Colors:",  1089, 4,   106, 140, 10
+ LTEXT "Color |  Sol&id",  1090, 150, 151,  48, 10
+ LTEXT   "&Red:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Green:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blue:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Help", 1038,100,166, 44, 14
+ PUSHBUTTON "&Add to Custom Colors",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Define Custom Colors >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Find"
+FONT 8, "Helv"
+{
+ LTEXT "Fi&nd What:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Whole Word Only", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Case", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direction", 1072, 107, 26, 68, 28
+ CONTROL "&Up", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Down", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Find Next", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+ PUSHBUTTON "Cancel", IDCANCEL	 , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp	 , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Replace"
+FONT 8, "Helv"
+{
+ LTEXT "Fi&nd What:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Re&place With:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Whole Word Only", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Case", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "&Find Next", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+ PUSHBUTTON "&Replace", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Replace &All", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print32"
+FONT 8, "Helv"
+{
+    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Help",  pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "&Properties",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Name:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Where:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Comment:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Copies",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Number of &copies:",stc5,168,108,68,8
+    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "C&ollate",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "Print range",    grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&All",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "Pa&ges",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "&Selection",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&from:",         stc2,  52,124,  20,8
+    RTEXT           "&to:",           stc3, 100,124,  16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print32 Setup"
+FONT 8, "Helv"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Cancel",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Network...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&Properties",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Name:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Where:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Comment:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Paper",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "Si&ze:",         stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "&Source:",       stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    
+    GROUPBOX        "Orientation",    grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "P&ortrait",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "L&andscape",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Open"
+FONT 8, "helv"
+{
+    LTEXT	"Look &in",IDC_LOOKINSTATIC,7,6,41,8, SS_NOTIFY
+    COMBOBOX	IDC_LOOKIN,50,3,138,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT	"" , IDC_TOOLBARSTATIC, 188, 2, 82, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+    
+    LTEXT	"File &name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+    
+    LTEXT	"Files of &type",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON	"&Open",		 IDOK,222,110,50,14
+    PUSHBUTTON		"Cancel",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Help",		 pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE 
+{
+    IDS_ABOUTBOX            "&About FolderPicker Test"
+    IDS_DOCUMENTFOLDERS     "Document Folders"
+    IDS_PERSONAL            "My Documents"
+    IDS_FAVORITES           "My Favorites"
+    IDS_PATH                "System Path"
+    IDS_DESKTOP             "Desktop"
+    IDS_FONTS               "Fonts"
+    IDS_MYCOMPUTER          "My Computer"
+}
+
+STRINGTABLE DISCARDABLE 
+{
+    IDS_SYSTEMFOLDERS       "System Folders"
+    IDS_LOCALHARDRIVES      "Local Hard Drives"
+    IDS_FILENOTFOUND        "File not found"
+    IDS_VERIFYFILE          "Please verify if the correct file name was given"
+    IDS_CREATEFILE          "File does not exist\nDo you want to create file"
+}
+
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE       "Print"
+
+    PD32_VALUE_UREADABLE                  "Unreadable Entry"
+    PD32_INVALID_PAGE_RANGE "This value lies not within Page range\n\
+Please enter a value between %d and %d"
+    PD32_FROM_NOT_ABOVE_TO                "The FROM entry cannot exceed TO:"
+    PD32_MARGINS_OVERLAP                  "Margins overlap or fall outside \
+Paper boundaries.\nPlease reenter margins"
+    PD32_NR_OF_COPIES_EMPTY               "The NumberOfCopies entry cannot \
+be empty"
+    PD32_TOO_LARGE_COPIES                 "This large amount of prints is not \
+supported by your printer.\nPlease enter a value between 1 and %d"
+    PD32_PRINT_ERROR                      "A printer error occurred"
+    PD32_NO_DEFAULT_PRINTER               "There is not default printer"
+    PD32_CANT_FIND_PRINTER                "Cannot find the printer"
+    PD32_OUT_OF_MEMORY                    "Out of memory"
+    PD32_GENERIC_ERROR                    "Some error occurred"
+    PD32_DRIVER_UNKNOWN                   "Unknown printer driver"
+
+    PD32_DEFAULT_PRINTER                  "Default Printer; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "There are %d documents in queue"
+    PD32_PRINT_ALL_X_PAGES                "&All %d pages"
+    PD32_MARGINS_IN_INCHES                "Margins [inches]"
+    PD32_MARGINS_IN_MILIMETERS            "Margins [mm]"
+    PD32_MILIMETERS                       "mm"
+
+    PD32_PRINTER_STATUS_READY             "Ready"
+    PD32_PRINTER_STATUS_PAUSED            "Paused; "
+    PD32_PRINTER_STATUS_ERROR             "Error; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Pending deletion; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Out of paper; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Feed paper manual; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Paper problem; "
+    PD32_PRINTER_STATUS_OFFLINE           "Printer offline; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Active; "
+    PD32_PRINTER_STATUS_BUSY              "Busy; "
+    PD32_PRINTER_STATUS_PRINTING          "Printing; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Output tray is full; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Not available; "
+    PD32_PRINTER_STATUS_WAITING           "Waiting; "
+    PD32_PRINTER_STATUS_PROCESSING        "Processing; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Initialising; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Warming up; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Toner low; "
+    PD32_PRINTER_STATUS_NO_TONER          "No toner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Out of memory; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "The printer door is open; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server unknown; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Power safe mode; "
+}
Index: trunk/src/comdlg32/cdlg_En.rc
===================================================================
--- trunk/src/comdlg32/cdlg_En.rc	(revision 3028)
+++ 	(revision )
@@ -1,374 +1,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Open"
-FONT 8, "Helv"
-{
- LTEXT "File &Name:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directories:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Open", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Save As ..."
-FONT 8, "Helv"
-{
- LTEXT "File &Name:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directories:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Save As", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Print"
-FONT 8, "Helv"
-{
- LTEXT "Printer:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Print Range", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&All", 1056, 16, 45, 60, 12
- RADIOBUTTON "S&election", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Pages", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Print", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&From:", 1090, 60, 80, 30, 9
- LTEXT "&To:", 1091, 120, 80, 30, 9
- LTEXT "Print &Quality:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Print to Fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Print Setup"
-FONT 8, "Helv"
-{
- GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Specific &Printer", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "Po&rtrait", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Landscape", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "Si&ze", 1089, 130, 95, 30, 9
- LTEXT "&Source", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
-FONT 8, "Helv"
-{
-    LTEXT           "&Font:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Font St&yle:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Size:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
-    PUSHBUTTON      "Cancel",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Apply", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Effects",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "Stri&keout", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Underline", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "&Color:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Sample",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Color"
-FONT 8, "Helv"
-{
- LTEXT "&Basic Colors:",   1088, 4,    4,  140, 10
- LTEXT "&Custom Colors:",  1089, 4,   106, 140, 10
- LTEXT "Color |  Sol&id",  1090, 150, 151,  48, 10
- LTEXT   "&Red:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Green:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Blue:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Help", 1038,100,166, 44, 14
- PUSHBUTTON "&Add to Custom Colors",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Define Custom Colors >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Find"
-FONT 8, "Helv"
-{
- LTEXT "Fi&nd What:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Whole Word Only", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Case", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direction", 1072, 107, 26, 68, 28
- CONTROL "&Up", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Down", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-
- DEFPUSHBUTTON "&Find Next", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
- PUSHBUTTON "Cancel", IDCANCEL	 , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", pshHelp	 , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Replace"
-FONT 8, "Helv"
-{
- LTEXT "Fi&nd What:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Re&place With:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Whole Word Only", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Case", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-
- DEFPUSHBUTTON "&Find Next", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
- PUSHBUTTON "&Replace", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Replace &All", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
-      DS_CONTEXTHELP | DS_3DLOOK
-CAPTION "Print32"
-FONT 8, "Helv"
-{
-    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
-    PUSHBUTTON      "Cancel", IDCANCEL, 232,164, 48,14, WS_GROUP
-    PUSHBUTTON      "&Help",  pshHelp,  50, 161, 48,14, WS_GROUP
-
-    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
-    CONTROL         "Print to fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
-    PUSHBUTTON      "&Properties",    psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Name:",         stc6,  16, 20,  36,8
-    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Where:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Comment:",       stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-
-    GROUPBOX        "Copies",         grp2, 160, 92, 120,64, WS_GROUP
-    LTEXT           "Number of &copies:",stc5,168,108,68,8
-    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "C&ollate",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
-    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
-
-    GROUPBOX        "Print range",    grp1,   8,92,  144,64, WS_GROUP
-    CONTROL         "&All",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
-    CONTROL         "Pa&ges",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "&Selection",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
-    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
-    RTEXT           "&from:",         stc2,  52,124,  20,8
-    RTEXT           "&to:",           stc3, 100,124,  16,8
-}
-
-PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
-      DS_CONTEXTHELP | DS_3DLOOK
-CAPTION "Print32 Setup"
-FONT 8, "Helv"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Cancel",IDCANCEL,232,156,48,14
-/*    PUSHBUTTON      "Network...", psh5, 284,156,48,14 */
-
-    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
-    PUSHBUTTON      "&Properties",    psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Name:",         stc6,  16, 20,  36,8
-    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Where:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Comment:",       stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-
-    GROUPBOX        "Paper",          grp2,   8, 92, 164,56, WS_GROUP
-    LTEXT           "Si&ze:",         stc2,  16,108,  36, 8
-    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "&Source:",       stc3,  16,128,  36, 8
-    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    
-    GROUPBOX        "Orientation",    grp1, 180, 92, 100,56, WS_GROUP
-    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
-    CONTROL         "P&ortrait",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
-    CONTROL         "L&andscape",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
-END
-
-
-NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
-STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Open"
-FONT 8, "helv"
-{
-    LTEXT	"Look &in",IDC_LOOKINSTATIC,7,6,41,8, SS_NOTIFY
-    COMBOBOX	IDC_LOOKIN,50,3,138,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT	"" , IDC_TOOLBARSTATIC, 188, 2, 82, 17, NOT WS_GROUP | NOT WS_VISIBLE
-    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
-    
-    LTEXT	"File &name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
-    EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
-    
-    LTEXT	"Files of &type",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
-    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-
-    CONTROL	"Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
-
-    DEFPUSHBUTTON	"&Open",		 IDOK,222,110,50,14
-    PUSHBUTTON		"Cancel",		 IDCANCEL,222,128,50,14
-    PUSHBUTTON		"&Help",		 pshHelp,222,145,50,14
-}
-
-STRINGTABLE DISCARDABLE 
-{
-    IDS_ABOUTBOX            "&About FolderPicker Test"
-    IDS_DOCUMENTFOLDERS     "Document Folders"
-    IDS_PERSONAL            "My Documents"
-    IDS_FAVORITES           "My Favorites"
-    IDS_PATH                "System Path"
-    IDS_DESKTOP             "Desktop"
-    IDS_FONTS               "Fonts"
-    IDS_MYCOMPUTER          "My Computer"
-}
-
-STRINGTABLE DISCARDABLE 
-{
-    IDS_SYSTEMFOLDERS       "System Folders"
-    IDS_LOCALHARDRIVES      "Local Hard Drives"
-    IDS_FILENOTFOUND        "File not found"
-    IDS_VERIFYFILE          "Please verify if the correct file name was given"
-    IDS_CREATEFILE          "File does not exist\nDo you want to create file"
-}
-
-
-STRINGTABLE DISCARDABLE
-{
-    PD32_PRINT_TITLE       "Print"
-
-    PD32_VALUE_UREADABLE                  "Unreadable Entry"
-    PD32_INVALID_PAGE_RANGE "This value lies not within Page range\n\
-Please enter a value between %d and %d"
-    PD32_FROM_NOT_ABOVE_TO                "The FROM entry cannot exceed TO:"
-    PD32_MARGINS_OVERLAP                  "Margins overlap or fall outside \
-Paper boundaries.\nPlease reenter margins"
-    PD32_NR_OF_COPIES_EMPTY               "The NumberOfCopies entry cannot \
-be empty"
-    PD32_TOO_LARGE_COPIES                 "This large amount of prints is not \
-supported by your printer.\nPlease enter a value between 1 and %d"
-    PD32_PRINT_ERROR                      "A printer error occurred"
-    PD32_NO_DEFAULT_PRINTER               "There is not default printer"
-    PD32_CANT_FIND_PRINTER                "Cannot find the printer"
-    PD32_OUT_OF_MEMORY                    "Out of memory"
-    PD32_GENERIC_ERROR                    "Some error occurred"
-    PD32_DRIVER_UNKNOWN                   "Unknown printer driver"
-
-    PD32_DEFAULT_PRINTER                  "Default Printer; "
-    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "There are %d documents in queue"
-    PD32_PRINT_ALL_X_PAGES                "&All %d pages"
-    PD32_MARGINS_IN_INCHES                "Margins [inches]"
-    PD32_MARGINS_IN_MILIMETERS            "Margins [mm]"
-    PD32_MILIMETERS                       "mm"
-
-    PD32_PRINTER_STATUS_READY             "Ready"
-    PD32_PRINTER_STATUS_PAUSED            "Paused; "
-    PD32_PRINTER_STATUS_ERROR             "Error; "
-    PD32_PRINTER_STATUS_PENDING_DELETION  "Pending deletion; "
-    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam; "
-    PD32_PRINTER_STATUS_PAPER_OUT         "Out of paper; "
-    PD32_PRINTER_STATUS_MANUAL_FEED       "Feed paper manual; "
-    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Paper problem; "
-    PD32_PRINTER_STATUS_OFFLINE           "Printer offline; "
-    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Active; "
-    PD32_PRINTER_STATUS_BUSY              "Busy; "
-    PD32_PRINTER_STATUS_PRINTING          "Printing; "
-    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Output tray is full; "
-    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Not available; "
-    PD32_PRINTER_STATUS_WAITING           "Waiting; "
-    PD32_PRINTER_STATUS_PROCESSING        "Processing; "
-    PD32_PRINTER_STATUS_INITIALIZING      "Initialising; "
-    PD32_PRINTER_STATUS_WARMING_UP        "Warming up; "
-    PD32_PRINTER_STATUS_TONER_LOW         "Toner low; "
-    PD32_PRINTER_STATUS_NO_TONER          "No toner; "
-    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
-    PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; "
-    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Out of memory; "
-    PD32_PRINTER_STATUS_DOOR_OPEN         "The printer door is open; "
-    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server unknown; "
-    PD32_PRINTER_STATUS_POWER_SAVE        "Power safe mode; "
-}
Index: trunk/src/comdlg32/cdlg_Eo.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Eo.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Eo.orc	(revision 3031)
@@ -0,0 +1,163 @@
+LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Malfermu dosieron"
+FONT 8, "Helv"
+{
+ LTEXT "Dosier&nomo:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Dosier&ujo:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Dosier&speco:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Disk&ilo:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Malfermu", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Helpu", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nur &legebla", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Sekurigu dosieron"
+FONT 8, "Helv"
+{
+ LTEXT "Dosier&nomo:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Dosier&ujo:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Dosier&speco:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Disk&ilo:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Sekurigu", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Helpu", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nur &legebla", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Presu"
+FONT 8, "Helv"
+{
+ LTEXT "Presilo:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Etendiøon", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "æ&iujn", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&elekton", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&paøojn", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Presu", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aranøu", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "de:", 1090, 60, 80, 30, 9
+ LTEXT "øis:", 1091, 120, 80, 30, 9
+ LTEXT "&Kvalito:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Presu &dosieren", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Mallarøtipe", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Presada Aranøo"
+FONT 8, "Helv"
+{
+ GROUPBOX "Presilo", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Implicita Presilo", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "&Specifa Presilo", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Enorde", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Agordo", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Formato", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Vertikala", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Horizontala", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papero", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Grando", 1089, 130, 95, 30, 9
+ LTEXT "&Fonto", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tiparo"
+FONT 8, "Helv"
+{
+ LTEXT "Tiparo:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ DEFPUSHBUTTON "Enorde", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Koloro"
+FONT 8, "Helv"
+{
+ LTEXT "&Normala koloraro:", 1088, 6, 6, 40, 9
+ LTEXT "&Persona koloraro:", 1089, 6, 126, 40, 9
+ LTEXT "Color|Sol&id", 1090, 100, 146, 40, 9
+ LTEXT "&Farbo:", 1091, 150, 126, 40, 9
+ LTEXT "&Saturo:", 1092, 150, 146, 40, 9
+ LTEXT "&Helo:", 1093, 150, 166, 40, 9
+ LTEXT "&Ruøo:", 1094, 150, 126, 40, 9
+ LTEXT "&Verda:", 1095, 150, 146, 40, 9
+ LTEXT "&Bluo:", 1096, 150, 166, 40, 9
+ DEFPUSHBUTTON "Enorde", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aldonu al persona koloraro", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Forv&iþu personan koloraron", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Seræu"
+FONT 8, "Helv"
+{
+ LTEXT "&Seræu:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nur tutan &vorton", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Atentu &Usklecon", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direkto", 1072, 107, 26, 68, 28
+ CONTROL "&Retro", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Antaýen", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "&Pluseræu", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Helpu", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Anstataýigu"
+FONT 8, "Helv"
+{
+ LTEXT "Anstataýigu:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&per:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Nur tutan &vorton", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Atentu &Usklecon", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "Plu&seræu", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Anstataýigu", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anstataýigu æ&iujn", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Nuligu", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Helpu", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Eo.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Eo.rc	(revision 3028)
+++ 	(revision )
@@ -1,163 +1,0 @@
-LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Malfermu dosieron"
-FONT 8, "Helv"
-{
- LTEXT "Dosier&nomo:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Dosier&ujo:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Dosier&speco:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Disk&ilo:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Malfermu", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Helpu", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur &legebla", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Sekurigu dosieron"
-FONT 8, "Helv"
-{
- LTEXT "Dosier&nomo:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Dosier&ujo:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Dosier&speco:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Disk&ilo:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Sekurigu", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Helpu", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur &legebla", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Presu"
-FONT 8, "Helv"
-{
- LTEXT "Presilo:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Etendiøon", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "æ&iujn", 1056, 16, 45, 60, 12
- RADIOBUTTON "&elekton", 1057, 16, 60, 60, 12
- RADIOBUTTON "&paøojn", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Presu", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aranøu", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "de:", 1090, 60, 80, 30, 9
- LTEXT "øis:", 1091, 120, 80, 30, 9
- LTEXT "&Kvalito:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Presu &dosieren", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Mallarøtipe", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Presada Aranøo"
-FONT 8, "Helv"
-{
- GROUPBOX "Presilo", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Implicita Presilo", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "&Specifa Presilo", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Enorde", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Agordo", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Formato", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Vertikala", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Horizontala", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papero", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Grando", 1089, 130, 95, 30, 9
- LTEXT "&Fonto", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tiparo"
-FONT 8, "Helv"
-{
- LTEXT "Tiparo:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- DEFPUSHBUTTON "Enorde", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Koloro"
-FONT 8, "Helv"
-{
- LTEXT "&Normala koloraro:", 1088, 6, 6, 40, 9
- LTEXT "&Persona koloraro:", 1089, 6, 126, 40, 9
- LTEXT "Color|Sol&id", 1090, 100, 146, 40, 9
- LTEXT "&Farbo:", 1091, 150, 126, 40, 9
- LTEXT "&Saturo:", 1092, 150, 146, 40, 9
- LTEXT "&Helo:", 1093, 150, 166, 40, 9
- LTEXT "&Ruøo:", 1094, 150, 126, 40, 9
- LTEXT "&Verda:", 1095, 150, 146, 40, 9
- LTEXT "&Bluo:", 1096, 150, 166, 40, 9
- DEFPUSHBUTTON "Enorde", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aldonu al persona koloraro", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Forv&iþu personan koloraron", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Seræu"
-FONT 8, "Helv"
-{
- LTEXT "&Seræu:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur tutan &vorton", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Atentu &Usklecon", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direkto", 1072, 107, 26, 68, 28
- CONTROL "&Retro", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Antaýen", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Pluseræu", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Helpu", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Anstataýigu"
-FONT 8, "Helv"
-{
- LTEXT "Anstataýigu:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&per:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Nur tutan &vorton", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Atentu &Usklecon", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "Plu&seræu", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Anstataýigu", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anstataýigu æ&iujn", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Nuligu", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Helpu", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Es.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Es.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Es.orc	(revision 3031)
@@ -0,0 +1,193 @@
+LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Abrir"
+FONT 8, "Helv"
+{
+ LTEXT "Nombre de &archivo:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Directorios:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Mostrar archivos de tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "U&nidades:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&yuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Solo lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "&Guardar como..."
+FONT 8, "Helv"
+{
+ LTEXT "Nombre de &archivo:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Directorios:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Mostrar archivos de tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "U&nidades:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "&Guardar como", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&yuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Solo lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Imprimir"
+FONT 8, "Helv"
+{
+ LTEXT "Impresora:", 1088, 6, 6, 40, 9
+ LTEXT "Campo de impresión", 1089, 60, 6, 150, 9
+ GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Todo", 1056, 16, 45, 60, 12
+ RADIOBUTTON "Selecc&ión", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Paginas", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Desde:", 1090, 60, 80, 30, 9
+ LTEXT "&Hasta:", 1091, 120, 80, 30, 9
+ LTEXT "Calidad de impre&sión:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Impri&mir en un archivo", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configuración de impresión"
+FONT 8, "Helv"
+{
+ GROUPBOX "Impresora:", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "Pre&determinada del sistema", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Impresora &especmfica:", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Aceptar", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientación", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Horizontal", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Tamaño", 1089, 130, 95, 30, 9
+ LTEXT "O&rigen:", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Fuente"
+FONT 8, "Helv"
+{
+    LTEXT           "&Fuente:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Est&ilo de fuente:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Tamaño:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "Aceptar",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "A&plicar", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "A&yuda" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "&Efectos",1072,6,72,84,34,WS_GROUP
+    CHECKBOX        "&Rayado", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Subrayado", 1041, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Color:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Ejemplo",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZzÑñ",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Color"
+FONT 8, "Helv"
+{
+ LTEXT "Colores &básicos:", 1088, 4, 4, 140, 10
+ LTEXT "Colores person&alizados:", 1089, 4, 106, 140, 10
+ LTEXT "Color|Só3l&ido", 1090, 150, 151, 48, 10
+ LTEXT   "&Rojo:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Verde:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "A&zul:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Tinte:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Aceptar",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&yuda", 1038,100,166, 44, 14
+ PUSHBUTTON "Agregar a los &colores personalizados", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definir colores personalizados >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Buscar"
+FONT 8, "Helv"
+{
+ LTEXT "Buscar:",  -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Comparar palabra entera solamente", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Mayúsculas/minúsculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Dirección", 1072, 107, 26, 68, 28
+ CONTROL "A&rriba", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Abajo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "Buscar &siguiente", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&yuda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "R&eemplazar"
+FONT 8, "Helv"
+{
+ LTEXT "Buscar:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Re&emplazar por:", 1090, -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Comparar palabra entera solamente", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Mayúsculas/minúsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "Reemplazar &siguiente", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Reemplazar", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Reemplazar &todo", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&yuda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Es.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Es.rc	(revision 3028)
+++ 	(revision )
@@ -1,193 +1,0 @@
-LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Abrir"
-FONT 8, "Helv"
-{
- LTEXT "Nombre de &archivo:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directorios:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Mostrar archivos de tipo:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "U&nidades:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&yuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Solo lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "&Guardar como..."
-FONT 8, "Helv"
-{
- LTEXT "Nombre de &archivo:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Directorios:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Mostrar archivos de tipo:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "U&nidades:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "&Guardar como", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&yuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Solo lectura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir"
-FONT 8, "Helv"
-{
- LTEXT "Impresora:", 1088, 6, 6, 40, 9
- LTEXT "Campo de impresión", 1089, 60, 6, 150, 9
- GROUPBOX "", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Todo", 1056, 16, 45, 60, 12
- RADIOBUTTON "Selecc&ión", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Paginas", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Desde:", 1090, 60, 80, 30, 9
- LTEXT "&Hasta:", 1091, 120, 80, 30, 9
- LTEXT "Calidad de impre&sión:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Impri&mir en un archivo", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Configuración de impresión"
-FONT 8, "Helv"
-{
- GROUPBOX "Impresora:", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "Pre&determinada del sistema", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Impresora &especmfica:", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Aceptar", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientación", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Vertical", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Horizontal", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Tamaño", 1089, 130, 95, 30, 9
- LTEXT "O&rigen:", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Fuente"
-FONT 8, "Helv"
-{
-    LTEXT           "&Fuente:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Est&ilo de fuente:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Tamaño:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "Aceptar",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "A&plicar", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "A&yuda" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "&Efectos",1072,6,72,84,34,WS_GROUP
-    CHECKBOX        "&Rayado", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Subrayado", 1041, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "&Color:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Ejemplo",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZzÑñ",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Color"
-FONT 8, "Helv"
-{
- LTEXT "Colores &básicos:", 1088, 4, 4, 140, 10
- LTEXT "Colores person&alizados:", 1089, 4, 106, 140, 10
- LTEXT "Color|Só3l&ido", 1090, 150, 151, 48, 10
- LTEXT   "&Rojo:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Verde:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "A&zul:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Tinte:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Aceptar",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&yuda", 1038,100,166, 44, 14
- PUSHBUTTON "Agregar a los &colores personalizados", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Definir colores personalizados >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Buscar"
-FONT 8, "Helv"
-{
- LTEXT "Buscar:",  -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Comparar palabra entera solamente", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Mayúsculas/minúsculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Dirección", 1072, 107, 26, 68, 28
- CONTROL "A&rriba", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Abajo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "Buscar &siguiente", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&yuda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "R&eemplazar"
-FONT 8, "Helv"
-{
- LTEXT "Buscar:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Re&emplazar por:", 1090, -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Comparar palabra entera solamente", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Mayúsculas/minúsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "Reemplazar &siguiente", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Reemplazar", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Reemplazar &todo", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&yuda", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Fi.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Fi.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Fi.orc	(revision 3031)
@@ -0,0 +1,193 @@
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Avaa"
+FONT 8, "Helv"
+{
+ LTEXT "Tiedosto&nimi:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Hakemistot:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Luettele tiedostot tyypeittäin:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Asemat:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Avaa", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tallenna nimellä"
+FONT 8, "Helv"
+{
+ LTEXT "Tiedosto&nimi:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Hakemistot:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Tallenna tiedosto &muodossa:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Asemat:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Tallenna", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tulosta"
+FONT 8, "Helv"
+{
+ LTEXT "Kirjoitin:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Tulostusalue", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Kaikki", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&Valinta", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Sivut", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Tulosta", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Asetukset", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Mistä:", 1090, 60, 80, 30, 9
+ LTEXT "Mi&hin:", 1091, 120, 80, 30, 9
+ LTEXT "&Tulostustarkkuus:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Tulosta t&iedostoon", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Tiivistetty", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Kirjoittimen asetukset"
+FONT 8, "Helv"
+{
+ GROUPBOX "Kirjoitin", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "O&letuskirjoitin", 1056, 16, 20, 80, 12
+ LTEXT "[ei valittu]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "&Erityinen kirjoitin", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Asetukset...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Suunta", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Pysty", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Vaaka", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Paperi", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Koko:", 1089, 130, 95, 30, 9
+ LTEXT "Lä&hde:", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Fontit"
+FONT 8, "Helv"
+{
+    LTEXT           "&Fontti:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Fonttit&yyli:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Koko:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Peruuta",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Sovella", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Ohje" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Efektit",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "Yli&viivattu", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "A&lleviivattu", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "V&äri:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Näyte",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Väri"
+FONT 8, "Helv"
+{
+ LTEXT "Pe&rusvärit:",   1088, 4,    4,  140, 10
+ LTEXT "&Muokatut värit:",  1089, 4,   106, 140, 10
+ LTEXT "Väri|&Tasainen",  1090, 150, 151,  48, 10
+ LTEXT   "&Pun:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Vihr:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "Si&n:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sävy:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Kyll:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "K&irkk:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "S&ulje", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "O&hje", 1038,100,166, 44, 14
+ PUSHBUTTON "&Lisää väri",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "M&äärittele väri >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Etsi"
+FONT 8, "Helv"
+{
+ LTEXT "&Etsittävä:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Koko sana", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Kirjaink&oko", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Suunta", 1072, 107, 26, 68, 28
+ CONTROL "&Ylös", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Alas", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "Etsi &seuraava", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Peruuta", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "O&hje", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Korvaa"
+FONT 8, "Helv"
+{
+ LTEXT "&Etsittävä:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Ko&rvattava:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Koko sana", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Kirjaink&oko", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "Etsi &seuraava", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Korv&aa", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Korvaa ka&ikki", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "S&ulje", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "O&hje", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Fi.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Fi.rc	(revision 3028)
+++ 	(revision )
@@ -1,193 +1,0 @@
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Avaa"
-FONT 8, "Helv"
-{
- LTEXT "Tiedosto&nimi:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Hakemistot:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Luettele tiedostot tyypeittäin:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Asemat:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Avaa", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tallenna nimellä"
-FONT 8, "Helv"
-{
- LTEXT "Tiedosto&nimi:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Hakemistot:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Tallenna tiedosto &muodossa:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Asemat:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Tallenna", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ohje", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Vain luku", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tulosta"
-FONT 8, "Helv"
-{
- LTEXT "Kirjoitin:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Tulostusalue", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Kaikki", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Valinta", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Sivut", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Tulosta", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Asetukset", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Mistä:", 1090, 60, 80, 30, 9
- LTEXT "Mi&hin:", 1091, 120, 80, 30, 9
- LTEXT "&Tulostustarkkuus:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Tulosta t&iedostoon", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Tiivistetty", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Kirjoittimen asetukset"
-FONT 8, "Helv"
-{
- GROUPBOX "Kirjoitin", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "O&letuskirjoitin", 1056, 16, 20, 80, 12
- LTEXT "[ei valittu]", 1088, 35, 35, 120, 9
- RADIOBUTTON "&Erityinen kirjoitin", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Asetukset...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Suunta", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Pysty", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Vaaka", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Paperi", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Koko:", 1089, 130, 95, 30, 9
- LTEXT "Lä&hde:", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Fontit"
-FONT 8, "Helv"
-{
-    LTEXT           "&Fontti:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Fonttit&yyli:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Koko:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Peruuta",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Sovella", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Ohje" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Efektit",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "Yli&viivattu", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "A&lleviivattu", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "V&äri:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Näyte",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Väri"
-FONT 8, "Helv"
-{
- LTEXT "Pe&rusvärit:",   1088, 4,    4,  140, 10
- LTEXT "&Muokatut värit:",  1089, 4,   106, 140, 10
- LTEXT "Väri|&Tasainen",  1090, 150, 151,  48, 10
- LTEXT   "&Pun:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Vihr:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "Si&n:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sävy:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Kyll:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "K&irkk:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "S&ulje", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "O&hje", 1038,100,166, 44, 14
- PUSHBUTTON "&Lisää väri",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "M&äärittele väri >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Etsi"
-FONT 8, "Helv"
-{
- LTEXT "&Etsittävä:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Koko sana", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Kirjaink&oko", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Suunta", 1072, 107, 26, 68, 28
- CONTROL "&Ylös", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Alas", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "Etsi &seuraava", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Peruuta", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "O&hje", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Korvaa"
-FONT 8, "Helv"
-{
- LTEXT "&Etsittävä:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Ko&rvattava:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Koko sana", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Kirjaink&oko", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "Etsi &seuraava", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Korv&aa", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Korvaa ka&ikki", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "S&ulje", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "O&hje", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Fr.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Fr.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Fr.orc	(revision 3031)
@@ -0,0 +1,190 @@
+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ouvrir"
+FONT 8, "Helv"
+{
+ LTEXT "&Nom de fichier:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Répertoires", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Liste des fichiers de &type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Lecteurs:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuler", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Lecture seule", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Enregistrer sous ..."
+FONT 8, "Helv"
+{
+ LTEXT "&Nom de fichier:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Répertoires:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Liste des fichiers de &type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Lecteurs:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuler", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Lecture seule", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Imprimer"
+FONT 8, "Helv"
+{
+ LTEXT "Imprimante:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Etendue", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Tout", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&Sélection", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Pages", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuler", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configurer...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&De:", 1090, 60, 80, 30, 9
+ LTEXT "&A:", 1091, 120, 80, 30, 9
+ LTEXT "&Qualité d'impression:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "&Fichier d'impression", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Copies t&riées", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configuration de l'impression"
+FONT 8, "Helv"
+{
+ GROUPBOX "Imprimante", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Imprimante par défaut", 1056, 16, 20, 80, 12
+ LTEXT "[aucune]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Imprimante &spécifique", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuler", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Options...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Portrait", 1058, 50, 100, 40, 12
+ RADIOBUTTON "Paysag&e", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papier", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Taille :", 1089, 130, 95, 30, 9
+ LTEXT "&Ali&mentation :", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Polices"
+FONT 8, "Helv"
+{
+    LTEXT           "&Police:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "St&yle de police:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Taille:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Annuler",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "A&ppliquer", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Aide" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Effets",1072,6,72,84,34,WS_GROUP
+    CHECKBOX        "&Barré", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Souligné", 1041, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Couleur:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Exemple",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Couleurs"
+FONT 8, "Helv"
+{
+ LTEXT "Couleurs de &base:",   1088, 4,    4,  140, 10
+ LTEXT "&Couleurs personnalisées:",  1089, 4,   106, 140, 10
+ LTEXT "Couleur |  &Uni",  1090, 150, 151,  48, 10
+ LTEXT   "&Rouge:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Vert:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+  LTEXT   "Bl&eu:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Teinte:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuler", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038,100,166, 44, 14
+ PUSHBUTTON "A&jouter couleur personnalisées", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP 
+ PUSHBUTTON "&Définir couleurs personnalisées >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
+}
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Rechercher"
+FONT 8, "Helv"
+{
+ LTEXT "&Rechercher:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "M&ot seulement", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Respect des &majuscules/minuscules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direction", 1072, 107, 26, 68, 28
+ CONTROL "&Haut", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Bas", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "&Poursuivre", 1, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuler", 2, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Remplacer"
+FONT 8, "Helv"
+{
+ LTEXT "&Rechercher:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "R&emplacer par:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "M&ot seulement", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Respect des &majuscules/minuscules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "&Poursuivre", 1, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rempla&cer", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Remplacer &tout", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Fermer", 2, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Fr.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Fr.rc	(revision 3028)
+++ 	(revision )
@@ -1,190 +1,0 @@
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ouvrir"
-FONT 8, "Helv"
-{
- LTEXT "&Nom de fichier:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Répertoires", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste des fichiers de &type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Lecteurs:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuler", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Lecture seule", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Enregistrer sous ..."
-FONT 8, "Helv"
-{
- LTEXT "&Nom de fichier:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Répertoires:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste des fichiers de &type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Lecteurs:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuler", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Lecture seule", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimer"
-FONT 8, "Helv"
-{
- LTEXT "Imprimante:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Etendue", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Tout", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Sélection", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Pages", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuler", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Configurer...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&De:", 1090, 60, 80, 30, 9
- LTEXT "&A:", 1091, 120, 80, 30, 9
- LTEXT "&Qualité d'impression:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "&Fichier d'impression", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Copies t&riées", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Configuration de l'impression"
-FONT 8, "Helv"
-{
- GROUPBOX "Imprimante", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Imprimante par défaut", 1056, 16, 20, 80, 12
- LTEXT "[aucune]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Imprimante &spécifique", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuler", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Options...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Portrait", 1058, 50, 100, 40, 12
- RADIOBUTTON "Paysag&e", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papier", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Taille :", 1089, 130, 95, 30, 9
- LTEXT "&Ali&mentation :", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Polices"
-FONT 8, "Helv"
-{
-    LTEXT           "&Police:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "St&yle de police:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Taille:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Annuler",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "A&ppliquer", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Aide" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Effets",1072,6,72,84,34,WS_GROUP
-    CHECKBOX        "&Barré", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Souligné", 1041, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "&Couleur:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Exemple",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Couleurs"
-FONT 8, "Helv"
-{
- LTEXT "Couleurs de &base:",   1088, 4,    4,  140, 10
- LTEXT "&Couleurs personnalisées:",  1089, 4,   106, 140, 10
- LTEXT "Couleur |  &Uni",  1090, 150, 151,  48, 10
- LTEXT   "&Rouge:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Vert:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
-  LTEXT   "Bl&eu:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Teinte:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuler", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038,100,166, 44, 14
- PUSHBUTTON "A&jouter couleur personnalisées", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP 
- PUSHBUTTON "&Définir couleurs personnalisées >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
-}
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rechercher"
-FONT 8, "Helv"
-{
- LTEXT "&Rechercher:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "M&ot seulement", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Respect des &majuscules/minuscules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direction", 1072, 107, 26, 68, 28
- CONTROL "&Haut", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Bas", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Poursuivre", 1, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuler", 2, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Remplacer"
-FONT 8, "Helv"
-{
- LTEXT "&Rechercher:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "R&emplacer par:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "M&ot seulement", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Respect des &majuscules/minuscules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "&Poursuivre", 1, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rempla&cer", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Remplacer &tout", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Fermer", 2, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Hu.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Hu.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Hu.orc	(revision 3031)
@@ -0,0 +1,190 @@
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Megnyitás"
+FONT 8, "Helv"
+BEGIN
+        LTEXT "File &neve:", 1090, 6, 6, 76, 9
+        EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+        LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+        LTEXT "&Könyvtárak:", -1, 110, 6, 92, 9
+        CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9
+        LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+        LTEXT "File &típusok:", 1089, 6, 104, 90, 9
+        CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36
+        LTEXT "&Meghajtók:", 1091, 110, 104, 92, 9
+        CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68
+        CONTROL "Megnyitás", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 208, 6, 56, 14
+        CONTROL "Mégsem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 24, 56, 14
+        CONTROL "&Segítség", 1038, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 46, 56, 14
+        CONTROL "&Csak olvasható", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 208, 68, 63, 12
+END
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Mentés új néven ..."
+FONT 8, "Helv"
+{
+ LTEXT "File &neve:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Könyvtárak:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "File &típusok:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Meghajtók:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Mentés új néven", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Mégsem", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Segítség", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Csak olvasható", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Nyomtatás"
+FONT 8, "Helv"
+{
+ LTEXT "Nyomtató:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Nyomtatandó terület", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Mind", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&Kiválasztott", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Lapok", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Nyomtatás", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Mégsem", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Beállítás", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "-&tól:", 1090, 60, 80, 30, 9
+ LTEXT "-&ig:", 1091, 120, 80, 30, 9
+ LTEXT "Mi&nõség:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "&File-ba nyomtat", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sûrû", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Nyomtató beállítása"
+FONT 8, "Helv"
+{
+ GROUPBOX "Nyomtató", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Alapértelmezett nyomtató", 1056, 16, 20, 80, 12
+ LTEXT "[nincs]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "&Adott nyomtató", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Mégsem", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Beállítás", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Oldalfekvés", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Á&lló", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Fekvõ", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papír", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Mérete", 1089, 130, 95, 30, 9
+ LTEXT "Fo&rrása", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+    LTEXT           "&Font:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Font &stílus:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Méret:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Mégsem",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Alkalmaz", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Segítség" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Effektusok",1072,6,72,84,34,WS_GROUP
+    CHECKBOX        "Á&thúzott", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Aláhúzott", 1041, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Szín:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Minta",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZzÁáÕõÉé",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Szín"
+FONT 8, "Helv"
+{
+ LTEXT "&Alap színek:",   1088, 4,    4,  140, 10
+ LTEXT "&Egyedi színek:",  1089, 4,   106, 140, 10
+ LTEXT "Szín |  &Tömör",  1090, 150, 151,  48, 10
+ LTEXT   "&Vörös:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Zöld:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Kék:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Mégsem", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Segítség", 1038,100,166, 44, 14
+ PUSHBUTTON "&Egyedi színekhez adás",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "E&gyedi szín definiálás >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&t",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+FINDDLGORD DIALOG 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Keresés"
+FONT 8, "Helv"
+BEGIN
+        LTEXT "&Mit keressen:", -1, 4, 8, 48, 8
+        EDITTEXT 1152, 51, 7, 124, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+        CONTROL "Teljes &szavak keresése", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12
+        CONTROL "Kis/&nagybetû különb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 92, 12
+        GROUPBOX "Irány", 1072, 97, 26, 78, 28
+        CONTROL "&Vissza", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 102, 38, 32, 12
+        CONTROL "&Elõre", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+        CONTROL "&Következõ", 1, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 5, 50, 14
+        CONTROL "Mégsem", 2, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 23, 50, 14
+        PUSHBUTTON "&Segítség", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+END
+
+REPLACEDLGORD DIALOG 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cserélés"
+FONT 8, "Helv"
+BEGIN
+        LTEXT "&Mit keressen:", -1, 4, 9, 48, 8
+        EDITTEXT 1152, 57, 7, 111, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+        LTEXT "Mire &cseréljem:", -1, 4, 26, 53, 8
+        EDITTEXT 1153, 57, 24, 111, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+        CONTROL "Teljes &szavak keresése", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 5, 46, 104, 12
+        CONTROL "Kis/&nagybetû különb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 62, 99, 12
+        CONTROL "&Következõ", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 174, 4, 53, 14
+        CONTROL "C&serél", 1024, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 21, 53, 14
+        CONTROL "M&indent cserél", 1025, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 38, 53, 14
+        CONTROL "Mégsem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 55, 53, 14
+        CONTROL "&Segítség", 1038, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 75, 53, 14
+END
Index: trunk/src/comdlg32/cdlg_Hu.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Hu.rc	(revision 3028)
+++ 	(revision )
@@ -1,190 +1,0 @@
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Megnyitás"
-FONT 8, "Helv"
-BEGIN
-        LTEXT "File &neve:", 1090, 6, 6, 76, 9
-        EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
-        LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
-        LTEXT "&Könyvtárak:", -1, 110, 6, 92, 9
-        CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9
-        LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
-        LTEXT "File &típusok:", 1089, 6, 104, 90, 9
-        CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36
-        LTEXT "&Meghajtók:", 1091, 110, 104, 92, 9
-        CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68
-        CONTROL "Megnyitás", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 208, 6, 56, 14
-        CONTROL "Mégsem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 24, 56, 14
-        CONTROL "&Segítség", 1038, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 46, 56, 14
-        CONTROL "&Csak olvasható", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 208, 68, 63, 12
-END
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Mentés új néven ..."
-FONT 8, "Helv"
-{
- LTEXT "File &neve:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Könyvtárak:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "File &típusok:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Meghajtók:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Mentés új néven", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Mégsem", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Segítség", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Csak olvasható", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Nyomtatás"
-FONT 8, "Helv"
-{
- LTEXT "Nyomtató:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Nyomtatandó terület", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Mind", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Kiválasztott", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Lapok", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Nyomtatás", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Mégsem", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Beállítás", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "-&tól:", 1090, 60, 80, 30, 9
- LTEXT "-&ig:", 1091, 120, 80, 30, 9
- LTEXT "Mi&nõség:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "&File-ba nyomtat", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Sûrû", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Nyomtató beállítása"
-FONT 8, "Helv"
-{
- GROUPBOX "Nyomtató", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Alapértelmezett nyomtató", 1056, 16, 20, 80, 12
- LTEXT "[nincs]", 1088, 35, 35, 120, 9
- RADIOBUTTON "&Adott nyomtató", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Mégsem", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Beállítás", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Oldalfekvés", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "Á&lló", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Fekvõ", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papír", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Mérete", 1089, 130, 95, 30, 9
- LTEXT "Fo&rrása", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
-FONT 8, "Helv"
-{
-    LTEXT           "&Font:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Font &stílus:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Méret:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Mégsem",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Alkalmaz", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Segítség" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Effektusok",1072,6,72,84,34,WS_GROUP
-    CHECKBOX        "Á&thúzott", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Aláhúzott", 1041, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "&Szín:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Minta",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZzÁáÕõÉé",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Szín"
-FONT 8, "Helv"
-{
- LTEXT "&Alap színek:",   1088, 4,    4,  140, 10
- LTEXT "&Egyedi színek:",  1089, 4,   106, 140, 10
- LTEXT "Szín |  &Tömör",  1090, 150, 151,  48, 10
- LTEXT   "&Vörös:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Zöld:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Kék:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Mégsem", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Segítség", 1038,100,166, 44, 14
- PUSHBUTTON "&Egyedi színekhez adás",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "E&gyedi szín definiálás >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&t",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-FINDDLGORD DIALOG 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Keresés"
-FONT 8, "Helv"
-BEGIN
-        LTEXT "&Mit keressen:", -1, 4, 8, 48, 8
-        EDITTEXT 1152, 51, 7, 124, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
-        CONTROL "Teljes &szavak keresése", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 4, 26, 100, 12
-        CONTROL "Kis/&nagybetû különb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 4, 42, 92, 12
-        GROUPBOX "Irány", 1072, 97, 26, 78, 28
-        CONTROL "&Vissza", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 102, 38, 32, 12
-        CONTROL "&Elõre", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-        CONTROL "&Következõ", 1, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 5, 50, 14
-        CONTROL "Mégsem", 2, "BUTTON", WS_GROUP | WS_TABSTOP, 182, 23, 50, 14
-        PUSHBUTTON "&Segítség", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-END
-
-REPLACEDLGORD DIALOG 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cserélés"
-FONT 8, "Helv"
-BEGIN
-        LTEXT "&Mit keressen:", -1, 4, 9, 48, 8
-        EDITTEXT 1152, 57, 7, 111, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
-        LTEXT "Mire &cseréljem:", -1, 4, 26, 53, 8
-        EDITTEXT 1153, 57, 24, 111, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
-        CONTROL "Teljes &szavak keresése", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 5, 46, 104, 12
-        CONTROL "Kis/&nagybetû különb.", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_TABSTOP, 5, 62, 99, 12
-        CONTROL "&Következõ", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 174, 4, 53, 14
-        CONTROL "C&serél", 1024, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 21, 53, 14
-        CONTROL "M&indent cserél", 1025, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 38, 53, 14
-        CONTROL "Mégsem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 55, 53, 14
-        CONTROL "&Segítség", 1038, "BUTTON", WS_GROUP | WS_TABSTOP, 174, 75, 53, 14
-END
Index: trunk/src/comdlg32/cdlg_It.orc
===================================================================
--- trunk/src/comdlg32/cdlg_It.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_It.orc	(revision 3031)
@@ -0,0 +1,190 @@
+LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Apri"
+FONT 8, "Helv"
+{
+ LTEXT "&Nome file:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Percorso:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Files di &Tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Unita':", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Apri", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annulla", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aiuto", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Solo &Lettura", 1040, 208, 68, 52, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Salva con nome ..."
+FONT 8, "Helv"
+{
+ LTEXT "&Nome file:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Percorso:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Files di &Tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Unita':", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Salva come", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annulla", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Stampa"
+FONT 8, "Helv"
+{
+ LTEXT "Stampante:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Pagine da stampare", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Tutte", 1056, 16, 45, 60, 12
+ RADIOBUTTON "S&elezione", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Pagine", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Stampa", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annulla", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configura", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Da:", 1090, 60, 80, 30, 9
+ LTEXT "&A:", 1091, 120, 80, 30, 9
+ LTEXT "&Qualita' di Stampa:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Stampa su Fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensato", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 274, 154
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configurazione Stampante"
+FONT 8, "Helv"
+{
+ GROUPBOX "Stampante", 1072, 6, 10, 180, 72, BS_GROUPBOX
+ RADIOBUTTON "Stampante &Preferita", 1056, 16, 20, 78, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Stampante &Specifica", 1057, 16, 50, 78, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annulla", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Installa", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientamento", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Verticale", 1058, 50, 100, 42, 12
+ RADIOBUTTON "&Orizzontale", 1059, 50, 115, 50, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Carta", 1074, 120, 85, 150, 50, BS_GROUPBOX
+ LTEXT "&Dimensione", 1089, 130, 100, 30, 9
+ LTEXT "&Sorgente", 1090, 130, 115, 30, 9
+ COMBOBOX 1137, 168, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 168, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+    LTEXT           "&Font:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "St&ile:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Dimensione:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Annulla",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "A&pplica", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Aiuto" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Effetti",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Barrato", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Sottolineato", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Colore:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Esempio",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Colore"
+FONT 8, "Helv"
+{
+ LTEXT "Colori di &Base:",   1088, 4,    4,  140, 10
+ LTEXT "Colori &Utente:",  1089, 4,   106, 140, 10
+ LTEXT "Colore |  Sol&ido",  1090, 150, 151,  48, 10
+ LTEXT   "&Rosso:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Verde:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blu:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Tinta:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annulla", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Aiuto", 1038,100,166, 44, 14
+ PUSHBUTTON "&Aggiungi ai Colori Utente",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definisci Colori Utente >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id"  */
+}
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Trova"
+FONT 8, "Helv"
+{
+ LTEXT "Tro&va:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Parola Intera", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Maiuscole/Minuscole", 1041, 4, 42, 74, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direzione", 1072, 107, 26, 68, 28
+ CONTROL "&Su", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 24, 12
+ CONTROL "&Giu'", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 38, 28, 12
+ DEFPUSHBUTTON "&Trova Prossimo", IDOK, 180, 5, 54, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annulla", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aiuto", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cambia"
+FONT 8, "Helv"
+{
+ LTEXT "Tro&va:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Ca&mbia con:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Parola Intera", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Maiuscole/Minuscole", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "&Trova Prossimo", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Cambia", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cambia &Tutto", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annulla", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aiuto", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_It.rc
===================================================================
--- trunk/src/comdlg32/cdlg_It.rc	(revision 3028)
+++ 	(revision )
@@ -1,190 +1,0 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Apri"
-FONT 8, "Helv"
-{
- LTEXT "&Nome file:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Percorso:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Files di &Tipo:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Unita':", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Apri", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annulla", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aiuto", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Solo &Lettura", 1040, 208, 68, 52, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Salva con nome ..."
-FONT 8, "Helv"
-{
- LTEXT "&Nome file:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Percorso:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Files di &Tipo:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Unita':", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Salva come", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annulla", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Stampa"
-FONT 8, "Helv"
-{
- LTEXT "Stampante:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Pagine da stampare", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Tutte", 1056, 16, 45, 60, 12
- RADIOBUTTON "S&elezione", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Pagine", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Stampa", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annulla", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Configura", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Da:", 1090, 60, 80, 30, 9
- LTEXT "&A:", 1091, 120, 80, 30, 9
- LTEXT "&Qualita' di Stampa:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Stampa su Fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensato", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 274, 154
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Configurazione Stampante"
-FONT 8, "Helv"
-{
- GROUPBOX "Stampante", 1072, 6, 10, 180, 72, BS_GROUPBOX
- RADIOBUTTON "Stampante &Preferita", 1056, 16, 20, 78, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Stampante &Specifica", 1057, 16, 50, 78, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annulla", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Installa", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientamento", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Verticale", 1058, 50, 100, 42, 12
- RADIOBUTTON "&Orizzontale", 1059, 50, 115, 50, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Carta", 1074, 120, 85, 150, 50, BS_GROUPBOX
- LTEXT "&Dimensione", 1089, 130, 100, 30, 9
- LTEXT "&Sorgente", 1090, 130, 115, 30, 9
- COMBOBOX 1137, 168, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 168, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
-FONT 8, "Helv"
-{
-    LTEXT           "&Font:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "St&ile:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Dimensione:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Annulla",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "A&pplica", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Aiuto" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Effetti",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "&Barrato", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Sottolineato", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "&Colore:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Esempio",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Colore"
-FONT 8, "Helv"
-{
- LTEXT "Colori di &Base:",   1088, 4,    4,  140, 10
- LTEXT "Colori &Utente:",  1089, 4,   106, 140, 10
- LTEXT "Colore |  Sol&ido",  1090, 150, 151,  48, 10
- LTEXT   "&Rosso:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Verde:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Blu:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Tinta:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annulla", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Aiuto", 1038,100,166, 44, 14
- PUSHBUTTON "&Aggiungi ai Colori Utente",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Definisci Colori Utente >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id"  */
-}
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Trova"
-FONT 8, "Helv"
-{
- LTEXT "Tro&va:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Parola Intera", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Maiuscole/Minuscole", 1041, 4, 42, 74, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direzione", 1072, 107, 26, 68, 28
- CONTROL "&Su", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 24, 12
- CONTROL "&Giu'", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 38, 28, 12
- DEFPUSHBUTTON "&Trova Prossimo", IDOK, 180, 5, 54, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annulla", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aiuto", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cambia"
-FONT 8, "Helv"
-{
- LTEXT "Tro&va:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Ca&mbia con:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Parola Intera", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Maiuscole/Minuscole", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "&Trova Prossimo", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Cambia", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cambia &Tutto", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annulla", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aiuto", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Ko.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Ko.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Ko.orc	(revision 3031)
@@ -0,0 +1,176 @@
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "¿­±â"
+FONT 8, "Helv"
+{
+ LTEXT "ÆÄÀÏ ÀÌž§(&N):", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "µð·ºÅäž®(&D):", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "ÆÄÀÏ ÇüœÄ(&T):", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "µå¶óÀÌºê(&V):", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "¿­±â", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "µµ¿òž»(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "ÀÐ±â Àü¿ë(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ŽÙž¥ ÀÌž§Àž·Î ÀúÀå ..."
+FONT 8, "Helv"
+{
+ LTEXT "ÆÄÀÏ ÀÌž§(&N):", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "µð·ºÅäž®(&D):", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "ÆÄÀÏ ÇüœÄ(&T):", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "µå¶óÀÌºê(&V):", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "ÀúÀå", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "µµ¿òž»(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "ÀÐ±â Àü¿ë(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ÀÎŒâ"
+FONT 8, "Helv"
+{
+ LTEXT "ÀÎŒâ±â:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "ÀÎŒâ ¹üÀ§", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "žðµÎ(&A)", 1056, 16, 45, 60, 12
+ RADIOBUTTON "Œ±ÅÃ(&E)", 1057, 16, 60, 60, 12
+ RADIOBUTTON "ÂÊ(&P)", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "ÀÎŒâ", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Œ³Á€(&S)", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "œÃÀÛ(&F):", 1090, 60, 80, 30, 9
+ LTEXT "³¡(&T):", 1091, 120, 80, 30, 9
+ LTEXT "ÀÎŒâ Ç°Áú(&Q):", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "ÆÄÀÏ·Î ÀÎŒâ(&L)", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ÀÎŒâ Œ³Á€"
+FONT 8, "Helv"
+{
+ GROUPBOX "ÀÎŒâ±â", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "±âº» ÀÎŒâ±â(&D)", 1056, 16, 20, 80, 12
+ LTEXT "[ŸøÀœ]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "ÁöÁ€µÈ ÀÎŒâ±â(&P)", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "È®ÀÎ", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Œ³Á€(&S)", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "¹æÇâ", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "ŒŒ·Î(&R)", 1058, 50, 100, 40, 12
+ RADIOBUTTON "°¡·Î(&L)", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "ÁŸÀÌ", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "Å©±â(&Z)", 1089, 130, 95, 30, 9
+ LTEXT "¹æœÄ(&S)", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "±ÛÀÚÃŒ"
+FONT 8, "Helv"
+{
+ LTEXT "±ÛÀÚÃŒ:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ DEFPUSHBUTTON "È®ÀÎ", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "»ö"
+FONT 8, "Helv"
+{
+ LTEXT "±âº»»ö(&B):",   1088, 4,    4,  140, 10
+ LTEXT "»ç¿ëÀÚ»ö(&C):",  1089, 4,   106, 140, 10
+ LTEXT "È¥»ö |  ŽÜ»ö(&i)",  1090, 150, 151,  48, 10
+ LTEXT	 "»¡°­(&R):", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT	 "ÃÊ·Ï(&G):",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT	 "ÆÄ¶û(&B):",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT	"»ö»ó(&H):" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT	"Ã€µµ(&S):" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT	"žíµµ(&L):" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "È®ÀÎ",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "µµ¿òž»", 1038,100,166, 44, 14
+ PUSHBUTTON "»ç¿ëÀÚ»ö¿¡ Ãß°¡(&A)",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "»ç¿ëÀÚ»ö Á€ÀÇ(&D) >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ã£±â"
+FONT 8, "Helv"
+{
+ LTEXT "Ã£À» ¹®ÀÚ¿­(&N):", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "ŽÜŸîžž(&W)", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "ŽëŒÒ¹®ÀÚ ±žº°(&C)", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "¹æÇâ", 1072, 107, 26, 68, 28
+ CONTROL "À§(&U)", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "ŸÆ·¡(&D)", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "ŽÙÀœ Ã£±â(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "µµ¿òž»(&H)", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "¹Ù²Ù±â"
+FONT 8, "Helv"
+{
+ LTEXT "Ã£À» ¹®ÀÚ¿­(&N):", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "¹Ù²Ü ¹®ÀÚ¿­(&P):", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "ŽÜŸîžž(&W)", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "ŽëŒÒ¹®ÀÚ ±žº°(&C)", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "ŽÙÀœ Ã£±â(&F)", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¹Ù²Ù±â(&R)", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "žðµÎ ¹Ù²Ù±â(&A)", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃëŒÒ", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "µµ¿òž»(&H)", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Ko.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Ko.rc	(revision 3028)
+++ 	(revision )
@@ -1,176 +1,0 @@
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "¿­±â"
-FONT 8, "Helv"
-{
- LTEXT "ÆÄÀÏ ÀÌž§(&N):", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "µð·ºÅäž®(&D):", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "ÆÄÀÏ ÇüœÄ(&T):", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "µå¶óÀÌºê(&V):", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "¿­±â", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "µµ¿òž»(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "ÀÐ±â Àü¿ë(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ŽÙž¥ ÀÌž§Àž·Î ÀúÀå ..."
-FONT 8, "Helv"
-{
- LTEXT "ÆÄÀÏ ÀÌž§(&N):", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "µð·ºÅäž®(&D):", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "ÆÄÀÏ ÇüœÄ(&T):", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "µå¶óÀÌºê(&V):", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "ÀúÀå", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "µµ¿òž»(&H)", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "ÀÐ±â Àü¿ë(&R)", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ÀÎŒâ"
-FONT 8, "Helv"
-{
- LTEXT "ÀÎŒâ±â:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "ÀÎŒâ ¹üÀ§", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "žðµÎ(&A)", 1056, 16, 45, 60, 12
- RADIOBUTTON "Œ±ÅÃ(&E)", 1057, 16, 60, 60, 12
- RADIOBUTTON "ÂÊ(&P)", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "ÀÎŒâ", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Œ³Á€(&S)", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "œÃÀÛ(&F):", 1090, 60, 80, 30, 9
- LTEXT "³¡(&T):", 1091, 120, 80, 30, 9
- LTEXT "ÀÎŒâ Ç°Áú(&Q):", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "ÆÄÀÏ·Î ÀÎŒâ(&L)", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "ÀÎŒâ Œ³Á€"
-FONT 8, "Helv"
-{
- GROUPBOX "ÀÎŒâ±â", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "±âº» ÀÎŒâ±â(&D)", 1056, 16, 20, 80, 12
- LTEXT "[ŸøÀœ]", 1088, 35, 35, 120, 9
- RADIOBUTTON "ÁöÁ€µÈ ÀÎŒâ±â(&P)", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "È®ÀÎ", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Œ³Á€(&S)", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "¹æÇâ", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "ŒŒ·Î(&R)", 1058, 50, 100, 40, 12
- RADIOBUTTON "°¡·Î(&L)", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "ÁŸÀÌ", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "Å©±â(&Z)", 1089, 130, 95, 30, 9
- LTEXT "¹æœÄ(&S)", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "±ÛÀÚÃŒ"
-FONT 8, "Helv"
-{
- LTEXT "±ÛÀÚÃŒ:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- DEFPUSHBUTTON "È®ÀÎ", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "»ö"
-FONT 8, "Helv"
-{
- LTEXT "±âº»»ö(&B):",   1088, 4,    4,  140, 10
- LTEXT "»ç¿ëÀÚ»ö(&C):",  1089, 4,   106, 140, 10
- LTEXT "È¥»ö |  ŽÜ»ö(&i)",  1090, 150, 151,  48, 10
- LTEXT	 "»¡°­(&R):", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT	 "ÃÊ·Ï(&G):",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT	 "ÆÄ¶û(&B):",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT	"»ö»ó(&H):" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT	"Ã€µµ(&S):" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT	"žíµµ(&L):" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "È®ÀÎ",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "µµ¿òž»", 1038,100,166, 44, 14
- PUSHBUTTON "»ç¿ëÀÚ»ö¿¡ Ãß°¡(&A)",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "»ç¿ëÀÚ»ö Á€ÀÇ(&D) >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ã£±â"
-FONT 8, "Helv"
-{
- LTEXT "Ã£À» ¹®ÀÚ¿­(&N):", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "ŽÜŸîžž(&W)", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "ŽëŒÒ¹®ÀÚ ±žº°(&C)", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "¹æÇâ", 1072, 107, 26, 68, 28
- CONTROL "À§(&U)", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "ŸÆ·¡(&D)", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "ŽÙÀœ Ã£±â(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "µµ¿òž»(&H)", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "¹Ù²Ù±â"
-FONT 8, "Helv"
-{
- LTEXT "Ã£À» ¹®ÀÚ¿­(&N):", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "¹Ù²Ü ¹®ÀÚ¿­(&P):", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "ŽÜŸîžž(&W)", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "ŽëŒÒ¹®ÀÚ ±žº°(&C)", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "ŽÙÀœ Ã£±â(&F)", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "¹Ù²Ù±â(&R)", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "žðµÎ ¹Ù²Ù±â(&A)", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "ÃëŒÒ", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "µµ¿òž»(&H)", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Nl.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Nl.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Nl.orc	(revision 3031)
@@ -0,0 +1,298 @@
+LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Bestand openen"
+FONT 8, "Helv"
+{
+ LTEXT "Bestands&naam:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Zoeken in:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Opslaan als ..."
+FONT 8, "Helv"
+{
+ LTEXT "Bestands&naam:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Zoeken in:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Afdrukken"
+FONT 8, "Helv"
+{
+ LTEXT "Printer:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Afdrukbereik", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Alles", 1056, 16, 45, 60, 12
+ RADIOBUTTON "Sele&ctie", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Pagina's", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Eigenschappen", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&van:", 1090, 60, 80, 30, 9
+ LTEXT "&t/m:", 1091, 120, 80, 30, 9
+ LTEXT "Afdruk&kwaliteit:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Naar &bestand", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Afdrukeigenschappen"
+FONT 8, "Helv"
+{
+ GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12
+ LTEXT "[geen]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Specifieke &Printer", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Afdrukstand", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Staand", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Liggend", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papier", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Formaat", 1089, 130, 95, 30, 9
+ LTEXT "&Bron", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Lettertype"
+FONT 8, "Helv"
+{
+    LTEXT           "&Lettertype:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Teken&stijl:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Grootte:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+    PUSHBUTTON      "Annuleren",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Toepassen", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Effecten",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Doorhalen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Kleur:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Voorbeeld",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Kleur"
+FONT 8, "Helv"
+{
+ LTEXT "&Basiskleuren:",   1088, 4,    4,  140, 10
+ LTEXT "&Aangepaste kleuren:",  1089, 4,   106, 140, 10
+ LTEXT "Kleur |  &Effen",  1090, 157, 151,  48, 10
+ LTEXT   "&Rood:", 726 /*1094*/,       256,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Groen:",727/*1095*/,        256,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "Blau&w:",728 /*1096*/,       256,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "Ti&nt:" ,723 /*1091*/,        196,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Intensiteit:" ,724 /*1092*/, 196,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Helderheid:" ,725 /*1093*/,  196,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuleren", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Help", 1038,100,166, 44, 14
+ PUSHBUTTON "&Toevoegen aan Aangepaste kleuren",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definieer Aangepaste kleuren >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tekst zoeken"
+FONT 8, "Helv"
+{
+ LTEXT "&Zoek naar:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Heel &woord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Zoekrichting", 1072, 107, 26, 68, 28
+ CONTROL "&Omhoog", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "Om&laag", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Volgende zoeken", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+ PUSHBUTTON "Annuleren", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp	 , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tekst vervangen"
+FONT 8, "Helv"
+{
+ LTEXT "&Zoek naar:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Vervang &door:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Heel &woord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "Volgende zoeken", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+ PUSHBUTTON "Ve&rvangen", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Alles vervangen", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Annuleren", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print32"
+FONT 8, "Helv"
+{
+    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Cancel", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Help",  pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Naar &bestand",  chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "&Eigenschappen", psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Naam:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Waar:",          stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Opmerking:",     stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Aantal ",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Aantal e&xemplaren:",stc5,168,108,68,8
+    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "&Sorteren",      chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "Afdrukbereik",   grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&Alle xx",       rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "&Pagina's",      rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "Sele&ctie",      rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&van:",          stc2,  52,124,  20,8
+    RTEXT           "&t/m:",           stc3, 100,124,  16,8
+}
+
+
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE       "Print"
+
+    PD32_VALUE_UREADABLE                  "Onleesbare ingave"
+    PD32_INVALID_PAGE_RANGE "Deze waarde ligt niet binnen het bereik\n\
+Voert u s.v.p. een waarde tussen %d en %d in."
+    PD32_FROM_NOT_ABOVE_TO                "De VAN ingave kan niet groter zijn \
+dan de TO waarde"
+    PD32_MARGINS_OVERLAP                  "De marges overlappen of vallen \
+buiten het papier.\nVoer s.v.p. nieuwe marges in."
+    PD32_NR_OF_COPIES_EMPTY               "Het aantal invoerveld kan niet leeg \
+zijn."
+    PD32_TOO_LARGE_COPIES                 "Zoveel exemplaren kan de printer \
+niet in een keer aan, het maximum is %d"
+    PD32_PRINT_ERROR                      "Er ontstond een printer fout."
+    PD32_NO_DEFAULT_PRINTER               "Er is geen default printer"
+    PD32_CANT_FIND_PRINTER                "De printer werd niet gevonden"
+    PD32_OUT_OF_MEMORY                    "Er was onvoldoende geheugen \
+beschikbaar"
+    PD32_GENERIC_ERROR                    "Er onstond een niet nader \
+gespecifieerde fout"
+    PD32_DRIVER_UNKNOWN                   "De printer driver is onbekend"
+
+    PD32_DEFAULT_PRINTER                  "Default Printer, "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Er staan %d documenten in de \
+wachtrij"
+    PD32_PRINT_ALL_X_PAGES                "&Alle %d pagina's"
+    PD32_MARGINS_IN_INCHES                "Marges [inch]"
+    PD32_MARGINS_IN_MILIMETERS            "Marges [mm]"
+    PD32_MILIMETERS                       "mm"
+
+    PD32_PRINTER_STATUS_READY             "Klaar"
+    PD32_PRINTER_STATUS_PAUSED            "Gepauseerd, "
+    PD32_PRINTER_STATUS_ERROR             "Fout, "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Bezig met verwijderen, "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam, "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Papier is op, "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Voer s.v.p. met de hand papier in, "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Papier probleem, "
+    PD32_PRINTER_STATUS_OFFLINE           "Printer offline, "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Actief, "
+    PD32_PRINTER_STATUS_BUSY              "Druk bezig, "
+    PD32_PRINTER_STATUS_PRINTING          "Aan het printen, "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "De uitvoerlade is vol, "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Niet aanwezig, "
+    PD32_PRINTER_STATUS_WAITING           "Aan het wachten, "
+    PD32_PRINTER_STATUS_PROCESSING        "Aan het Verwerken, "
+    PD32_PRINTER_STATUS_INITIALIZING      "Aan het opstarten, "
+    PD32_PRINTER_STATUS_WARMING_UP        "Aan het opwarmen, "
+    PD32_PRINTER_STATUS_TONER_LOW         "Er is nog maar weinig toner, "
+    PD32_PRINTER_STATUS_NO_TONER          "Toner is op, "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Storing in papieruitvoer, "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Onderbroken door een gebruiker, "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Onvoldoende geheugen beschikbaar, "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "De printer staat is open, "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server onbekend; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Power safe mode; "
+}
Index: trunk/src/comdlg32/cdlg_Nl.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Nl.rc	(revision 3028)
+++ 	(revision )
@@ -1,298 +1,0 @@
-LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Bestand openen"
-FONT 8, "Helv"
-{
- LTEXT "Bestands&naam:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Zoeken in:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Opslaan als ..."
-FONT 8, "Helv"
-{
- LTEXT "Bestands&naam:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Zoeken in:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Alleen &Lezen", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Afdrukken"
-FONT 8, "Helv"
-{
- LTEXT "Printer:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Afdrukbereik", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Alles", 1056, 16, 45, 60, 12
- RADIOBUTTON "Sele&ctie", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Pagina's", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Eigenschappen", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&van:", 1090, 60, 80, 30, 9
- LTEXT "&t/m:", 1091, 120, 80, 30, 9
- LTEXT "Afdruk&kwaliteit:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Naar &bestand", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Afdrukeigenschappen"
-FONT 8, "Helv"
-{
- GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12
- LTEXT "[geen]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Specifieke &Printer", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Afdrukstand", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Staand", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Liggend", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papier", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Formaat", 1089, 130, 95, 30, 9
- LTEXT "&Bron", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Lettertype"
-FONT 8, "Helv"
-{
-    LTEXT           "&Lettertype:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Teken&stijl:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Grootte:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
-    PUSHBUTTON      "Annuleren",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Toepassen", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Effecten",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "&Doorhalen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Onderstrepen", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "&Kleur:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Voorbeeld",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Kleur"
-FONT 8, "Helv"
-{
- LTEXT "&Basiskleuren:",   1088, 4,    4,  140, 10
- LTEXT "&Aangepaste kleuren:",  1089, 4,   106, 140, 10
- LTEXT "Kleur |  &Effen",  1090, 157, 151,  48, 10
- LTEXT   "&Rood:", 726 /*1094*/,       256,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Groen:",727/*1095*/,        256,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "Blau&w:",728 /*1096*/,       256,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "Ti&nt:" ,723 /*1091*/,        196,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Intensiteit:" ,724 /*1092*/, 196,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Helderheid:" ,725 /*1093*/,  196,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "OK",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuleren", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Help", 1038,100,166, 44, 14
- PUSHBUTTON "&Toevoegen aan Aangepaste kleuren",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Definieer Aangepaste kleuren >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tekst zoeken"
-FONT 8, "Helv"
-{
- LTEXT "&Zoek naar:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Heel &woord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Zoekrichting", 1072, 107, 26, 68, 28
- CONTROL "&Omhoog", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "Om&laag", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-
- DEFPUSHBUTTON "&Volgende zoeken", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
- PUSHBUTTON "Annuleren", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", pshHelp	 , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tekst vervangen"
-FONT 8, "Helv"
-{
- LTEXT "&Zoek naar:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Vervang &door:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Heel &woord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Gelijke &hoofd-/kleine letters", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-
- DEFPUSHBUTTON "Volgende zoeken", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
- PUSHBUTTON "Ve&rvangen", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Alles vervangen", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Annuleren", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
-      DS_CONTEXTHELP | DS_3DLOOK
-CAPTION "Print32"
-FONT 8, "Helv"
-{
-    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
-    PUSHBUTTON      "Cancel", IDCANCEL, 232,164, 48,14, WS_GROUP
-    PUSHBUTTON      "&Help",  pshHelp,  50, 161, 48,14, WS_GROUP
-
-    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
-    CONTROL         "Naar &bestand",  chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
-    PUSHBUTTON      "&Eigenschappen", psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Naam:",         stc6,  16, 20,  36,8
-    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Waar:",          stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Opmerking:",     stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-
-    GROUPBOX        "Aantal ",         grp2, 160, 92, 120,64, WS_GROUP
-    LTEXT           "Aantal e&xemplaren:",stc5,168,108,68,8
-    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "&Sorteren",      chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
-    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
-
-    GROUPBOX        "Afdrukbereik",   grp1,   8,92,  144,64, WS_GROUP
-    CONTROL         "&Alle xx",       rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
-    CONTROL         "&Pagina's",      rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "Sele&ctie",      rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
-    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
-    RTEXT           "&van:",          stc2,  52,124,  20,8
-    RTEXT           "&t/m:",           stc3, 100,124,  16,8
-}
-
-
-
-STRINGTABLE DISCARDABLE
-{
-    PD32_PRINT_TITLE       "Print"
-
-    PD32_VALUE_UREADABLE                  "Onleesbare ingave"
-    PD32_INVALID_PAGE_RANGE "Deze waarde ligt niet binnen het bereik\n\
-Voert u s.v.p. een waarde tussen %d en %d in."
-    PD32_FROM_NOT_ABOVE_TO                "De VAN ingave kan niet groter zijn \
-dan de TO waarde"
-    PD32_MARGINS_OVERLAP                  "De marges overlappen of vallen \
-buiten het papier.\nVoer s.v.p. nieuwe marges in."
-    PD32_NR_OF_COPIES_EMPTY               "Het aantal invoerveld kan niet leeg \
-zijn."
-    PD32_TOO_LARGE_COPIES                 "Zoveel exemplaren kan de printer \
-niet in een keer aan, het maximum is %d"
-    PD32_PRINT_ERROR                      "Er ontstond een printer fout."
-    PD32_NO_DEFAULT_PRINTER               "Er is geen default printer"
-    PD32_CANT_FIND_PRINTER                "De printer werd niet gevonden"
-    PD32_OUT_OF_MEMORY                    "Er was onvoldoende geheugen \
-beschikbaar"
-    PD32_GENERIC_ERROR                    "Er onstond een niet nader \
-gespecifieerde fout"
-    PD32_DRIVER_UNKNOWN                   "De printer driver is onbekend"
-
-    PD32_DEFAULT_PRINTER                  "Default Printer, "
-    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Er staan %d documenten in de \
-wachtrij"
-    PD32_PRINT_ALL_X_PAGES                "&Alle %d pagina's"
-    PD32_MARGINS_IN_INCHES                "Marges [inch]"
-    PD32_MARGINS_IN_MILIMETERS            "Marges [mm]"
-    PD32_MILIMETERS                       "mm"
-
-    PD32_PRINTER_STATUS_READY             "Klaar"
-    PD32_PRINTER_STATUS_PAUSED            "Gepauseerd, "
-    PD32_PRINTER_STATUS_ERROR             "Fout, "
-    PD32_PRINTER_STATUS_PENDING_DELETION  "Bezig met verwijderen, "
-    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam, "
-    PD32_PRINTER_STATUS_PAPER_OUT         "Papier is op, "
-    PD32_PRINTER_STATUS_MANUAL_FEED       "Voer s.v.p. met de hand papier in, "
-    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Papier probleem, "
-    PD32_PRINTER_STATUS_OFFLINE           "Printer offline, "
-    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Actief, "
-    PD32_PRINTER_STATUS_BUSY              "Druk bezig, "
-    PD32_PRINTER_STATUS_PRINTING          "Aan het printen, "
-    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "De uitvoerlade is vol, "
-    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Niet aanwezig, "
-    PD32_PRINTER_STATUS_WAITING           "Aan het wachten, "
-    PD32_PRINTER_STATUS_PROCESSING        "Aan het Verwerken, "
-    PD32_PRINTER_STATUS_INITIALIZING      "Aan het opstarten, "
-    PD32_PRINTER_STATUS_WARMING_UP        "Aan het opwarmen, "
-    PD32_PRINTER_STATUS_TONER_LOW         "Er is nog maar weinig toner, "
-    PD32_PRINTER_STATUS_NO_TONER          "Toner is op, "
-    PD32_PRINTER_STATUS_PAGE_PUNT         "Storing in papieruitvoer, "
-    PD32_PRINTER_STATUS_USER_INTERVENTION "Onderbroken door een gebruiker, "
-    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Onvoldoende geheugen beschikbaar, "
-    PD32_PRINTER_STATUS_DOOR_OPEN         "De printer staat is open, "
-    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server onbekend; "
-    PD32_PRINTER_STATUS_POWER_SAVE        "Power safe mode; "
-}
Index: trunk/src/comdlg32/cdlg_No.orc
===================================================================
--- trunk/src/comdlg32/cdlg_No.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_No.orc	(revision 3031)
@@ -0,0 +1,163 @@
+LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Åpne"
+FONT 8, "Helv"
+{
+ LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Liste over filer av &type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Åpne", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Lagre som ..."
+FONT 8, "Helv"
+{
+ LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Liste over filer av &type:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Lagre som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Skriv"
+FONT 8, "Helv"
+{
+ LTEXT "Skriver:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Skriv del", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Alle", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&Markert", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Sider", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Skriv", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Fra:", 1090, 60, 80, 30, 9
+ LTEXT "&Til:", 1091, 120, 80, 30, 9
+ LTEXT "&Utskriftskvalitet:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "&Skriv til fil", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sammentrykket", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Skriveoppsett"
+FONT 8, "Helv"
+{
+ GROUPBOX "Skriver", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Standardskriver", 1056, 16, 20, 80, 12
+ LTEXT "[ingen]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Spesifikk &skriver", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Portrett", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Landskap", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papir", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Størrelse", 1089, 130, 95, 30, 9
+ LTEXT "&Kilde", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+ LTEXT "Font:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Farge"
+FONT 8, "Helv"
+{
+ LTEXT "&Grunnleggende farger:", 1088, 6, 6, 40, 9
+ LTEXT "&Egendefinerte farger:", 1089, 6, 126, 40, 9
+ LTEXT "&Ensfarget", 1090, 100, 146, 40, 9
+ LTEXT "&Int:", 1091, 150, 126, 40, 9
+ LTEXT "&Met:", 1092, 150, 146, 40, 9
+ LTEXT "&Lum:", 1093, 150, 166, 40, 9
+ LTEXT "&Rød:", 1094, 150, 126, 40, 9
+ LTEXT "&Grønn:", 1095, 150, 146, 40, 9
+ LTEXT "&Blå:", 1096, 150, 166, 40, 9
+ DEFPUSHBUTTON "Ok", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Legg til egendefinert farge", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Fjern egendefinerte farger", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Finn"
+FONT 8, "Helv"
+{
+ LTEXT "&Finn hva:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Kun hele ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skill på store/små bokstaver", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Retning", 1072, 107, 26, 68, 28
+ CONTROL "&Opp", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Ned", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Bytt"
+FONT 8, "Helv"
+{
+ LTEXT "&Finn hva:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Bytt med:", -1, 4, 26, 48, 8 
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skill på store/små bokstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Bytt", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Bytt alt", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjelp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_No.rc
===================================================================
--- trunk/src/comdlg32/cdlg_No.rc	(revision 3028)
+++ 	(revision )
@@ -1,163 +1,0 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Åpne"
-FONT 8, "Helv"
-{
- LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste over filer av &type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Åpne", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Lagre som ..."
-FONT 8, "Helv"
-{
- LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Liste over filer av &type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Lagre som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivebeskyttet", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv"
-FONT 8, "Helv"
-{
- LTEXT "Skriver:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Skriv del", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Alle", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Markert", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Sider", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Skriv", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Fra:", 1090, 60, 80, 30, 9
- LTEXT "&Til:", 1091, 120, 80, 30, 9
- LTEXT "&Utskriftskvalitet:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "&Skriv til fil", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Sammentrykket", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skriveoppsett"
-FONT 8, "Helv"
-{
- GROUPBOX "Skriver", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Standardskriver", 1056, 16, 20, 80, 12
- LTEXT "[ingen]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Spesifikk &skriver", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Oppsett", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Portrett", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Landskap", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papir", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Størrelse", 1089, 130, 95, 30, 9
- LTEXT "&Kilde", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
-FONT 8, "Helv"
-{
- LTEXT "Font:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Farge"
-FONT 8, "Helv"
-{
- LTEXT "&Grunnleggende farger:", 1088, 6, 6, 40, 9
- LTEXT "&Egendefinerte farger:", 1089, 6, 126, 40, 9
- LTEXT "&Ensfarget", 1090, 100, 146, 40, 9
- LTEXT "&Int:", 1091, 150, 126, 40, 9
- LTEXT "&Met:", 1092, 150, 146, 40, 9
- LTEXT "&Lum:", 1093, 150, 166, 40, 9
- LTEXT "&Rød:", 1094, 150, 126, 40, 9
- LTEXT "&Grønn:", 1095, 150, 146, 40, 9
- LTEXT "&Blå:", 1096, 150, 166, 40, 9
- DEFPUSHBUTTON "Ok", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Legg til egendefinert farge", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Fjern egendefinerte farger", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Finn"
-FONT 8, "Helv"
-{
- LTEXT "&Finn hva:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Kun hele ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skill på store/små bokstaver", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Retning", 1072, 107, 26, 68, 28
- CONTROL "&Opp", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Ned", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Finn neste", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Bytt"
-FONT 8, "Helv"
-{
- LTEXT "&Finn hva:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Bytt med:", -1, 4, 26, 48, 8 
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Kun hele ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skill på store/små bokstaver", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- DEFPUSHBUTTON "&Finn neste", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Bytt", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Bytt alt", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjelp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Pl.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Pl.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Pl.orc	(revision 3031)
@@ -0,0 +1,191 @@
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+/* LTEXT "Wyswietl pliki &typu:", 1089, 6, 104, 90, 9 */
+OPEN_FILE DIALOG 36, 24, 279, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Otwórz"
+FONT 8, "Helv"
+BEGIN
+	LTEXT "&Nazwa pliku:", 1090, 6, 6, 76, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+	LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+	LTEXT "&Katalogi:", -1, 110, 6, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9
+	LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+	LTEXT "Wywietl pliki &typu:", 1089, 6, 104, 90, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36
+	LTEXT "&Stacje dysków:", 1091, 110, 104, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68
+	CONTROL "Otwórz", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 212, 6, 56, 14
+	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 212, 24, 56, 14
+	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 212, 46, 56, 14
+	CONTROL "Tylko do odczytu", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 208, 68, 69, 12
+END
+/* PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 */
+SAVE_FILE DIALOG 36, 24, 278, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Zapisz jako"
+FONT 8, "Helv"
+BEGIN
+	LTEXT "&Nazwa pliku:", 1090, 6, 6, 76, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+	LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+	LTEXT "&Katalogi:", -1, 110, 6, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9
+	LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+	LTEXT "Pokazuj pliki &typu:", 1089, 6, 104, 90, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36
+	LTEXT "&Stacje dysków:", 1091, 110, 104, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68
+	CONTROL "Ok", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 213, 6, 56, 14
+	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 213, 24, 56, 14
+	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 213, 45, 56, 14
+	CONTROL "&Tylko do odczytu", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 208, 68, 68, 12
+END
+/* DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP */
+PRINT DIALOG 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Drukuj"
+FONT 8, "Helv"
+BEGIN
+	LTEXT "&Drukarka:", 1088, 6, 6, 40, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "", 1089, 60, 6, 150, 9
+	GROUPBOX "Drukuj", 1072, 6, 30, 160, 65, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	RADIOBUTTON "&Wszystko", 1056, 16, 45, 60, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	RADIOBUTTON "W&ybór", 1057, 16, 60, 60, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	RADIOBUTTON "&Strony", 1058, 16, 75, 60, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	CONTROL "Drukuj", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 6, 56, 14
+	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 24, 56, 14
+	CONTROL "&Ustawienia", 1024, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 46, 56, 14
+	LTEXT "&Od:", 1090, 60, 78, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "&Do:", 1091, 120, 78, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "Jakoæ &wydruku:", 1092, 6, 100, 76, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 71, 98, 92, 68
+	CONTROL "Drukuj do Pli&ku", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 14, 115, 95, 12
+	CONTROL "Sortuj kopie", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 182, 102, 59, 12
+END
+/*    PUSHBUTTON      "Anuluj",IDCANCEL,218,23,40,14,WS_GROUP */
+PRINT_SETUP DIALOG 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Print Setup"
+FONT 8, "Helv"
+BEGIN
+	GROUPBOX "Drukarka", 1072, 6, 10, 180, 65, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	RADIOBUTTON "&Drukarka domylna", 1056, 16, 20, 80, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	LTEXT "[none]", 1088, 35, 35, 120, 9
+	RADIOBUTTON "&Inna drukarka", 1057, 16, 50, 80, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 35, 65, 149, 68
+	CONTROL "Ok", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 206, 6, 56, 14
+	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 24, 56, 14
+	CONTROL "&Opcje", 1024, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 46, 56, 14
+	GROUPBOX "Orientacja", 1073, 6, 85, 100, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	RADIOBUTTON "W p&ionie", 1058, 50, 100, 40, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	RADIOBUTTON "W po&ziomie", 1059, 50, 115, 40, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	ICON "LANDSCAP", 1097, 10, 95, 32, 32
+	ICON "PORTRAIT", 1098, 10, 95, 32, 32
+	GROUPBOX "Papier", 1074, 120, 85, 180, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+	LTEXT "&Wielkoæ", 1089, 130, 95, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	LTEXT "&ród³o", 1090, 130, 110, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 155, 95, 92, 68
+	CONTROL "", 1138, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 155, 110, 92, 68
+END
+/* CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 */
+CHOOSE_FONT DIALOG 13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+BEGIN
+	LTEXT "&Czcionka:", 1088, 6,3,40,9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1136, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 6,13,94,54
+	LTEXT "St&yl:", 1089, 108,3,44,9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1137, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 108,13,64,54
+	LTEXT "&Rozmiar:", 1090, 179,3,30,9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1138, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT, 179,13,32,54
+	CONTROL "OK", IDOK, "BUTTON", WS_GROUP, 218,6,40,14
+	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 218,23,40,14
+	CONTROL "&Zastosuj", 1026, "BUTTON", WS_GROUP, 218,40,40,14
+	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 218,57,40,14
+	CONTROL "Efekty specialne", 1072, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6,72,84,34
+	CONTROL "Prz&ekrelona", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 82, 58, 10
+	CONTROL "P&odkrelona", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10,94,50,10
+	LTEXT "&Kolor:", 1091, 6,110,30,9, WS_CHILD | WS_VISIBLE | WS_GROUP
+	CONTROL "", 1139, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6,120,84,100
+	CONTROL "Przyk³ad", 1073, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 98,72,160,49
+	CONTROL "AaBbYyZz\xB3", 1093, "STATIC", SS_NOPREFIX | WS_VISIBLE, 104,81,149,37
+END
+/* PUSHBUTTON "&Replace", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ * PUSHBUTTON "Replace &All", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ * PUSHBUTTON "Cancel", 2, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ * PUSHBUTTON "&Help", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ *}
+ */
+FINDDLGORD DIALOG 34, 24, 251, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Znajd"
+FONT 8, "Helv"
+BEGIN
+	LTEXT "&Znajd:", -1, 4, 8, 42, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
+	EDITTEXT 1152, 46, 7, 134, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+	CONTROL "Uwzglêdnij tylko ca³e wyrazy", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 4, 26, 107, 12
+	CONTROL "&Uwzglêdniaj wielkoæ liter", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 4, 42, 107, 12
+	GROUPBOX "Kierunek", 1072, 113, 26, 68, 28
+	CONTROL "W &g\xF3r\xEA", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 117, 38, 20, 12
+	CONTROL "W &d\xF3l", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 38, 30, 12
+	CONTROL "&Znajd nastêpny", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 187, 5, 61, 14
+	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 187, 23, 61, 14
+	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 187, 45, 61, 14
+END
+REPLACEDLGORD DIALOG 36, 24, 245, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Zamieñ"
+FONT 8, "Helv"
+BEGIN
+	LTEXT "&Znajd:", -1, 4, 9, 48, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
+	EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+	LTEXT "Zanieñ &na:", -1, 4, 26, 48, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
+	EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+	CONTROL "Uwzglêdnij &tylko ca³e wyrazy", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 5, 46, 104, 12
+	CONTROL "&Uwzglêdnij wielkoæ liter", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 62, 96, 12
+	CONTROL "Znajd nastêpny", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 4, 67, 14
+	CONTROL "&Zamieñ", 1024, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 21, 68, 14
+	CONTROL "Zamieñ &wszystkie", 1025, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 38, 68, 14
+	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 56, 68, 14
+	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 75, 68, 14
+END
+   
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Color"
+FONT 8, "Helv"
+{
+ LTEXT "&Podstawowe kolory:",   1088, 4,    4,  140, 10
+ LTEXT "Dowolne &kolory:",  1089, 4,   106, 140, 10
+ LTEXT "Kolor |  Sol&id",  1090, 150, 151,  48, 10
+ LTEXT   "&Czerwony:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Zielony:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Niebieski:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Anuluj", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Pomoc", 1038,100,166, 44, 14
+ PUSHBUTTON "&Dodaj do dowolnych",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Z&definiuj Kolor >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
Index: trunk/src/comdlg32/cdlg_Pl.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Pl.rc	(revision 3028)
+++ 	(revision )
@@ -1,191 +1,0 @@
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-/* LTEXT "Wyswietl pliki &typu:", 1089, 6, 104, 90, 9 */
-OPEN_FILE DIALOG 36, 24, 279, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Otwórz"
-FONT 8, "Helv"
-BEGIN
-	LTEXT "&Nazwa pliku:", 1090, 6, 6, 76, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
-	LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
-	LTEXT "&Katalogi:", -1, 110, 6, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9
-	LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
-	LTEXT "Wywietl pliki &typu:", 1089, 6, 104, 90, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36
-	LTEXT "&Stacje dysków:", 1091, 110, 104, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68
-	CONTROL "Otwórz", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 212, 6, 56, 14
-	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 212, 24, 56, 14
-	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 212, 46, 56, 14
-	CONTROL "Tylko do odczytu", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 208, 68, 69, 12
-END
-/* PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134 */
-SAVE_FILE DIALOG 36, 24, 278, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Zapisz jako"
-FONT 8, "Helv"
-BEGIN
-	LTEXT "&Nazwa pliku:", 1090, 6, 6, 76, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
-	LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
-	LTEXT "&Katalogi:", -1, 110, 6, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1088, "STATIC", SS_NOPREFIX | WS_GROUP, 110, 18, 92, 9
-	LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
-	LTEXT "Pokazuj pliki &typu:", 1089, 6, 104, 90, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6, 114, 90, 36
-	LTEXT "&Stacje dysków:", 1091, 110, 104, 92, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 110, 114, 92, 68
-	CONTROL "Ok", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 213, 6, 56, 14
-	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 213, 24, 56, 14
-	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 213, 45, 56, 14
-	CONTROL "&Tylko do odczytu", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 208, 68, 68, 12
-END
-/* DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP */
-PRINT DIALOG 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Drukuj"
-FONT 8, "Helv"
-BEGIN
-	LTEXT "&Drukarka:", 1088, 6, 6, 40, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	LTEXT "", 1089, 60, 6, 150, 9
-	GROUPBOX "Drukuj", 1072, 6, 30, 160, 65, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	RADIOBUTTON "&Wszystko", 1056, 16, 45, 60, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	RADIOBUTTON "W&ybór", 1057, 16, 60, 60, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	RADIOBUTTON "&Strony", 1058, 16, 75, 60, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	CONTROL "Drukuj", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 6, 56, 14
-	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 24, 56, 14
-	CONTROL "&Ustawienia", 1024, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 46, 56, 14
-	LTEXT "&Od:", 1090, 60, 78, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	LTEXT "&Do:", 1091, 120, 78, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	LTEXT "Jakoæ &wydruku:", 1092, 6, 100, 76, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 71, 98, 92, 68
-	CONTROL "Drukuj do Pli&ku", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 14, 115, 95, 12
-	CONTROL "Sortuj kopie", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 182, 102, 59, 12
-END
-/*    PUSHBUTTON      "Anuluj",IDCANCEL,218,23,40,14,WS_GROUP */
-PRINT_SETUP DIALOG 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Print Setup"
-FONT 8, "Helv"
-BEGIN
-	GROUPBOX "Drukarka", 1072, 6, 10, 180, 65, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	RADIOBUTTON "&Drukarka domylna", 1056, 16, 20, 80, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	LTEXT "[none]", 1088, 35, 35, 120, 9
-	RADIOBUTTON "&Inna drukarka", 1057, 16, 50, 80, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	CONTROL "", 1136, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 35, 65, 149, 68
-	CONTROL "Ok", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP, 206, 6, 56, 14
-	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 24, 56, 14
-	CONTROL "&Opcje", 1024, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 206, 46, 56, 14
-	GROUPBOX "Orientacja", 1073, 6, 85, 100, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	RADIOBUTTON "W p&ionie", 1058, 50, 100, 40, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	RADIOBUTTON "W po&ziomie", 1059, 50, 115, 40, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	ICON "LANDSCAP", 1097, 10, 95, 32, 32
-	ICON "PORTRAIT", 1098, 10, 95, 32, 32
-	GROUPBOX "Papier", 1074, 120, 85, 180, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-	LTEXT "&Wielkoæ", 1089, 130, 95, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	LTEXT "&ród³o", 1090, 130, 110, 30, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1137, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 155, 95, 92, 68
-	CONTROL "", 1138, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 155, 110, 92, 68
-END
-/* CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 */
-CHOOSE_FONT DIALOG 13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
-FONT 8, "Helv"
-BEGIN
-	LTEXT "&Czcionka:", 1088, 6,3,40,9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1136, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 6,13,94,54
-	LTEXT "St&yl:", 1089, 108,3,44,9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1137, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE, 108,13,64,54
-	LTEXT "&Rozmiar:", 1090, 179,3,30,9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1138, "COMBOBOX", CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT, 179,13,32,54
-	CONTROL "OK", IDOK, "BUTTON", WS_GROUP, 218,6,40,14
-	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 218,23,40,14
-	CONTROL "&Zastosuj", 1026, "BUTTON", WS_GROUP, 218,40,40,14
-	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 218,57,40,14
-	CONTROL "Efekty specialne", 1072, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6,72,84,34
-	CONTROL "Prz&ekrelona", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 82, 58, 10
-	CONTROL "P&odkrelona", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10,94,50,10
-	LTEXT "&Kolor:", 1091, 6,110,30,9, WS_CHILD | WS_VISIBLE | WS_GROUP
-	CONTROL "", 1139, "COMBOBOX", CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP, 6,120,84,100
-	CONTROL "Przyk³ad", 1073, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 98,72,160,49
-	CONTROL "AaBbYyZz\xB3", 1093, "STATIC", SS_NOPREFIX | WS_VISIBLE, 104,81,149,37
-END
-/* PUSHBUTTON "&Replace", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- * PUSHBUTTON "Replace &All", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- * PUSHBUTTON "Cancel", 2, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- * PUSHBUTTON "&Help", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
- *}
- */
-FINDDLGORD DIALOG 34, 24, 251, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Znajd"
-FONT 8, "Helv"
-BEGIN
-	LTEXT "&Znajd:", -1, 4, 8, 42, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
-	EDITTEXT 1152, 46, 7, 134, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
-	CONTROL "Uwzglêdnij tylko ca³e wyrazy", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 4, 26, 107, 12
-	CONTROL "&Uwzglêdniaj wielkoæ liter", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 4, 42, 107, 12
-	GROUPBOX "Kierunek", 1072, 113, 26, 68, 28
-	CONTROL "W &g\xF3r\xEA", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 117, 38, 20, 12
-	CONTROL "W &d\xF3l", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 144, 38, 30, 12
-	CONTROL "&Znajd nastêpny", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 187, 5, 61, 14
-	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 187, 23, 61, 14
-	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 187, 45, 61, 14
-END
-REPLACEDLGORD DIALOG 36, 24, 245, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Zamieñ"
-FONT 8, "Helv"
-BEGIN
-	LTEXT "&Znajd:", -1, 4, 9, 48, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
-	EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
-	LTEXT "Zanieñ &na:", -1, 4, 26, 48, 8, WS_CHILD | WS_VISIBLE | WS_GROUP
-	EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
-	CONTROL "Uwzglêdnij &tylko ca³e wyrazy", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 5, 46, 104, 12
-	CONTROL "&Uwzglêdnij wielkoæ liter", 1041, "BUTTON", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 62, 96, 12
-	CONTROL "Znajd nastêpny", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 4, 67, 14
-	CONTROL "&Zamieñ", 1024, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 21, 68, 14
-	CONTROL "Zamieñ &wszystkie", 1025, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 38, 68, 14
-	CONTROL "Anuluj", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 56, 68, 14
-	CONTROL "&Pomoc", 1038, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 174, 75, 68, 14
-END
-   
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Color"
-FONT 8, "Helv"
-{
- LTEXT "&Podstawowe kolory:",   1088, 4,    4,  140, 10
- LTEXT "Dowolne &kolory:",  1089, 4,   106, 140, 10
- LTEXT "Kolor |  Sol&id",  1090, 150, 151,  48, 10
- LTEXT   "&Czerwony:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Zielony:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Niebieski:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Anuluj", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Pomoc", 1038,100,166, 44, 14
- PUSHBUTTON "&Dodaj do dowolnych",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Z&definiuj Kolor >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
Index: trunk/src/comdlg32/cdlg_Pt.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Pt.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Pt.orc	(revision 3031)
@@ -0,0 +1,372 @@
+LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Abrir"
+FONT 8, "Helv"
+{
+ LTEXT "Nome do &Arquivo:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Diretórios:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Listar Arquivos do &Tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Somente Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Salvar Como ..."
+FONT 8, "Helv"
+{
+ LTEXT "Nome do &Arquivo:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Diretórios:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Listar Arquivos do &Tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Salvar &Como", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ajuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Somente Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Imprimir"
+FONT 8, "Helv"
+{
+ LTEXT "Impressora:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Faixa de Impressão", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Tudo", 1056, 16, 45, 60, 12
+ RADIOBUTTON "S&eleção", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Páginas", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&De:", 1090, 60, 80, 30, 9
+ LTEXT "&Ate:", 1091, 120, 80, 30, 9
+ LTEXT "&Qualidade de Impressão:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Imprimir para Arquivo", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "C&ondensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configurações de Impressão"
+FONT 8, "Helv"
+{
+ GROUPBOX "Impressora", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Impressora Padrão", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Impressora &Específica", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Retrato", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Paisagem", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Tamanho", 1089, 130, 95, 30, 9
+ LTEXT "&Fonte de Alimentação", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Fonte"
+FONT 8, "Helv"
+{
+    LTEXT           "&Fonte:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Estilo da Fonte:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Tamanho:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Aplicar", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "A&juda" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Efeitos",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Riscado", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Sublinhado", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Cor:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Amostra",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cor"
+FONT 8, "Helv"
+{
+ LTEXT "Cores &Básicas:",   1088, 4,    4,  140, 10
+ LTEXT "&Cores do Usuário:",  1089, 4,   106, 140, 10
+ LTEXT "Colorido|Sólid&o",  1090, 150, 151,  48, 10
+ LTEXT   "Ver&melho:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Verde:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "A&zul:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "Mat&iz:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "Sa&t:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Aj&uda", 1038,100,166, 44, 14
+ PUSHBUTTON "&Adicionar Cor",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definir Cores Personalizadas >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&o",713,300,200,4,14   /* just a dummy:  'o' is  like  &o  in "solid&o"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Procurar"
+FONT 8, "Helv"
+{
+ LTEXT "&Procurar:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Palavra &Inteira", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Maiúsculas/minusculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direção", 1072, 107, 26, 68, 28
+ CONTROL "A&cima", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "A&baixo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "Procurar a Pró&xima", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Alterar"
+FONT 8, "Helv"
+{
+ LTEXT "&Procurar:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Alterar Pa&ra:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Palavra &inteira", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Maiúsculas/minúsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "Procurar a Pró&xima", IDOK,	174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&Alterar", psh1,			174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Alterar &Todas", psh2,		174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL,		174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", pshHelp,			174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print32"
+FONT 8, "Helv"
+{
+    DEFPUSHBUTTON   "OK",	IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON	    "Cancelar",	IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Ajuda",   pshHelp,  50, 161, 48,14, WS_GROUP
+    
+    GROUPBOX        "Impressora",		grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Imprimir em arqui&vo",	chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "Propri&edades",		psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Nome:",			stc6,  16, 20,  36,8
+    COMBOBOX					cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",			stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",		stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tipo:",			stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",		stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Onde:",			stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location",		stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Comentário:",		stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",		stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    
+    GROUPBOX        "Cópias",			grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Número de &cópias:",	stc5, 168,108,  68, 8
+    ICON            "",				ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "&Agrupar",			chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT					edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+    
+    GROUPBOX        "Faixa de impressão",	grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&Todos",			rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "Pá&ginas",			rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "Seleção",			rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT					edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT					edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&de:",			stc2,  52,124,  20,8
+    RTEXT           "&até:",			stc3, 100,124,  16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print32 Setup"
+FONT 8, "Helv"
+BEGIN
+    DEFPUSHBUTTON   "OK",	IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",	IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Rede...",	psh5, 284,156,48,14 */
+
+    GROUPBOX	"Impressora",     grp4,   8,   4, 272,  84, WS_GROUP
+    PUSHBUTTON	"&Propriedades",  psh2, 212,  17,  60,  14, WS_GROUP
+    LTEXT	"&Nome:",         stc6,  16,  20,  36,   8
+    COMBOBOX			  cmb1,  52,  18, 152, 152, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT	"Status:",        stc8,  16,  36,  36,  10, SS_NOPREFIX
+    LTEXT	"Dummy State",    stc12, 52,  36, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT	"Tipo:",          stc7,  16,  48,  36,  10, SS_NOPREFIX
+    LTEXT	"Dummy Type",     stc11, 52,  48, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT	"Onde:",          stc10, 16,  60,  36,  10, SS_NOPREFIX
+    LTEXT	"Dummy Location", stc14, 52,  60, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT	"Comentário",     stc9,  16,  72,  36,  10, SS_NOPREFIX
+    LTEXT	"Dummy Remark",   stc13, 52,  72, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX	"Papel",          grp2,   8,  92, 164,  56, WS_GROUP
+    LTEXT       "&Tamanho:",      stc2,  16, 108,  36,   8
+    COMBOBOX                      cmb2,  52, 106, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT	"&Origem:",       stc3,  16, 128,  36,   8
+    COMBOBOX                      cmb3,  52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+    GROUPBOX	"Orientação",     grp1, 180,  92, 100,  56, WS_GROUP
+    ICON	"",               ico1, 195, 112,  18,  20, WS_GROUP
+    CONTROL     "&Retrato",       rad1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12
+    CONTROL	"&Paisagem",      rad2, "Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12
+END
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Open"
+FONT 8, "helv"
+{
+    LTEXT	"Olhar &em",IDC_LOOKINSTATIC,7,6,27,8, SS_NOTIFY
+    COMBOBOX	IDC_LOOKIN,36,3,138,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    
+    LTEXT	"" , IDC_TOOLBARSTATIC, 172, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+    
+    LTEXT	"Nome do &arquivo:",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL
+    
+    LTEXT	"Arquivos do &tipo",IDC_FILETYPESTATIC,5,131,48,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,129,155,100,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    
+    CONTROL	"Abrir como &somente-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10
+    
+    DEFPUSHBUTTON	"&Abrir",		IDOK,222,110,50,13
+    PUSHBUTTON		"Cancel",		IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Help",		pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ABOUTBOX	"&Sobre FolderPicker Text"
+    IDS_DOCUMENTFOLDERS	"Pastas de Documentos"
+    IDS_PERSONAL	"Meus Documentos"
+    IDS_FAVORITES	"Favoritos"
+    IDS_PATH		"Caminho do Sistema"
+    IDS_DESKTOP		"Área de Trabalho"
+    IDS_FONTS		"Fonts"
+    IDS_MYCOMPUTER	"Meu Computador"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SYSTEMFOLDERS	"Pastas do Sistema"
+    IDS_LOCALHARDRIVES	"Discos Rígidos Locais"
+    IDS_FILENOTFOUND	"Arquivo não encontrado"
+    IDS_VERIFYFILE	"Por favor verifique se foi fornecido o nome correto do arquivo"
+    IDS_CREATEFILE	"Arquivo não existe\nVocê gostaria de cria-lo"
+
+}
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE				"Print"
+    
+    PD32_VALUE_UREADABLE			"Entrada Ilegível"
+    PD32_INVALID_PAGE_RANGE			"Este valor não se encaixa na faixa de páginas\n\
+Por favor entre um valor entre %d e %d"
+    PD32_FROM_NOT_ABOVE_TO			"A entrada DE não pode exceder ATÉ:"
+    PD32_MARGINS_OVERLAP			"As margens estão fora das medidas \
+do papel.\nPor favor reentre as margens"
+    PD32_NR_OF_COPIES_EMPTY			"O número de cópias não pode ter valor vazio"
+    PD32_TOO_LARGE_COPIES			"Esta quantidade de impressão não é suportada \
+pela sua impressora.\nPor favor entre um valor entre 1 e %d"
+    PD32_PRINT_ERROR				"Ocorreu um erro de impressão"
+    PD32_NO_DEFAULT_PRINTER			"Não existe uma impressora padrão"
+    PD32_CANT_FIND_PRINTER			"Nãp pude encontrar uma impressora"
+    PD32_OUT_OF_MEMORY				"Memória insulficiente"
+    PD32_GENERIC_ERROR				"Ocorreu algum erro"
+    PD32_DRIVER_UNKNOWN				"Driver de impressora desconhecido"
+    
+    PD32_DEFAULT_PRINTER			"Impressora Padrão; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE		"Existem %d documentos na fila"
+    PD32_PRINT_ALL_X_PAGES			"&Todas %d páginas"
+    PD32_MARGINS_IN_INCHES			"Margens [polegadas]"
+    PD32_MARGINS_IN_MILIMETERS			"Margens [mm]"
+    PD32_MILIMETERS				"mm"
+    
+    PD32_PRINTER_STATUS_READY			"Pronto"
+    PD32_PRINTER_STATUS_PAUSED			"Pausado; "
+    PD32_PRINTER_STATUS_ERROR			"Erro; "
+    PD32_PRINTER_STATUS_PENDING_DELETION	"Exclusão pendente; "
+    PD32_PRINTER_STATUS_PAPER_JAM		"Papel atolado; "
+    PD32_PRINTER_STATUS_PAPER_OUT		"Sem papel; "
+    PD32_PRINTER_STATUS_MANUAL_FEED		"Carregue papel manualmente; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM		"Problemas com o papel; "
+    PD32_PRINTER_STATUS_OFFLINE			"Impressora desligada; "
+    PD32_PRINTER_STATUS_IO_ACTIVE		"E/S Ativo; "
+    PD32_PRINTER_STATUS_BUSY			"Ocupado; "
+    PD32_PRINTER_STATUS_PRINTING		"Imprimindo; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL		"Fila de impressão está cheia; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE		"Não disponível; "
+    PD32_PRINTER_STATUS_WAITING			"Esperando; "
+    PD32_PRINTER_STATUS_PROCESSING		"Processando; "
+    PD32_PRINTER_STATUS_INITIALIZING		"Inicializando; "
+    PD32_PRINTER_STATUS_WARMING_UP		"Aquecendo; "
+    PD32_PRINTER_STATUS_TONER_LOW		"Pouco toner; "
+    PD32_PRINTER_STATUS_NO_TONER		"Sem toner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT		"Page punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION	"Interrompido pelo usuário; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY		"Memória insulficiente; "
+    PD32_PRINTER_STATUS_DOOR_OPEN		"A impressora está aberta; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN		"Servidor de impressão desconhecido; "
+    PD32_PRINTER_STATUS_POWER_SAVE		"Modo econômico; "
+}
Index: trunk/src/comdlg32/cdlg_Pt.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Pt.rc	(revision 3028)
+++ 	(revision )
@@ -1,372 +1,0 @@
-LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Abrir"
-FONT 8, "Helv"
-{
- LTEXT "Nome do &Arquivo:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Diretórios:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Listar Arquivos do &Tipo:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Somente Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Salvar Como ..."
-FONT 8, "Helv"
-{
- LTEXT "Nome do &Arquivo:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Diretórios:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Listar Arquivos do &Tipo:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Salvar &Como", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ajuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Somente Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Imprimir"
-FONT 8, "Helv"
-{
- LTEXT "Impressora:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Faixa de Impressão", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Tudo", 1056, 16, 45, 60, 12
- RADIOBUTTON "S&eleção", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Páginas", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&De:", 1090, 60, 80, 30, 9
- LTEXT "&Ate:", 1091, 120, 80, 30, 9
- LTEXT "&Qualidade de Impressão:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Imprimir para Arquivo", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "C&ondensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Configurações de Impressão"
-FONT 8, "Helv"
-{
- GROUPBOX "Impressora", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Impressora Padrão", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Impressora &Específica", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Retrato", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Paisagem", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Tamanho", 1089, 130, 95, 30, 9
- LTEXT "&Fonte de Alimentação", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Fonte"
-FONT 8, "Helv"
-{
-    LTEXT           "&Fonte:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Estilo da Fonte:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Tamanho:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Aplicar", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "A&juda" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Efeitos",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "&Riscado", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Sublinhado", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "&Cor:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Amostra",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cor"
-FONT 8, "Helv"
-{
- LTEXT "Cores &Básicas:",   1088, 4,    4,  140, 10
- LTEXT "&Cores do Usuário:",  1089, 4,   106, 140, 10
- LTEXT "Colorido|Sólid&o",  1090, 150, 151,  48, 10
- LTEXT   "Ver&melho:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Verde:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "A&zul:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "Mat&iz:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "Sa&t:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Aj&uda", 1038,100,166, 44, 14
- PUSHBUTTON "&Adicionar Cor",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Definir Cores Personalizadas >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&o",713,300,200,4,14   /* just a dummy:  'o' is  like  &o  in "solid&o"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Procurar"
-FONT 8, "Helv"
-{
- LTEXT "&Procurar:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Palavra &Inteira", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Maiúsculas/minusculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direção", 1072, 107, 26, 68, 28
- CONTROL "A&cima", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "A&baixo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-
- DEFPUSHBUTTON "Procurar a Pró&xima", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Alterar"
-FONT 8, "Helv"
-{
- LTEXT "&Procurar:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Alterar Pa&ra:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Palavra &inteira", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Maiúsculas/minúsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-
- DEFPUSHBUTTON "Procurar a Pró&xima", IDOK,	174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "&Alterar", psh1,			174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Alterar &Todas", psh2,		174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancelar", IDCANCEL,		174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&juda", pshHelp,			174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
-      DS_CONTEXTHELP | DS_3DLOOK
-CAPTION "Print32"
-FONT 8, "Helv"
-{
-    DEFPUSHBUTTON   "OK",	IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
-    PUSHBUTTON	    "Cancelar",	IDCANCEL, 232,164, 48,14, WS_GROUP
-    PUSHBUTTON      "&Ajuda",   pshHelp,  50, 161, 48,14, WS_GROUP
-    
-    GROUPBOX        "Impressora",		grp4,   8,  4, 272,84, WS_GROUP
-    CONTROL         "Imprimir em arqui&vo",	chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
-    PUSHBUTTON      "Propri&edades",		psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Nome:",			stc6,  16, 20,  36,8
-    COMBOBOX					cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Status:",			stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",		stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Tipo:",			stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",		stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Onde:",			stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location",		stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Comentário:",		stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",		stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    
-    GROUPBOX        "Cópias",			grp2, 160, 92, 120,64, WS_GROUP
-    LTEXT           "Número de &cópias:",	stc5, 168,108,  68, 8
-    ICON            "",				ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "&Agrupar",			chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
-    EDITTEXT					edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
-    
-    GROUPBOX        "Faixa de impressão",	grp1,   8,92,  144,64, WS_GROUP
-    CONTROL         "&Todos",			rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
-    CONTROL         "Pá&ginas",			rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
-    CONTROL         "Seleção",			rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    EDITTEXT					edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
-    EDITTEXT					edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
-    RTEXT           "&de:",			stc2,  52,124,  20,8
-    RTEXT           "&até:",			stc3, 100,124,  16,8
-}
-
-PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
-      DS_CONTEXTHELP | DS_3DLOOK
-CAPTION "Print32 Setup"
-FONT 8, "Helv"
-BEGIN
-    DEFPUSHBUTTON   "OK",	IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Cancelar",	IDCANCEL,232,156,48,14
-/*    PUSHBUTTON      "Rede...",	psh5, 284,156,48,14 */
-
-    GROUPBOX	"Impressora",     grp4,   8,   4, 272,  84, WS_GROUP
-    PUSHBUTTON	"&Propriedades",  psh2, 212,  17,  60,  14, WS_GROUP
-    LTEXT	"&Nome:",         stc6,  16,  20,  36,   8
-    COMBOBOX			  cmb1,  52,  18, 152, 152, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT	"Status:",        stc8,  16,  36,  36,  10, SS_NOPREFIX
-    LTEXT	"Dummy State",    stc12, 52,  36, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT	"Tipo:",          stc7,  16,  48,  36,  10, SS_NOPREFIX
-    LTEXT	"Dummy Type",     stc11, 52,  48, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT	"Onde:",          stc10, 16,  60,  36,  10, SS_NOPREFIX
-    LTEXT	"Dummy Location", stc14, 52,  60, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT	"Comentário",     stc9,  16,  72,  36,  10, SS_NOPREFIX
-    LTEXT	"Dummy Remark",   stc13, 52,  72, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-
-    GROUPBOX	"Papel",          grp2,   8,  92, 164,  56, WS_GROUP
-    LTEXT       "&Tamanho:",      stc2,  16, 108,  36,   8
-    COMBOBOX                      cmb2,  52, 106, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT	"&Origem:",       stc3,  16, 128,  36,   8
-    COMBOBOX                      cmb3,  52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-
-    GROUPBOX	"Orientação",     grp1, 180,  92, 100,  56, WS_GROUP
-    ICON	"",               ico1, 195, 112,  18,  20, WS_GROUP
-    CONTROL     "&Retrato",       rad1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12
-    CONTROL	"&Paisagem",      rad2, "Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12
-END
-
-NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
-STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Open"
-FONT 8, "helv"
-{
-    LTEXT	"Olhar &em",IDC_LOOKINSTATIC,7,6,27,8, SS_NOTIFY
-    COMBOBOX	IDC_LOOKIN,36,3,138,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    
-    LTEXT	"" , IDC_TOOLBARSTATIC, 172, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
-    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
-    
-    LTEXT	"Nome do &arquivo:",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY
-    EDITTEXT	IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL
-    
-    LTEXT	"Arquivos do &tipo",IDC_FILETYPESTATIC,5,131,48,8, SS_NOTIFY
-    COMBOBOX	IDC_FILETYPE,54,129,155,100,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    
-    CONTROL	"Abrir como &somente-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10
-    
-    DEFPUSHBUTTON	"&Abrir",		IDOK,222,110,50,13
-    PUSHBUTTON		"Cancel",		IDCANCEL,222,128,50,14
-    PUSHBUTTON		"&Help",		pshHelp,222,145,50,14
-}
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_ABOUTBOX	"&Sobre FolderPicker Text"
-    IDS_DOCUMENTFOLDERS	"Pastas de Documentos"
-    IDS_PERSONAL	"Meus Documentos"
-    IDS_FAVORITES	"Favoritos"
-    IDS_PATH		"Caminho do Sistema"
-    IDS_DESKTOP		"Área de Trabalho"
-    IDS_FONTS		"Fonts"
-    IDS_MYCOMPUTER	"Meu Computador"
-}
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_SYSTEMFOLDERS	"Pastas do Sistema"
-    IDS_LOCALHARDRIVES	"Discos Rígidos Locais"
-    IDS_FILENOTFOUND	"Arquivo não encontrado"
-    IDS_VERIFYFILE	"Por favor verifique se foi fornecido o nome correto do arquivo"
-    IDS_CREATEFILE	"Arquivo não existe\nVocê gostaria de cria-lo"
-
-}
-
-STRINGTABLE DISCARDABLE
-{
-    PD32_PRINT_TITLE				"Print"
-    
-    PD32_VALUE_UREADABLE			"Entrada Ilegível"
-    PD32_INVALID_PAGE_RANGE			"Este valor não se encaixa na faixa de páginas\n\
-Por favor entre um valor entre %d e %d"
-    PD32_FROM_NOT_ABOVE_TO			"A entrada DE não pode exceder ATÉ:"
-    PD32_MARGINS_OVERLAP			"As margens estão fora das medidas \
-do papel.\nPor favor reentre as margens"
-    PD32_NR_OF_COPIES_EMPTY			"O número de cópias não pode ter valor vazio"
-    PD32_TOO_LARGE_COPIES			"Esta quantidade de impressão não é suportada \
-pela sua impressora.\nPor favor entre um valor entre 1 e %d"
-    PD32_PRINT_ERROR				"Ocorreu um erro de impressão"
-    PD32_NO_DEFAULT_PRINTER			"Não existe uma impressora padrão"
-    PD32_CANT_FIND_PRINTER			"Nãp pude encontrar uma impressora"
-    PD32_OUT_OF_MEMORY				"Memória insulficiente"
-    PD32_GENERIC_ERROR				"Ocorreu algum erro"
-    PD32_DRIVER_UNKNOWN				"Driver de impressora desconhecido"
-    
-    PD32_DEFAULT_PRINTER			"Impressora Padrão; "
-    PD32_NR_OF_DOCUMENTS_IN_QUEUE		"Existem %d documentos na fila"
-    PD32_PRINT_ALL_X_PAGES			"&Todas %d páginas"
-    PD32_MARGINS_IN_INCHES			"Margens [polegadas]"
-    PD32_MARGINS_IN_MILIMETERS			"Margens [mm]"
-    PD32_MILIMETERS				"mm"
-    
-    PD32_PRINTER_STATUS_READY			"Pronto"
-    PD32_PRINTER_STATUS_PAUSED			"Pausado; "
-    PD32_PRINTER_STATUS_ERROR			"Erro; "
-    PD32_PRINTER_STATUS_PENDING_DELETION	"Exclusão pendente; "
-    PD32_PRINTER_STATUS_PAPER_JAM		"Papel atolado; "
-    PD32_PRINTER_STATUS_PAPER_OUT		"Sem papel; "
-    PD32_PRINTER_STATUS_MANUAL_FEED		"Carregue papel manualmente; "
-    PD32_PRINTER_STATUS_PAPER_PROBLEM		"Problemas com o papel; "
-    PD32_PRINTER_STATUS_OFFLINE			"Impressora desligada; "
-    PD32_PRINTER_STATUS_IO_ACTIVE		"E/S Ativo; "
-    PD32_PRINTER_STATUS_BUSY			"Ocupado; "
-    PD32_PRINTER_STATUS_PRINTING		"Imprimindo; "
-    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL		"Fila de impressão está cheia; "
-    PD32_PRINTER_STATUS_NOT_AVAILABLE		"Não disponível; "
-    PD32_PRINTER_STATUS_WAITING			"Esperando; "
-    PD32_PRINTER_STATUS_PROCESSING		"Processando; "
-    PD32_PRINTER_STATUS_INITIALIZING		"Inicializando; "
-    PD32_PRINTER_STATUS_WARMING_UP		"Aquecendo; "
-    PD32_PRINTER_STATUS_TONER_LOW		"Pouco toner; "
-    PD32_PRINTER_STATUS_NO_TONER		"Sem toner; "
-    PD32_PRINTER_STATUS_PAGE_PUNT		"Page punt; "
-    PD32_PRINTER_STATUS_USER_INTERVENTION	"Interrompido pelo usuário; "
-    PD32_PRINTER_STATUS_OUT_OF_MEMORY		"Memória insulficiente; "
-    PD32_PRINTER_STATUS_DOOR_OPEN		"A impressora está aberta; "
-    PD32_PRINTER_STATUS_SERVER_UNKNOWN		"Servidor de impressão desconhecido; "
-    PD32_PRINTER_STATUS_POWER_SAVE		"Modo econômico; "
-}
Index: trunk/src/comdlg32/cdlg_Ru.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Ru.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Ru.orc	(revision 3031)
@@ -0,0 +1,195 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Îòêðûòü"
+FONT 8, "Ms Sans Serif"
+{
+ LTEXT "&Èìÿ ôàéëà:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Êàòàëîãè:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Ïîêàçûâàòü ôàéëû &òèïà:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Îòêðûòü", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Îòìåíà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ñïðàâêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ò&îëüêî äëÿ ÷òåíèÿ", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ñîõðàíèòü êàê ..."
+FONT 8, "Ms Sans Serif"
+{
+ LTEXT "&Èìÿ ôàéëà:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Êàòàëîãè:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Ïîêàçûâàòü ôàéëû &òèïà:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ñîõðàíèòü êàê", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Îòìåíà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ñïðàâêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Òîëüêî äëÿ ÷òåíèÿ", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ïå÷àòü"
+FONT 8, "Ms Sans Serif"
+{
+ LTEXT "Ïðèíòåð:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Ïå÷àòàòü", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Âñå", 1056, 16, 45, 60, 12
+ RADIOBUTTON "Â&ûäåëåííûé ôðàãìåíò", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Ñòðàíèöû", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Ïå÷àòü", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Îòìåíà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Ñâî&éñòâà", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&ñ:", 1090, 60, 80, 30, 9
+ LTEXT "&ïî:", 1091, 120, 80, 30, 9
+ LTEXT "&Êà÷åñòâî ïå÷àòè:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Ï&å÷àòü â ôàéë", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Íàñòðîéêà ïðèíòåðà"
+FONT 8, "Ms Sans Serif"
+{
+ GROUPBOX "Ïðèíòåð", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "Ïðèíòåð ïî &óìîë÷àíèþ", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "&Äðóãîé ïðèíòåð", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Îòìåíà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Íàñòðîéêà", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Îðèåíòàöèÿ", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Êíèæíàÿ", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Àëüáîìíàÿ", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Áóìàãà", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "Ðà&çìåð", 1089, 130, 95, 30, 9
+ LTEXT "&Èñòî÷íèê", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Øðèôò"
+FONT 8, "Ms Sans Serif"
+{
+    LTEXT           "&Øðèôò:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Íà÷åðòàíèå:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Ðàçìåð:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+    PUSHBUTTON      "Îòìåíà",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Ïðèìåíèòü", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Ñïðàâêà" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Àòðèáóòû",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Çà÷åðêíóòûé", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "Ïîä&÷åðêíóòûé", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "Ö&âåò:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Îáðàçåö",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Èçìåíåíèå ïàëèòðû"
+FONT 8, "Ms Sans Serif"
+{
+ LTEXT "&Áàçîâàÿ ïàëèòðà:",   1088, 4,    4,  140, 10
+ LTEXT "Äî&ïîëíèòåëüíûå öâåòà:",  1089, 4,   106, 140, 10
+ LTEXT "Öâåò |  Çà&ëèâêà",  1090, 150, 151,  48, 10
+ LTEXT   "Êðàñ&íûé:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Çåëåíûé:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "Ñ&èíèé:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "Î&òòåíîê:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Êîíòðàñò:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&ßðêîñòü:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Îòìåíà", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cïðàâêà", 1038,100,166, 44, 14
+ PUSHBUTTON "&Äîáàâèòü â íàáîð",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Îïðåäåëèòü öâåò >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ïîèñê"
+FONT 8, "Ms Sans Serif"
+{
+ LTEXT "&Îáðàçåö:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Òîëüêî ñëîâî öåëèêîì", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "C &ó÷åòîì ðåãèñòðà", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Íàïðàâëåíèå", 1072, 107, 26, 68, 28
+ CONTROL "&Ââåðõ", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "Â&íèç", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Íàéòè äàëåå", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+ PUSHBUTTON "Îòìåíà", IDCANCEL	 , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ñïðàâêà", pshHelp	 , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Çàìåíà"
+FONT 8, "Ms Sans Serif"
+{
+ LTEXT "&Îáðàçåö:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Ç&àìåíèòü íà:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Òîëüêî ñëîâî öåëèêîì", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ñ &ó÷åòîì ðåãèñòðà", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "&Íàéòè äàëåå", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+ PUSHBUTTON "&Çàìåíèòü", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Çàìåíèòü &âñå", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Îòìåíà", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ñïðàâêà", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
Index: trunk/src/comdlg32/cdlg_Ru.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Ru.rc	(revision 3028)
+++ 	(revision )
@@ -1,195 +1,0 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Îòêðûòü"
-FONT 8, "Ms Sans Serif"
-{
- LTEXT "&Èìÿ ôàéëà:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Êàòàëîãè:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Ïîêàçûâàòü ôàéëû &òèïà:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Îòêðûòü", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Îòìåíà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ñïðàâêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Ò&îëüêî äëÿ ÷òåíèÿ", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ñîõðàíèòü êàê ..."
-FONT 8, "Ms Sans Serif"
-{
- LTEXT "&Èìÿ ôàéëà:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Êàòàëîãè:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Ïîêàçûâàòü ôàéëû &òèïà:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Äèñêè:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ñîõðàíèòü êàê", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Îòìåíà", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ñïðàâêà", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Òîëüêî äëÿ ÷òåíèÿ", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ïå÷àòü"
-FONT 8, "Ms Sans Serif"
-{
- LTEXT "Ïðèíòåð:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Ïå÷àòàòü", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Âñå", 1056, 16, 45, 60, 12
- RADIOBUTTON "Â&ûäåëåííûé ôðàãìåíò", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Ñòðàíèöû", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Ïå÷àòü", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Îòìåíà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Ñâî&éñòâà", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&ñ:", 1090, 60, 80, 30, 9
- LTEXT "&ïî:", 1091, 120, 80, 30, 9
- LTEXT "&Êà÷åñòâî ïå÷àòè:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Ï&å÷àòü â ôàéë", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Íàñòðîéêà ïðèíòåðà"
-FONT 8, "Ms Sans Serif"
-{
- GROUPBOX "Ïðèíòåð", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "Ïðèíòåð ïî &óìîë÷àíèþ", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "&Äðóãîé ïðèíòåð", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Îòìåíà", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Íàñòðîéêà", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Îðèåíòàöèÿ", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Êíèæíàÿ", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Àëüáîìíàÿ", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Áóìàãà", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "Ðà&çìåð", 1089, 130, 95, 30, 9
- LTEXT "&Èñòî÷íèê", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Øðèôò"
-FONT 8, "Ms Sans Serif"
-{
-    LTEXT           "&Øðèôò:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Íà÷åðòàíèå:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Ðàçìåð:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
-    PUSHBUTTON      "Îòìåíà",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ïðèìåíèòü", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Ñïðàâêà" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Àòðèáóòû",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "&Çà÷åðêíóòûé", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "Ïîä&÷åðêíóòûé", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "Ö&âåò:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Îáðàçåö",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Èçìåíåíèå ïàëèòðû"
-FONT 8, "Ms Sans Serif"
-{
- LTEXT "&Áàçîâàÿ ïàëèòðà:",   1088, 4,    4,  140, 10
- LTEXT "Äî&ïîëíèòåëüíûå öâåòà:",  1089, 4,   106, 140, 10
- LTEXT "Öâåò |  Çà&ëèâêà",  1090, 150, 151,  48, 10
- LTEXT   "Êðàñ&íûé:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Çåëåíûé:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "Ñ&èíèé:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "Î&òòåíîê:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Êîíòðàñò:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&ßðêîñòü:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "OK",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Îòìåíà", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cïðàâêà", 1038,100,166, 44, 14
- PUSHBUTTON "&Äîáàâèòü â íàáîð",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Îïðåäåëèòü öâåò >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ïîèñê"
-FONT 8, "Ms Sans Serif"
-{
- LTEXT "&Îáðàçåö:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Òîëüêî ñëîâî öåëèêîì", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "C &ó÷åòîì ðåãèñòðà", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Íàïðàâëåíèå", 1072, 107, 26, 68, 28
- CONTROL "&Ââåðõ", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "Â&íèç", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-
- DEFPUSHBUTTON "&Íàéòè äàëåå", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
- PUSHBUTTON "Îòìåíà", IDCANCEL	 , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ñïðàâêà", pshHelp	 , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Çàìåíà"
-FONT 8, "Ms Sans Serif"
-{
- LTEXT "&Îáðàçåö:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Ç&àìåíèòü íà:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Òîëüêî ñëîâî öåëèêîì", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Ñ &ó÷åòîì ðåãèñòðà", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-
- DEFPUSHBUTTON "&Íàéòè äàëåå", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
- PUSHBUTTON "&Çàìåíèòü", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Çàìåíèòü &âñå", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Îòìåíà", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ñïðàâêà", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
Index: trunk/src/comdlg32/cdlg_Sv.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Sv.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Sv.orc	(revision 3031)
@@ -0,0 +1,194 @@
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Öppna"
+FONT 8, "Helv"
+{
+ LTEXT "Fil&namn:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Lista filer av &typen:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Enheter:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Öppna", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjälp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skrivskyddat", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Spara som ..."
+FONT 8, "Helv"
+{
+ LTEXT "&Filnamn:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Kataloger:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Lista filer av &typen:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Enheter:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Spara som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjälp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skrivskyddad", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Skriv ut"
+FONT 8, "Helv"
+{
+ LTEXT "Skrivare:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Skriv ut del", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Allt", 1056, 16, 45, 60, 12
+ RADIOBUTTON "&Markerat", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Sidor", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Skriv ut", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Inställningar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Från:", 1090, 60, 80, 30, 9
+ LTEXT "&Till:", 1091, 120, 80, 30, 9
+ LTEXT "Utskriftskvalitet:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "&Skriv till fil", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sammantryckt", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Skrivar inställningar"
+FONT 8, "Helv"
+{
+ GROUPBOX "Skrivare", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Standardskrivare", 1056, 16, 20, 80, 12
+ LTEXT "[ingen]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Specifierad &skrivare", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Inställningar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Porträtt", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Landskap", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Storlek", 1089, 130, 95, 30, 9
+ LTEXT "&Källa", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+    LTEXT           "&Font:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Font S&til:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Storlek:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Avbryt",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Använd", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Hjälp" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Effekter",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Genomstruken", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Understruken", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Färg:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Test",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Färg"
+FONT 8, "Helv"
+{
+ LTEXT "&Grundläggande färger:",   1088, 4,    4,  140, 10
+ LTEXT "&Egendefinerade färger:",  1089, 4,   106, 140, 10
+ LTEXT "Enfärgat",  1090, 150, 151,  48, 10
+ LTEXT   "&Röd:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Grön:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Blå:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Int:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Met:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Hjälp", 1038,100,166, 44, 14
+ PUSHBUTTON "&Lägg till egendefinerad färg",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Defingnera egen färg >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Sök"
+FONT 8, "Helv"
+{
+ LTEXT "&Sök efter:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Bara hela ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skillnad på stora/små bokstäver", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Riktning", 1072, 107, 26, 68, 28
+ CONTROL "&Upp", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Ner", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ DEFPUSHBUTTON "&Sök efter nästa", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjälp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Sök/ersätt"
+FONT 8, "Helv"
+{
+ LTEXT "&Sök efter:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Ersätt med:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Bara hela ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Skillnad på stora/små bokstäver", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ DEFPUSHBUTTON "&Sök efter nästa", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ersätt", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Ersätt &alla", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Avbryt", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hjälp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
Index: trunk/src/comdlg32/cdlg_Sv.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Sv.rc	(revision 3028)
+++ 	(revision )
@@ -1,194 +1,0 @@
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Öppna"
-FONT 8, "Helv"
-{
- LTEXT "Fil&namn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Lista filer av &typen:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Enheter:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Öppna", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjälp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivskyddat", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Spara som ..."
-FONT 8, "Helv"
-{
- LTEXT "&Filnamn:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Kataloger:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Lista filer av &typen:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Enheter:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Spara som", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjälp", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skrivskyddad", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skriv ut"
-FONT 8, "Helv"
-{
- LTEXT "Skrivare:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Skriv ut del", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Allt", 1056, 16, 45, 60, 12
- RADIOBUTTON "&Markerat", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Sidor", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "Skriv ut", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Inställningar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Från:", 1090, 60, 80, 30, 9
- LTEXT "&Till:", 1091, 120, 80, 30, 9
- LTEXT "Utskriftskvalitet:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "&Skriv till fil", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Sammantryckt", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skrivar inställningar"
-FONT 8, "Helv"
-{
- GROUPBOX "Skrivare", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Standardskrivare", 1056, 16, 20, 80, 12
- LTEXT "[ingen]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Specifierad &skrivare", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Inställningar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientering", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Porträtt", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Landskap", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Storlek", 1089, 130, 95, 30, 9
- LTEXT "&Källa", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Font"
-FONT 8, "Helv"
-{
-    LTEXT           "&Font:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "Font S&til:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Storlek:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Avbryt",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Använd", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Hjälp" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Effekter",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "&Genomstruken", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Understruken", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
-    LTEXT           "&Färg:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Test",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Färg"
-FONT 8, "Helv"
-{
- LTEXT "&Grundläggande färger:",   1088, 4,    4,  140, 10
- LTEXT "&Egendefinerade färger:",  1089, 4,   106, 140, 10
- LTEXT "Enfärgat",  1090, 150, 151,  48, 10
- LTEXT   "&Röd:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Grön:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Blå:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Int:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Met:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Hjälp", 1038,100,166, 44, 14
- PUSHBUTTON "&Lägg till egendefinerad färg",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Defingnera egen färg >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Sök"
-FONT 8, "Helv"
-{
- LTEXT "&Sök efter:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Bara hela ord", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skillnad på stora/små bokstäver", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Riktning", 1072, 107, 26, 68, 28
- CONTROL "&Upp", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Ner", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
- DEFPUSHBUTTON "&Sök efter nästa", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjälp", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Sök/ersätt"
-FONT 8, "Helv"
-{
- LTEXT "&Sök efter:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "&Ersätt med:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Bara hela ord", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Skillnad på stora/små bokstäver", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- DEFPUSHBUTTON "&Sök efter nästa", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ersätt", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Ersätt &alla", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hjälp", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
Index: trunk/src/comdlg32/cdlg_Wa.orc
===================================================================
--- trunk/src/comdlg32/cdlg_Wa.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_Wa.orc	(revision 3031)
@@ -0,0 +1,202 @@
+LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+
+/* 
+ * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
+ * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
+ */
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Drovî"
+FONT 8, "Helv"
+{
+ LTEXT "&No do fitchî:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Ridants", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Djîveye des fitchîs del sôr&te:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Plakes:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "I Va", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rinoncî", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Rén ki &lere", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Schaper èt rlomer..."
+FONT 8, "Helv"
+{
+ LTEXT "&No do fitchî:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Ridants:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Djîveye des fitchîs del sôr&te:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Plakes:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "I Va", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rinoncî", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Rén ki &lere", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Rexhe"
+FONT 8, "Helv"
+{
+ LTEXT "Sicrirece:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Cwé rexhe", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Tot", 1056, 16, 45, 60, 12
+ RADIOBUTTON "Tch&wezî", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&Pådjes", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "I Va", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rinoncî", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Apon&tiaedje", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Di:", 1090, 60, 80, 30, 9
+ LTEXT "&A:", 1091, 120, 80, 30, 9
+ LTEXT "&Cwalité po rexhe:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Rexhe sol &fitchî", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Streu scrijhas", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Apontiaedje del rexhe"
+FONT 8, "Helv"
+{
+ GROUPBOX "Sicrirece", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "Sicrirece tchwezi por &vos", 1056, 16, 20, 80, 12
+ LTEXT "[nole]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Sicrirece &specifike", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "I Va", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rinoncî", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&pontiaaedje", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "D' &Astampé", 1058, 50, 100, 40, 12
+ RADIOBUTTON "Di &Coûtchî", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papî", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Grandeu", 1089, 130, 95, 30, 9
+ LTEXT "Ali&mentåcion", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Fontes"
+FONT 8, "Helv"
+{
+    LTEXT           "&Fonte:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "S&tîle del fonte:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Grandeu:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "I Va",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Rinoncî",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Mete èn Oûve", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Aide" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Efets",1072,6,72,84,34,WS_GROUP
+    CHECKBOX        "&Barré", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Sorligné", 1041, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Coleur:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Egzimpe",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZzÅåÇçÛû",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Coleurs"
+FONT 8, "Helv"
+{
+ LTEXT "&Maisse coleurs:",   1088, 4,    4,  140, 10
+ LTEXT "&Coleurs da vosse:",  1089, 4,   106, 140, 10
+ LTEXT "Coleur | &Uni",  1090, 150, 151,  48, 10
+ LTEXT   "&Rodje:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Vert:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Bleu:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Tinte:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "I Va",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rinoncî", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", 1038,100,166, 44, 14
+ PUSHBUTTON "Rad&jouter des coleur da vosse", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP 
+ PUSHBUTTON "&Defini les coleurs da vosse >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&u",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Cwerî"
+FONT 8, "Helv"
+{
+ LTEXT "C&werî:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Mots &etîrs seulmint", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Rispecter les &madjuscules/minuscules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direccion", 1072, 107, 26, 68, 28
+ CONTROL "&Copete", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Bas", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Shûvant",   IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Rinoncî",IDCANCEL   , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", pshHelp     , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Mete el plaece"
+FONT 8, "Helv"
+{
+ LTEXT "C&werî:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Mete el &place:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Mots &etîrs seulmint", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Rispecter les &madjuscules/minuscules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "&Shûvant",   IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&Rimplacer", psh1   , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rimplacer &tot",psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Rinoncî",IDCANCEL   , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Aide", pshHelp     , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
Index: trunk/src/comdlg32/cdlg_Wa.rc
===================================================================
--- trunk/src/comdlg32/cdlg_Wa.rc	(revision 3028)
+++ 	(revision )
@@ -1,202 +1,0 @@
-LANGUAGE LANG_WALON, SUBLANG_DEFAULT
-
-/* 
- * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
- * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
- */
-
-OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Drovî"
-FONT 8, "Helv"
-{
- LTEXT "&No do fitchî:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Ridants", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Djîveye des fitchîs del sôr&te:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Plakes:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "I Va", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rinoncî", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Rén ki &lere", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Schaper èt rlomer..."
-FONT 8, "Helv"
-{
- LTEXT "&No do fitchî:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
- LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Ridants:", -1, 110, 6, 92, 9
- LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
- LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Djîveye des fitchîs del sôr&te:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Plakes:", 1091, 110, 104, 92, 9
- COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "I Va", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rinoncî", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Rén ki &lere", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rexhe"
-FONT 8, "Helv"
-{
- LTEXT "Sicrirece:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Cwé rexhe", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Tot", 1056, 16, 45, 60, 12
- RADIOBUTTON "Tch&wezî", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Pådjes", 1058, 16, 75, 60, 12
- DEFPUSHBUTTON "I Va", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rinoncî", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Apon&tiaedje", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "&Di:", 1090, 60, 80, 30, 9
- LTEXT "&A:", 1091, 120, 80, 30, 9
- LTEXT "&Cwalité po rexhe:", 1092, 6, 100, 76, 9
- COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Rexhe sol &fitchî", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Streu scrijhas", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-}
-
-
-PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Apontiaedje del rexhe"
-FONT 8, "Helv"
-{
- GROUPBOX "Sicrirece", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "Sicrirece tchwezi por &vos", 1056, 16, 20, 80, 12
- LTEXT "[nole]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Sicrirece &specifike", 1057, 16, 50, 80, 12
- COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "I Va", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rinoncî", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "A&pontiaaedje", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "D' &Astampé", 1058, 50, 100, 40, 12
- RADIOBUTTON "Di &Coûtchî", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Papî", 1074, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "&Grandeu", 1089, 130, 95, 30, 9
- LTEXT "Ali&mentåcion", 1090, 130, 110, 30, 9
- COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
-}
-
-
-CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Fontes"
-FONT 8, "Helv"
-{
-    LTEXT           "&Fonte:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "S&tîle del fonte:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Grandeu:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
-                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "I Va",IDOK,218,6,40,14,WS_GROUP
-    PUSHBUTTON      "Rinoncî",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Mete èn Oûve", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Aide" , 1038,218,57,40,14,WS_GROUP
-    GROUPBOX        "Efets",1072,6,72,84,34,WS_GROUP
-    CHECKBOX        "&Barré", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX        "&Sorligné", 1041, 10,94,50,10, BS_AUTOCHECKBOX
-    LTEXT           "&Coleur:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
-                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Egzimpe",1073,98,72,160,49,WS_GROUP
-    CTEXT           "AaBbYyZzÅåÇçÛû",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 200
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Coleurs"
-FONT 8, "Helv"
-{
- LTEXT "&Maisse coleurs:",   1088, 4,    4,  140, 10
- LTEXT "&Coleurs da vosse:",  1089, 4,   106, 140, 10
- LTEXT "Coleur | &Uni",  1090, 150, 151,  48, 10
- LTEXT   "&Rodje:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Vert:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Bleu:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Tinte:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
- CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
- CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
- CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "I Va",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rinoncî", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", 1038,100,166, 44, 14
- PUSHBUTTON "Rad&jouter des coleur da vosse", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP 
- PUSHBUTTON "&Defini les coleurs da vosse >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&u",713,300,200,4,14   /* just a dummy:  'i' is  like  &i in "sol&id" */
-}
-
-
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cwerî"
-FONT 8, "Helv"
-{
- LTEXT "C&werî:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Mots &etîrs seulmint", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Rispecter les &madjuscules/minuscules", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direccion", 1072, 107, 26, 68, 28
- CONTROL "&Copete", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Bas", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-
- DEFPUSHBUTTON "&Shûvant",   IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Rinoncî",IDCANCEL   , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", pshHelp     , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Mete el plaece"
-FONT 8, "Helv"
-{
- LTEXT "C&werî:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "Mete el &place:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Mots &etîrs seulmint", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Rispecter les &madjuscules/minuscules", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
-
- DEFPUSHBUTTON "&Shûvant",   IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "&Rimplacer", psh1   , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rimplacer &tot",psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Rinoncî",IDCANCEL   , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Aide", pshHelp     , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
-}
-
-
Index: trunk/src/comdlg32/cdlg_xx.orc
===================================================================
--- trunk/src/comdlg32/cdlg_xx.orc	(revision 3031)
+++ trunk/src/comdlg32/cdlg_xx.orc	(revision 3031)
@@ -0,0 +1,318 @@
+/*
+ * Language neutral resources for Common Dialogs
+ */
+
+#include "winver.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+1 VERSIONINFO
+FILEVERSION	4, 0, 0, 950	/* Maybe 4.1.0.980 for win98?? */
+PRODUCTVERSION	4, 0, 0, 950	/* id. */
+FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
+FILEOS		VOS_DOS_WINDOWS16
+FILETYPE	VFT_DLL
+{
+	BLOCK "StringFileInfo"
+	{
+		BLOCK "040604B0"
+		{
+			VALUE "CompanyName", "Wine Developer Team\000"
+			VALUE "FileDescription", "Common Dialog Boxes\000"
+			VALUE "FileVersion", "4.00\000"
+			VALUE "InternalName", "COMDLG32\000"
+			VALUE "LegalCopyright", "Copyright \251 B. A. Stultiens 1998,1999\000"
+			VALUE "OriginalFilename", "COMDLG32.DLL\000"
+			VALUE "ProductName", "Wine\000"
+			VALUE "ProductVersion", "4.00\000"
+		}
+	}
+
+	/* Do we need this? It isn't a translation, but we have all languages at once... */
+/*
+	BLOCK "VarFileInfo"
+	{
+		VALUE "Translation", 1030, 1200
+	}
+*/
+}
+
+/* BINRES pd32_collate.ico */
+PD32_COLLATE ICON DISCARDABLE LOADONCALL
+{
+ '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02'
+ '00 00 26 00 00 00 4C 18 10 00 00 00 00 00 48 05'
+ '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00'
+ '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF 28 00'
+ '00 00 4C 00 00 00 30 00 00 00 01 00 04 00 00 00'
+ '00 00 E0 04 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 04 00 00'
+ '00 00 00 0F F0 00 00 00 00 00 0F F0 00 00 00 00'
+ '00 00 00 00 00 0F F0 00 00 00 00 00 0F F0 00 00'
+ '00 00 00 00 80 04 00 00 00 00 00 0F FF F0 00 00'
+ '00 0F FF F0 00 00 00 00 00 00 00 00 00 0F FF F0'
+ '00 00 00 0F FF F0 00 00 00 00 00 00 80 04 00 00'
+ '00 00 00 FF FF FF FF 00 00 00 00 F0 00 00 00 00'
+ '00 00 00 00 00 FF FF FF FF 00 00 00 00 F0 00 00'
+ '00 00 00 00 44 03 00 00 00 00 00 FF FF FF FF FF'
+ '00 FF F0 FF 00 00 00 00 00 00 00 00 00 FF FF FF'
+ 'FF FF 00 FF F0 FF 00 00 00 00 00 00 80 04 00 00'
+ '00 00 0F FF FF FF FF FF FF 00 F0 FF 00 00 00 00'
+ '00 00 00 00 0F FF FF FF FF FF FF 00 F0 FF 00 00'
+ '00 00 00 00 04 00 00 00 00 00 0F FF FF FF FF FF'
+ 'FF 0F F0 FF F0 00 00 00 00 00 00 00 0F FF FF FF'
+ 'FF FF FF 0F F0 FF F0 00 00 00 00 00 62 01 00 00'
+ '00 00 0F FF FF FF FF FF FF 0F F0 FF F0 00 00 00'
+ '00 00 00 00 0F FF FF FF FF FF FF 0F F0 FF F0 00'
+ '00 00 00 00 E2 00 00 00 00 00 FF FF FF FF FF FF'
+ 'F0 FF F0 FF F0 00 00 00 00 00 00 00 FF FF FF FF'
+ 'FF FF F0 FF F0 FF F0 00 00 00 00 00 00 A0 00 00'
+ '00 00 FF FF FF FF FF FF F0 FF F0 FF FF 00 00 00'
+ '00 00 00 00 FF FF FF FF FF FF F0 FF F0 FF FF 00'
+ '00 00 00 00 FF FF 00 00 00 0F FF FF FF FF FF FF'
+ '0F FF F0 FF FF 00 00 00 00 00 00 0F FF FF FF FF'
+ 'FF FF 0F FF F0 FF FF 00 00 00 00 00 FF FF 00 00'
+ '00 0F FF FF FF FF FF FF 0F FF F0 FF FF 00 00 00'
+ '00 00 00 0F FF FF FF FF FF FF 0F FF F0 FF FF 00'
+ '00 00 00 00 FF FF 00 00 00 0F FF FF FF FF FF FF'
+ '0F FF F0 F0 0F F0 00 00 00 00 00 0F FF FF FF FF'
+ 'FF FF 0F FF F0 F0 0F F0 00 00 00 00 FF FF 00 00'
+ '00 FF FF FF FF FF FF F0 FF FF F0 0F F0 F0 00 00'
+ '00 00 00 FF FF FF FF FF FF F0 FF FF F0 0F F0 F0'
+ '00 00 00 00 FF FF 00 00 00 FF FF FF FF FF FF F0'
+ 'FF FF F0 FF F0 FF 00 00 00 00 00 FF FF FF FF FF'
+ 'FF F0 FF FF F0 FF F0 FF 00 00 00 00 FF FF 00 00'
+ '00 FF FF FF FF FF 0F F0 FF FF F0 FF 00 0F 00 00'
+ '00 00 00 FF FF FF FF FF 0F F0 FF FF F0 FF 00 0F'
+ '00 00 00 00 FF FF 00 00 0F FF FF FF FF FF 0F 0F'
+ '00 00 F0 FF FF 0F 00 00 00 00 0F FF FF FF FF FF'
+ '0F 0F 00 00 F0 FF FF 0F 00 00 00 00 FF FF 00 00'
+ '0F FF FF FF FF F0 FF 0F F0 FF F0 FF 00 FF F0 00'
+ '00 00 0F FF FF FF FF F0 FF 0F F0 FF F0 FF 00 FF'
+ 'F0 00 00 00 FF FF 00 00 00 0F FF FF F0 F0 F0 FF'
+ 'FF 0F F0 FF F0 00 00 00 00 00 00 0F FF FF F0 F0'
+ 'F0 FF FF 0F F0 FF F0 00 00 00 00 00 FF FF 00 00'
+ '00 00 00 FF FF 00 F0 FF 0F F0 F0 F0 00 00 00 00'
+ '00 00 00 00 00 FF FF 00 F0 FF 0F F0 F0 F0 00 00'
+ '00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 0F FF'
+ '0F F0 F0 00 00 00 00 00 00 00 00 00 00 00 FF FF'
+ '0F FF 0F F0 F0 00 00 00 00 00 00 00 FF FF 00 00'
+ '00 00 00 00 00 0F 0F FF F0 0F F0 00 00 00 00 00'
+ '00 00 00 00 00 00 00 0F 0F FF F0 0F F0 00 00 00'
+ '00 00 00 00 FF FF 00 00 00 00 00 00 0F F0 FF FF'
+ 'FF FF F0 00 00 00 00 00 00 00 00 00 00 00 0F F0'
+ 'FF FF FF FF F0 00 00 00 00 00 00 00 FF FF 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 A0 FF C7 FF 9F FF FC 7F F9 FF F0'
+ '00 00 FF C0 FC 0F FF FC 0F C0 FF F0 00 00 FF C0'
+ '30 0F FF FC 03 00 FF F0 00 00 FF 80 00 0F FF F8'
+ '00 00 FF F0 00 00 FF 80 00 07 FF F8 00 00 7F F0'
+ '00 00 FF 00 00 03 FF F0 00 00 3F F0 00 00 FF 00'
+ '00 03 FF F0 00 00 3F F0 00 00 FF 00 00 03 FF F0'
+ '00 00 3F F0 00 00 FE 00 00 03 FF E0 00 00 3F F0'
+ '00 00 FE 00 00 01 FF E0 00 00 1F F0 00 00 FC 00'
+ '00 01 FF C0 00 00 1F F0 00 00 FC 00 00 00 FF C0'
+ '00 00 0F F0 00 00 FC 00 00 00 FF C0 00 00 0F F0'
+ '00 00 F8 00 00 00 FF 80 00 00 0F F0 00 00 F8 00'
+ '00 00 7F 80 00 00 07 F0 00 00 F8 00 00 00 7F 80'
+ '00 00 07 F0 00 00 F0 00 00 00 7F 00 00 00 07 F0'
+ '00 00 F0 00 00 00 3F 00 00 00 03 F0 00 00 F8 00'
+ '00 00 7F 80 00 00 07 F0 00 00 FF 00 00 07 FF F0'
+ '00 00 7F F0 00 00 FF C0 00 1F FF FC 00 01 FF F0'
+ '00 00 FF F0 00 3F FF FF 00 03 FF F0 00 00 FF F0'
+ '00 3F FF FF 00 03 FF F0 00 00 FF F0 00 3F FF FF'
+ '00 03 FF F0 00 00'
+}
+
+
+
+/* BINRES pd32_nocollate.ico */
+PD32_NOCOLLATE ICON 
+{
+ '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02'
+ '00 00 26 00 00 00 4C 18 10 00 00 00 00 00 48 05'
+ '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00'
+ '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
+ '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
+ '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
+ '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF 28 00'
+ '00 00 4C 00 00 00 30 00 00 00 01 00 04 00 00 00'
+ '00 00 E0 04 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
+ '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
+ '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
+ '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
+ '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 FA 02 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 AD 81 00 FF FF FF FF FF FF 00 00 00'
+ '00 00 00 00 FF FF FF FF FF FF 00 00 00 00 00 00'
+ '00 FF FF FF FF FF FF 00 00 00 00 00 13 00 00 FF'
+ 'FF FF FF FF FF 00 00 00 00 00 00 00 FF FF FF FF'
+ 'FF FF 00 00 00 00 00 00 00 FF FF FF FF FF FF 00'
+ '00 00 00 00 32 04 00 FF FF FF FF FF FF 00 00 00'
+ '00 00 00 00 FF FF FF FF FF FF 0F 00 00 00 00 00'
+ '00 FF FF FF FF FF FF 0F 00 00 00 00 02 00 00 FF'
+ 'FF FF FF FF FF 0F 00 00 00 00 00 00 FF FF FF FF'
+ 'FF FF 0F 00 00 00 00 00 00 FF FF FF FF FF FF 0F'
+ '00 00 00 00 56 01 00 FF FF FF FF FF FF 0F F0 00'
+ '00 00 00 00 FF FF FF FF FF FF 0F F0 00 00 00 00'
+ '00 FF FF FF FF FF FF 0F F0 00 00 00 4D 04 00 FF'
+ 'FF FF FF FF FF 0F F0 00 00 00 00 00 FF FF FF FF'
+ 'FF FF 0F F0 00 00 00 00 00 FF FF FF FF FF FF 0F'
+ 'F0 00 00 00 02 00 00 FF FF FF FF FF FF 0F FF 00'
+ '00 00 00 00 FF FF FF FF FF FF 0F FF 00 00 00 00'
+ '00 FF FF FF FF FF FF 0F FF 00 00 00 62 01 00 FF'
+ 'FF FF FF FF FF 0F FF 00 00 00 00 00 FF FF FF FF'
+ 'FF FF 0F FF 00 00 00 00 00 FF FF FF FF FF FF 0F'
+ 'FF 00 00 00 4D 04 00 FF FF FF FF FF FF 0F FF F0'
+ '00 00 00 00 FF FF FF FF FF FF 0F FF F0 00 00 00'
+ '00 FF FF FF FF FF FF 0F FF F0 00 00 02 00 00 FF'
+ 'FF FF FF FF FF 0F FF F0 00 00 00 00 FF FF FF FF'
+ 'FF FF 0F FF 00 00 00 00 00 FF FF FF FF FF FF 0F'
+ 'FF F0 00 00 62 01 00 FF FF FF FF FF FF 0F F0 FF'
+ '00 00 00 00 FF FF FF FF FF FF 0F 00 0F 00 00 00'
+ '00 FF FF FF FF FF FF 0F 00 FF 00 00 00 00 00 FF'
+ 'FF FF FF FF FF 0F F0 FF 00 00 00 00 FF FF FF FF'
+ 'FF FF 00 0F FF 00 00 00 00 FF FF FF FF FF FF 00'
+ 'FF 0F 00 00 02 00 00 FF FF FF FF F0 FF 0F FF 0F'
+ 'F0 00 00 00 FF FF FF F0 00 0F 0F 00 0F F0 00 00'
+ '00 FF FF FF FF 00 FF 0F F0 0F F0 00 62 01 00 FF'
+ 'FF FF FF F0 FF 0F FF F0 FF 00 00 00 FF FF FF F0'
+ 'FF FF 0F FF F0 F0 00 00 00 FF FF FF F0 FF 0F 0F'
+ '0F 0F F0 00 00 00 00 FF FF FF FF F0 FF 0F FF 00'
+ 'FF 00 00 00 FF FF FF FF 0F FF 0F FF F0 FF 00 00'
+ '00 FF FF FF FF FF 0F 0F FF F0 FF 00 02 00 00 FF'
+ 'FF FF FF F0 FF 0F FF FF 00 00 00 00 FF FF FF FF'
+ 'F0 FF 0F F0 0F F0 00 00 00 FF FF FF FF F0 FF 0F'
+ 'F0 0F F0 00 C4 00 00 FF FF FF FF F0 FF 0F FF F0'
+ '00 00 00 00 FF FF FF F0 FF 0F 0F FF FF 00 00 00'
+ '00 FF FF FF F0 FF 0F 0F FF FF 00 00 32 04 00 FF'
+ 'FF FF FF 00 FF 0F FF 00 00 00 00 00 FF FF FF FF'
+ '00 FF 0F FF 00 00 00 00 00 FF FF FF FF 00 FF 0F'
+ 'FF 00 00 00 02 00 00 FF FF FF FF FF FF 0F 00 00'
+ '00 00 00 00 FF FF FF FF FF FF 0F 00 00 00 00 00'
+ '00 FF FF FF FF FF FF 0F 00 00 00 00 FF 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 0F F0 00 00 00'
+ '00 00 00 00 00 00 00 00 0F F0 00 00 00 00 00 00'
+ '00 00 00 00 00 0F F0 00 00 00 00 00 AD 81 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 FF 07 FF F3 FF FF FC FF FF FF 3F F0'
+ '0F FF 80 01 FF E0 00 7F F8 00 1F F0 00 00 80 01'
+ 'FF E0 00 3F F8 00 0F FF FF FF 80 00 FF E0 00 3F'
+ 'F8 00 0F F0 00 00 80 00 FF E0 00 1F F8 00 07 FF'
+ 'F0 FF 80 00 7F E0 00 1F F8 00 07 F0 00 00 80 00'
+ '3F E0 00 0F F8 00 03 FF F0 00 80 00 3F E0 00 0F'
+ 'F8 00 03 FF FF FF 80 00 1F E0 00 07 F8 00 01 F0'
+ 'E2 00 80 00 1F E0 00 07 F8 00 01 FF F0 FF 80 00'
+ '0F E0 00 03 F8 00 00 F0 FF FF 80 00 0F E0 00 03'
+ 'F8 00 00 F0 00 00 80 00 07 E0 00 01 F8 00 00 7F'
+ 'FF FF 80 00 07 E0 00 01 F8 00 00 70 00 00 80 00'
+ '03 E0 00 00 F8 00 00 3F F0 FF 80 00 01 E0 00 00'
+ 'F8 00 00 30 00 0F 80 00 01 E0 00 00 78 00 00 1F'
+ 'FF 00 80 00 03 E0 00 00 78 00 00 1F FF FF 80 00'
+ '0F E0 00 01 F8 00 00 70 FF FF 80 00 1F E0 00 03'
+ 'F8 00 00 FF 0F FF 80 00 3F E0 00 0F F8 00 03 FF'
+ 'FF FF 80 00 FF E0 00 3F F8 00 0F F0 00 00 FF C3'
+ 'FF FF F0 FF FF FC 3F FF FF FF FF E7 FF FF F9 FF'
+ 'FF FE 7F F0 00 00'
+}
Index: trunk/src/comdlg32/cdlg_xx.rc
===================================================================
--- trunk/src/comdlg32/cdlg_xx.rc	(revision 3028)
+++ 	(revision )
@@ -1,318 +1,0 @@
-/*
- * Language neutral resources for Common Dialogs
- */
-
-#include "winver.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-1 VERSIONINFO
-FILEVERSION	4, 0, 0, 950	/* Maybe 4.1.0.980 for win98?? */
-PRODUCTVERSION	4, 0, 0, 950	/* id. */
-FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-FILEOS		VOS_DOS_WINDOWS16
-FILETYPE	VFT_DLL
-{
-	BLOCK "StringFileInfo"
-	{
-		BLOCK "040604B0"
-		{
-			VALUE "CompanyName", "Wine Developer Team\000"
-			VALUE "FileDescription", "Common Dialog Boxes\000"
-			VALUE "FileVersion", "4.00\000"
-			VALUE "InternalName", "COMDLG32\000"
-			VALUE "LegalCopyright", "Copyright \251 B. A. Stultiens 1998,1999\000"
-			VALUE "OriginalFilename", "COMDLG32.DLL\000"
-			VALUE "ProductName", "Wine\000"
-			VALUE "ProductVersion", "4.00\000"
-		}
-	}
-
-	/* Do we need this? It isn't a translation, but we have all languages at once... */
-/*
-	BLOCK "VarFileInfo"
-	{
-		VALUE "Translation", 1030, 1200
-	}
-*/
-}
-
-/* BINRES pd32_collate.ico */
-PD32_COLLATE ICON DISCARDABLE LOADONCALL
-{
- '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02'
- '00 00 26 00 00 00 4C 18 10 00 00 00 00 00 48 05'
- '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00'
- '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
- '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF 28 00'
- '00 00 4C 00 00 00 30 00 00 00 01 00 04 00 00 00'
- '00 00 E0 04 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
- '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 80 04 00 00'
- '00 00 00 0F F0 00 00 00 00 00 0F F0 00 00 00 00'
- '00 00 00 00 00 0F F0 00 00 00 00 00 0F F0 00 00'
- '00 00 00 00 80 04 00 00 00 00 00 0F FF F0 00 00'
- '00 0F FF F0 00 00 00 00 00 00 00 00 00 0F FF F0'
- '00 00 00 0F FF F0 00 00 00 00 00 00 80 04 00 00'
- '00 00 00 FF FF FF FF 00 00 00 00 F0 00 00 00 00'
- '00 00 00 00 00 FF FF FF FF 00 00 00 00 F0 00 00'
- '00 00 00 00 44 03 00 00 00 00 00 FF FF FF FF FF'
- '00 FF F0 FF 00 00 00 00 00 00 00 00 00 FF FF FF'
- 'FF FF 00 FF F0 FF 00 00 00 00 00 00 80 04 00 00'
- '00 00 0F FF FF FF FF FF FF 00 F0 FF 00 00 00 00'
- '00 00 00 00 0F FF FF FF FF FF FF 00 F0 FF 00 00'
- '00 00 00 00 04 00 00 00 00 00 0F FF FF FF FF FF'
- 'FF 0F F0 FF F0 00 00 00 00 00 00 00 0F FF FF FF'
- 'FF FF FF 0F F0 FF F0 00 00 00 00 00 62 01 00 00'
- '00 00 0F FF FF FF FF FF FF 0F F0 FF F0 00 00 00'
- '00 00 00 00 0F FF FF FF FF FF FF 0F F0 FF F0 00'
- '00 00 00 00 E2 00 00 00 00 00 FF FF FF FF FF FF'
- 'F0 FF F0 FF F0 00 00 00 00 00 00 00 FF FF FF FF'
- 'FF FF F0 FF F0 FF F0 00 00 00 00 00 00 A0 00 00'
- '00 00 FF FF FF FF FF FF F0 FF F0 FF FF 00 00 00'
- '00 00 00 00 FF FF FF FF FF FF F0 FF F0 FF FF 00'
- '00 00 00 00 FF FF 00 00 00 0F FF FF FF FF FF FF'
- '0F FF F0 FF FF 00 00 00 00 00 00 0F FF FF FF FF'
- 'FF FF 0F FF F0 FF FF 00 00 00 00 00 FF FF 00 00'
- '00 0F FF FF FF FF FF FF 0F FF F0 FF FF 00 00 00'
- '00 00 00 0F FF FF FF FF FF FF 0F FF F0 FF FF 00'
- '00 00 00 00 FF FF 00 00 00 0F FF FF FF FF FF FF'
- '0F FF F0 F0 0F F0 00 00 00 00 00 0F FF FF FF FF'
- 'FF FF 0F FF F0 F0 0F F0 00 00 00 00 FF FF 00 00'
- '00 FF FF FF FF FF FF F0 FF FF F0 0F F0 F0 00 00'
- '00 00 00 FF FF FF FF FF FF F0 FF FF F0 0F F0 F0'
- '00 00 00 00 FF FF 00 00 00 FF FF FF FF FF FF F0'
- 'FF FF F0 FF F0 FF 00 00 00 00 00 FF FF FF FF FF'
- 'FF F0 FF FF F0 FF F0 FF 00 00 00 00 FF FF 00 00'
- '00 FF FF FF FF FF 0F F0 FF FF F0 FF 00 0F 00 00'
- '00 00 00 FF FF FF FF FF 0F F0 FF FF F0 FF 00 0F'
- '00 00 00 00 FF FF 00 00 0F FF FF FF FF FF 0F 0F'
- '00 00 F0 FF FF 0F 00 00 00 00 0F FF FF FF FF FF'
- '0F 0F 00 00 F0 FF FF 0F 00 00 00 00 FF FF 00 00'
- '0F FF FF FF FF F0 FF 0F F0 FF F0 FF 00 FF F0 00'
- '00 00 0F FF FF FF FF F0 FF 0F F0 FF F0 FF 00 FF'
- 'F0 00 00 00 FF FF 00 00 00 0F FF FF F0 F0 F0 FF'
- 'FF 0F F0 FF F0 00 00 00 00 00 00 0F FF FF F0 F0'
- 'F0 FF FF 0F F0 FF F0 00 00 00 00 00 FF FF 00 00'
- '00 00 00 FF FF 00 F0 FF 0F F0 F0 F0 00 00 00 00'
- '00 00 00 00 00 FF FF 00 F0 FF 0F F0 F0 F0 00 00'
- '00 00 00 00 FF FF 00 00 00 00 00 00 FF FF 0F FF'
- '0F F0 F0 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- '0F FF 0F F0 F0 00 00 00 00 00 00 00 FF FF 00 00'
- '00 00 00 00 00 0F 0F FF F0 0F F0 00 00 00 00 00'
- '00 00 00 00 00 00 00 0F 0F FF F0 0F F0 00 00 00'
- '00 00 00 00 FF FF 00 00 00 00 00 00 0F F0 FF FF'
- 'FF FF F0 00 00 00 00 00 00 00 00 00 00 00 0F F0'
- 'FF FF FF FF F0 00 00 00 00 00 00 00 FF FF 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 A0 FF C7 FF 9F FF FC 7F F9 FF F0'
- '00 00 FF C0 FC 0F FF FC 0F C0 FF F0 00 00 FF C0'
- '30 0F FF FC 03 00 FF F0 00 00 FF 80 00 0F FF F8'
- '00 00 FF F0 00 00 FF 80 00 07 FF F8 00 00 7F F0'
- '00 00 FF 00 00 03 FF F0 00 00 3F F0 00 00 FF 00'
- '00 03 FF F0 00 00 3F F0 00 00 FF 00 00 03 FF F0'
- '00 00 3F F0 00 00 FE 00 00 03 FF E0 00 00 3F F0'
- '00 00 FE 00 00 01 FF E0 00 00 1F F0 00 00 FC 00'
- '00 01 FF C0 00 00 1F F0 00 00 FC 00 00 00 FF C0'
- '00 00 0F F0 00 00 FC 00 00 00 FF C0 00 00 0F F0'
- '00 00 F8 00 00 00 FF 80 00 00 0F F0 00 00 F8 00'
- '00 00 7F 80 00 00 07 F0 00 00 F8 00 00 00 7F 80'
- '00 00 07 F0 00 00 F0 00 00 00 7F 00 00 00 07 F0'
- '00 00 F0 00 00 00 3F 00 00 00 03 F0 00 00 F8 00'
- '00 00 7F 80 00 00 07 F0 00 00 FF 00 00 07 FF F0'
- '00 00 7F F0 00 00 FF C0 00 1F FF FC 00 01 FF F0'
- '00 00 FF F0 00 3F FF FF 00 03 FF F0 00 00 FF F0'
- '00 3F FF FF 00 03 FF F0 00 00 FF F0 00 3F FF FF'
- '00 03 FF F0 00 00'
-}
-
-
-
-/* BINRES pd32_nocollate.ico */
-PD32_NOCOLLATE ICON 
-{
- '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02'
- '00 00 26 00 00 00 4C 18 10 00 00 00 00 00 48 05'
- '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00'
- '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
- '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF 28 00'
- '00 00 4C 00 00 00 30 00 00 00 01 00 04 00 00 00'
- '00 00 E0 04 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
- '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 FA 02 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 AD 81 00 FF FF FF FF FF FF 00 00 00'
- '00 00 00 00 FF FF FF FF FF FF 00 00 00 00 00 00'
- '00 FF FF FF FF FF FF 00 00 00 00 00 13 00 00 FF'
- 'FF FF FF FF FF 00 00 00 00 00 00 00 FF FF FF FF'
- 'FF FF 00 00 00 00 00 00 00 FF FF FF FF FF FF 00'
- '00 00 00 00 32 04 00 FF FF FF FF FF FF 00 00 00'
- '00 00 00 00 FF FF FF FF FF FF 0F 00 00 00 00 00'
- '00 FF FF FF FF FF FF 0F 00 00 00 00 02 00 00 FF'
- 'FF FF FF FF FF 0F 00 00 00 00 00 00 FF FF FF FF'
- 'FF FF 0F 00 00 00 00 00 00 FF FF FF FF FF FF 0F'
- '00 00 00 00 56 01 00 FF FF FF FF FF FF 0F F0 00'
- '00 00 00 00 FF FF FF FF FF FF 0F F0 00 00 00 00'
- '00 FF FF FF FF FF FF 0F F0 00 00 00 4D 04 00 FF'
- 'FF FF FF FF FF 0F F0 00 00 00 00 00 FF FF FF FF'
- 'FF FF 0F F0 00 00 00 00 00 FF FF FF FF FF FF 0F'
- 'F0 00 00 00 02 00 00 FF FF FF FF FF FF 0F FF 00'
- '00 00 00 00 FF FF FF FF FF FF 0F FF 00 00 00 00'
- '00 FF FF FF FF FF FF 0F FF 00 00 00 62 01 00 FF'
- 'FF FF FF FF FF 0F FF 00 00 00 00 00 FF FF FF FF'
- 'FF FF 0F FF 00 00 00 00 00 FF FF FF FF FF FF 0F'
- 'FF 00 00 00 4D 04 00 FF FF FF FF FF FF 0F FF F0'
- '00 00 00 00 FF FF FF FF FF FF 0F FF F0 00 00 00'
- '00 FF FF FF FF FF FF 0F FF F0 00 00 02 00 00 FF'
- 'FF FF FF FF FF 0F FF F0 00 00 00 00 FF FF FF FF'
- 'FF FF 0F FF 00 00 00 00 00 FF FF FF FF FF FF 0F'
- 'FF F0 00 00 62 01 00 FF FF FF FF FF FF 0F F0 FF'
- '00 00 00 00 FF FF FF FF FF FF 0F 00 0F 00 00 00'
- '00 FF FF FF FF FF FF 0F 00 FF 00 00 00 00 00 FF'
- 'FF FF FF FF FF 0F F0 FF 00 00 00 00 FF FF FF FF'
- 'FF FF 00 0F FF 00 00 00 00 FF FF FF FF FF FF 00'
- 'FF 0F 00 00 02 00 00 FF FF FF FF F0 FF 0F FF 0F'
- 'F0 00 00 00 FF FF FF F0 00 0F 0F 00 0F F0 00 00'
- '00 FF FF FF FF 00 FF 0F F0 0F F0 00 62 01 00 FF'
- 'FF FF FF F0 FF 0F FF F0 FF 00 00 00 FF FF FF F0'
- 'FF FF 0F FF F0 F0 00 00 00 FF FF FF F0 FF 0F 0F'
- '0F 0F F0 00 00 00 00 FF FF FF FF F0 FF 0F FF 00'
- 'FF 00 00 00 FF FF FF FF 0F FF 0F FF F0 FF 00 00'
- '00 FF FF FF FF FF 0F 0F FF F0 FF 00 02 00 00 FF'
- 'FF FF FF F0 FF 0F FF FF 00 00 00 00 FF FF FF FF'
- 'F0 FF 0F F0 0F F0 00 00 00 FF FF FF FF F0 FF 0F'
- 'F0 0F F0 00 C4 00 00 FF FF FF FF F0 FF 0F FF F0'
- '00 00 00 00 FF FF FF F0 FF 0F 0F FF FF 00 00 00'
- '00 FF FF FF F0 FF 0F 0F FF FF 00 00 32 04 00 FF'
- 'FF FF FF 00 FF 0F FF 00 00 00 00 00 FF FF FF FF'
- '00 FF 0F FF 00 00 00 00 00 FF FF FF FF 00 FF 0F'
- 'FF 00 00 00 02 00 00 FF FF FF FF FF FF 0F 00 00'
- '00 00 00 00 FF FF FF FF FF FF 0F 00 00 00 00 00'
- '00 FF FF FF FF FF FF 0F 00 00 00 00 FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 0F F0 00 00 00'
- '00 00 00 00 00 00 00 00 0F F0 00 00 00 00 00 00'
- '00 00 00 00 00 0F F0 00 00 00 00 00 AD 81 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 FF 07 FF F3 FF FF FC FF FF FF 3F F0'
- '0F FF 80 01 FF E0 00 7F F8 00 1F F0 00 00 80 01'
- 'FF E0 00 3F F8 00 0F FF FF FF 80 00 FF E0 00 3F'
- 'F8 00 0F F0 00 00 80 00 FF E0 00 1F F8 00 07 FF'
- 'F0 FF 80 00 7F E0 00 1F F8 00 07 F0 00 00 80 00'
- '3F E0 00 0F F8 00 03 FF F0 00 80 00 3F E0 00 0F'
- 'F8 00 03 FF FF FF 80 00 1F E0 00 07 F8 00 01 F0'
- 'E2 00 80 00 1F E0 00 07 F8 00 01 FF F0 FF 80 00'
- '0F E0 00 03 F8 00 00 F0 FF FF 80 00 0F E0 00 03'
- 'F8 00 00 F0 00 00 80 00 07 E0 00 01 F8 00 00 7F'
- 'FF FF 80 00 07 E0 00 01 F8 00 00 70 00 00 80 00'
- '03 E0 00 00 F8 00 00 3F F0 FF 80 00 01 E0 00 00'
- 'F8 00 00 30 00 0F 80 00 01 E0 00 00 78 00 00 1F'
- 'FF 00 80 00 03 E0 00 00 78 00 00 1F FF FF 80 00'
- '0F E0 00 01 F8 00 00 70 FF FF 80 00 1F E0 00 03'
- 'F8 00 00 FF 0F FF 80 00 3F E0 00 0F F8 00 03 FF'
- 'FF FF 80 00 FF E0 00 3F F8 00 0F F0 00 00 FF C3'
- 'FF FF F0 FF FF FC 3F FF FF FF FF E7 FF FF F9 FF'
- 'FF FE 7F F0 00 00'
-}
Index: trunk/src/comdlg32/makefile
===================================================================
--- trunk/src/comdlg32/makefile	(revision 3028)
+++ trunk/src/comdlg32/makefile	(revision 3031)
@@ -1,65 +1,84 @@
-# $Id: makefile,v 1.15 2000-02-09 23:46:53 bird Exp $
+# $Id: makefile,v 1.16 2000-03-06 23:38:30 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       comdlg32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\comdlg32.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\cdlg32.obj \
+$(OBJDIR)\finddlg32.obj \
+$(OBJDIR)\filedlg95.obj \
+$(OBJDIR)\filedlgbrowser.obj \
+$(OBJDIR)\filetitle.obj \
+$(OBJDIR)\comdlgguid.obj \
+$(OBJDIR)\rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = comdlg32
 
-OBJS =  comdlg32.obj initterm.obj resource.obj cdlg32.obj finddlg32.obj filedlg95.obj \
-        filedlgbrowser.obj filetitle.obj comdlgguid.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shlwapi.lib \
-          $(PDWIN32_LIB)/shell32.lib $(PDWIN32_LIB)/gdi32.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: rsrc.rc
-    $(RC) $(RCFLAGS) -o resource.asm rsrc.rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/shlwapi.lib
+$(PDWIN32_LIB)/shell32.lib
+$(PDWIN32_LIB)/gdi32.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
Index: trunk/src/comdlg32/rsrc.orc
===================================================================
--- trunk/src/comdlg32/rsrc.orc	(revision 3031)
+++ trunk/src/comdlg32/rsrc.orc	(revision 3031)
@@ -0,0 +1,46 @@
+/* $Id: rsrc.orc,v 1.1 2000-03-06 23:38:30 bird Exp $ */
+/*
+ * Top level resource file for Common Dialogs
+ *
+ */
+
+#include "winuser.h"
+#include "winnls.h"
+#include "cdlg.h"
+#include "winspool.h"
+#include "filedlgbrowser.h"
+
+/*
+ * Everything that does not depend on language,
+ * like textless bitmaps etc, go into the
+ * neutral language. This will prevent them from
+ * being duplicated for each language.
+ */
+#include "cdlg_xx.rc"
+
+/*
+ * Everything specific to any language goes
+ * in one of the specific files.
+ * Note that you can and may override resources
+ * which also have a neutral version. This is to
+ * get localized bitmaps for example.
+ */
+//#include "cdlg_Ca.rc"
+//#include "cdlg_Cs.rc"
+//#include "cdlg_Da.rc"
+//#include "cdlg_De.rc"
+#include "cdlg_En.rc"
+//#include "cdlg_Eo.rc"
+//#include "cdlg_Es.rc"
+//#include "cdlg_Fi.rc"
+//#include "cdlg_Fr.rc"
+//#include "cdlg_Hu.rc"
+//#include "cdlg_It.rc"
+//#include "cdlg_Ko.rc"
+//#include "cdlg_Nl.rc"
+//#include "cdlg_No.rc"
+//#include "cdlg_Pl.rc"
+//#include "cdlg_Pt.rc"
+//#include "cdlg_Ru.rc"
+//#include "cdlg_Sv.rc"
+//#include "cdlg_Wa.rc"
Index: trunk/src/comdlg32/rsrc.rc
===================================================================
--- trunk/src/comdlg32/rsrc.rc	(revision 3028)
+++ 	(revision )
@@ -1,46 +1,0 @@
-/* $Id: rsrc.rc,v 1.2 1999-11-28 12:32:28 sandervl Exp $ */
-/*
- * Top level resource file for Common Dialogs
- *
- */
-
-#include "winuser.h"
-#include "winnls.h"
-#include "cdlg.h"
-#include "winspool.h"
-#include "filedlgbrowser.h"
-
-/*
- * Everything that does not depend on language,
- * like textless bitmaps etc, go into the
- * neutral language. This will prevent them from
- * being duplicated for each language.
- */
-#include "cdlg_xx.rc"
-
-/*
- * Everything specific to any language goes
- * in one of the specific files.
- * Note that you can and may override resources
- * which also have a neutral version. This is to
- * get localized bitmaps for example.
- */
-//#include "cdlg_Ca.rc"
-//#include "cdlg_Cs.rc"
-//#include "cdlg_Da.rc"
-//#include "cdlg_De.rc"
-#include "cdlg_En.rc"
-//#include "cdlg_Eo.rc"
-//#include "cdlg_Es.rc"
-//#include "cdlg_Fi.rc"
-//#include "cdlg_Fr.rc"
-//#include "cdlg_Hu.rc"
-//#include "cdlg_It.rc"
-//#include "cdlg_Ko.rc"
-//#include "cdlg_Nl.rc"
-//#include "cdlg_No.rc"
-//#include "cdlg_Pl.rc"
-//#include "cdlg_Pt.rc"
-//#include "cdlg_Ru.rc"
-//#include "cdlg_Sv.rc"
-//#include "cdlg_Wa.rc"
Index: trunk/src/crtdll/crtdll.rc
===================================================================
--- trunk/src/crtdll/crtdll.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: crtdll.rc,v 1.1 2000-02-05 01:55:11 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3 crtdll.dll)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "CRTDLL System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "CRTDLL\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "CRTDLL.DLL\0"
-            VALUE "ProductName", "Odin32 - CRTDLL\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/crtdll/crtdllrsrc.orc
===================================================================
--- trunk/src/crtdll/crtdllrsrc.orc	(revision 3031)
+++ trunk/src/crtdll/crtdllrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: crtdllrsrc.orc,v 1.1 2000-03-06 23:38:31 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3 crtdll.dll)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "CRTDLL System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "CRTDLL\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "CRTDLL.DLL\0"
+            VALUE "ProductName", "Odin32 - CRTDLL\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/crtdll/makefile
===================================================================
--- trunk/src/crtdll/makefile	(revision 3028)
+++ trunk/src/crtdll/makefile	(revision 3031)
@@ -1,65 +1,82 @@
-# $Id: makefile,v 1.9 2000-02-09 23:46:53 bird Exp $
+# $Id: makefile,v 1.10 2000-03-06 23:38:33 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       crtdll.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = crtdllrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\crtdll.obj \
+$(OBJDIR)\asmhlp.obj \
+$(OBJDIR)\stubs.obj \
+$(OBJDIR)\internal.obj \
+$(OBJDIR)\crt_string.obj \
+$(OBJDIR)\crt_memory.obj \
+$(OBJDIR)\crt_mb.obj \
+$(OBJDIR)\crt_wc.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\crtdllrsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = crtdll
 
-OBJS =  crtdll.obj asmhlp.obj stubs.obj internal.obj crt_string.obj \
-        crt_memory.obj crt_mb.obj crt_wc.obj initterm.obj resource.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/user32.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/user32.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
Index: trunk/src/ddraw/ddraw.rc
===================================================================
--- trunk/src/ddraw/ddraw.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: ddraw.rc,v 1.1 2000-02-05 01:55:52 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "DDRAW System dll\0"
-            VALUE "FileVersion", "4.04\0"
-            VALUE "InternalName", "DDRAW\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "DDRAW.DLL\0"
-            VALUE "ProductName", "Odin32 - DDRAW\0"
-            VALUE "ProductVersion", "4.04\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/ddraw/ddrawrsrc.orc
===================================================================
--- trunk/src/ddraw/ddrawrsrc.orc	(revision 3031)
+++ trunk/src/ddraw/ddrawrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: ddrawrsrc.orc,v 1.1 2000-03-06 23:38:34 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "DDRAW System dll\0"
+            VALUE "FileVersion", "4.04\0"
+            VALUE "InternalName", "DDRAW\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "DDRAW.DLL\0"
+            VALUE "ProductName", "Odin32 - DDRAW\0"
+            VALUE "ProductVersion", "4.04\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/ddraw/makefile
===================================================================
--- trunk/src/ddraw/makefile	(revision 3028)
+++ trunk/src/ddraw/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.22 2000-02-09 23:46:54 bird Exp $
+# $Id: makefile,v 1.23 2000-03-06 23:38:34 bird Exp $
 #
 # ddraw.dll makefile
@@ -10,66 +10,87 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-ASFLAGS = -Sc -Sv:ALP
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE);
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE);
+# Flag overloads and local macros.
+CLEANEXTRAS = ddrawrsrc.asm
+ASFLAGS     = -Sc -Sv:ALP
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\ddraw.obj \
+$(OBJDIR)\os2ddraw.obj \
+$(OBJDIR)\os2clipper.obj \
+$(OBJDIR)\os2d3d.obj \
+$(OBJDIR)\iccio1.obj \
+$(OBJDIR)\asmutil.obj \
+$(OBJDIR)\os2surface.obj \
+$(OBJDIR)\os2palette.obj \
+$(OBJDIR)\os2palset.obj \
+$(OBJDIR)\rectangle.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\os2util.obj \
+$(OBJDIR)\bltFunc.obj \
+$(OBJDIR)\fillfunc.obj \
+$(OBJDIR)\colorconv.obj \
+$(OBJDIR)\ddrawrsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = ddraw
 
-OBJS =  ddraw.obj os2ddraw.obj os2clipper.obj os2d3d.obj iccio1.obj asmutil.obj\
-        os2surface.obj os2palette.obj os2palset.obj rectangle.obj initterm.obj \
-        os2util.obj bltFunc.obj fillfunc.obj colorconv.obj resource.obj
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-LIBS =  $(PDWIN32_LIB)\ole32.lib $(PDWIN32_LIB)\advapi32.lib $(PDWIN32_LIB)\gdi32.lib \
-        $(PDWIN32_LIB)\comctl32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)\odincrt.lib \
-        $(PDWIN32_LIB)\user32.lib mmpm2.lib OS2386.LIB $(RTLLIB_O)
-
-all: $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
-    $(CP) $@ $(PDWIN32_BIN)
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/ole32.lib
+$(PDWIN32_LIB)/advapi32.lib
+$(PDWIN32_LIB)/gdi32.lib
+$(PDWIN32_LIB)/comctl32.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/user32.lib
+mmpm2.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/dinput/dinput.rc
===================================================================
--- trunk/src/dinput/dinput.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: dinput.rc,v 1.1 2000-02-05 01:56:37 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "DINPUT System dll\0"
-            VALUE "FileVersion", "4.04\0"
-            VALUE "InternalName", "DINPUT\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "DINPUT.DLL\0"
-            VALUE "ProductName", "Odin32 - DINPUT\0"
-            VALUE "ProductVersion", "4.04\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/dinput/dinputrsrc.orc
===================================================================
--- trunk/src/dinput/dinputrsrc.orc	(revision 3031)
+++ trunk/src/dinput/dinputrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: dinputrsrc.orc,v 1.1 2000-03-06 23:38:35 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "DINPUT System dll\0"
+            VALUE "FileVersion", "4.04\0"
+            VALUE "InternalName", "DINPUT\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "DINPUT.DLL\0"
+            VALUE "ProductName", "Odin32 - DINPUT\0"
+            VALUE "ProductVersion", "4.04\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/dinput/makefile
===================================================================
--- trunk/src/dinput/makefile	(revision 3028)
+++ trunk/src/dinput/makefile	(revision 3031)
@@ -1,68 +1,77 @@
-# $Id: makefile,v 1.5 2000-02-09 23:46:54 bird Exp $
+# $Id: makefile,v 1.6 2000-03-06 23:38:35 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       dplay.dll makefile
+#       dinput.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = dinputrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\dinput.obj \
+$(OBJDIR)\oslibinput.obj \
+$(OBJDIR)\dinputguid.obj \
+$(OBJDIR)\dinputrsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = dinput
 
-OBJS =  dinput.obj oslibinput.obj dinputguid.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/ole32.lib
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/ole32.lib
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib \
-        $(TARGET)exp.def resource.asm
-
Index: trunk/src/dllentry/makefile
===================================================================
--- trunk/src/dllentry/makefile	(revision 3028)
+++ trunk/src/dllentry/makefile	(revision 3031)
@@ -1,41 +1,54 @@
-# $Id: makefile,v 1.3 2000-02-09 23:46:55 bird Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:38:35 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       dllentry library makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = lz32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\dllentry.obj
+
+
+# Target name - name of the obj without extention and path.
 TARGET = dllentry
 
-all: $(PDWIN32_LIB)\$(TARGET).obj
 
-$(PDWIN32_LIB)\$(TARGET).obj: dllentry.obj
-    $(CP) $(TARGET).obj $(PDWIN32_LIB)
+# All rule - build objs and copies obj to lib.
+all: $(OBJDIR) $(PDWIN32_LIB)\$(TARGET).obj
 
-lib: $(PDWIN32_LIB)\$(TARGET).obj
 
+# Lib rule - same as all.
+lib: all
+
+
+# Build objs and copies obj to lib.
+$(PDWIN32_LIB)\$(TARGET).obj: $(OBJS)
+    $(CP) $(OBJS) $(PDWIN32_LIB)
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj $(PDWIN32_LIB)\$(TARGET).obj *.pch
-
Index: trunk/src/dplay/dplay.rc
===================================================================
--- trunk/src/dplay/dplay.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: dplay.rc,v 1.1 2000-02-05 01:57:31 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "DPLAY System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "DPLAY\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "DPLAY.DLL\0"
-            VALUE "ProductName", "Odin32 - DPLAY\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/dplay/dplayrsrc.orc
===================================================================
--- trunk/src/dplay/dplayrsrc.orc	(revision 3031)
+++ trunk/src/dplay/dplayrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: dplayrsrc.orc,v 1.1 2000-03-06 23:38:36 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "DPLAY System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "DPLAY\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "DPLAY.DLL\0"
+            VALUE "ProductName", "Odin32 - DPLAY\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/dplay/makefile
===================================================================
--- trunk/src/dplay/makefile	(revision 3028)
+++ trunk/src/dplay/makefile	(revision 3031)
@@ -1,67 +1,73 @@
-# $Id: makefile,v 1.6 2000-02-09 23:46:55 bird Exp $
+# $Id: makefile,v 1.7 2000-03-06 23:38:36 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       dplay.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = dplayrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\dplay.obj \
+$(OBJDIR)\dplayrsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = dplay
 
-OBJS =  dplay.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
-
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-          $(PDWIN32_LIB)/ole32.lib $(PDWIN32_LIB)/advapi32.lib
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB $(RTLLIB_O)
+$(PDWIN32_LIB)/ole32.lib
+$(PDWIN32_LIB)/advapi32.lib
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/dsound/dsound.rc
===================================================================
--- trunk/src/dsound/dsound.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: dsound.rc,v 1.1 2000-02-05 01:58:50 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "DSOUND System dll\0"
-            VALUE "FileVersion", "4.04\0"
-            VALUE "InternalName", "DSOUND\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "DSOUND.DLL\0"
-            VALUE "ProductName", "Odin32 - DSOUND\0"
-            VALUE "ProductVersion", "4.04\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/dsound/dsoundrsrc.orc
===================================================================
--- trunk/src/dsound/dsoundrsrc.orc	(revision 3031)
+++ trunk/src/dsound/dsoundrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: dsoundrsrc.orc,v 1.1 2000-03-06 23:38:37 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "DSOUND System dll\0"
+            VALUE "FileVersion", "4.04\0"
+            VALUE "InternalName", "DSOUND\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "DSOUND.DLL\0"
+            VALUE "ProductName", "Odin32 - DSOUND\0"
+            VALUE "ProductVersion", "4.04\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/dsound/makefile
===================================================================
--- trunk/src/dsound/makefile	(revision 3028)
+++ trunk/src/dsound/makefile	(revision 3031)
@@ -1,62 +1,77 @@
-# $Id: makefile,v 1.16 2000-02-09 23:46:55 bird Exp $
+# $Id: makefile,v 1.17 2000-03-06 23:38:37 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       dsound.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = dsoundrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\dsound.obj \
+$(OBJDIR)\os2dsound.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\os2sndbuffer.obj \
+$(OBJDIR)\os2helper.obj \
+$(OBJDIR)\dsoundrsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = dsound
 
-OBJS =  dsound.obj os2dsound.obj initterm.obj os2sndbuffer.obj os2helper.obj resource.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/gdi32/gdi32.rc
===================================================================
--- trunk/src/gdi32/gdi32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: gdi32.rc,v 1.1 1999-12-29 18:51:45 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3 gdi32.dll)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "GDI32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "GDI32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "GDI32.DLL\0"
-            VALUE "ProductName", "Odin32 - GDI32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/gdi32/gdi32rsrc.orc
===================================================================
--- trunk/src/gdi32/gdi32rsrc.orc	(revision 3031)
+++ trunk/src/gdi32/gdi32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: gdi32rsrc.orc,v 1.1 2000-03-06 23:38:38 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3 gdi32.dll)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "GDI32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "GDI32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "GDI32.DLL\0"
+            VALUE "ProductName", "Odin32 - GDI32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/gdi32/makefile
===================================================================
--- trunk/src/gdi32/makefile	(revision 3028)
+++ trunk/src/gdi32/makefile	(revision 3031)
@@ -1,68 +1,90 @@
-# $Id: makefile,v 1.22 2000-02-16 14:18:10 sandervl Exp $
+# $Id: makefile,v 1.23 2000-03-06 23:38:38 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       gdi32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = gdi32rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\gdi32.obj \
+$(OBJDIR)\opengl.obj \
+$(OBJDIR)\callback.obj \
+$(OBJDIR)\dibsect.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\oslibgdi.obj \
+$(OBJDIR)\font.obj \
+$(OBJDIR)\text.obj \
+$(OBJDIR)\palette.obj \
+$(OBJDIR)\line.obj \
+$(OBJDIR)\oslibgpi.obj \
+$(OBJDIR)\region.obj \
+$(OBJDIR)\metafile.obj \
+$(OBJDIR)\dibitmap.obj \
+$(OBJDIR)\blit.obj \
+$(OBJDIR)\rgbcvt.obj \
+$(OBJDIR)\dbglocal.obj \
+$(OBJDIR)\gdi32rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = gdi32
 
-OBJS =  gdi32.obj opengl.obj callback.obj dibsect.obj initterm.obj resource.obj \
-        oslibgdi.obj font.obj text.obj palette.obj line.obj oslibgpi.obj region.obj \
-        metafile.obj dibitmap.obj blit.obj rgbcvt.obj dbglocal.obj
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-all: $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/user32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
-resource.asm: gdi32.rc
-    $(RC) $(RCFLAGS) -o resource.asm gdi32.rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch resource.asm \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        $(TARGET)exp.def
-
Index: trunk/src/imagehlp/imagehlp.rc
===================================================================
--- trunk/src/imagehlp/imagehlp.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: imagehlp.rc,v 1.1 2000-02-05 02:00:05 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "IMAGEHLP System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "IMAGEHLP\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "IMAGEHLP.DLL\0"
-            VALUE "ProductName", "Odin32 - IMAGEHLP\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/imagehlp/imagehlprsrc.orc
===================================================================
--- trunk/src/imagehlp/imagehlprsrc.orc	(revision 3031)
+++ trunk/src/imagehlp/imagehlprsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: imagehlprsrc.orc,v 1.1 2000-03-06 23:38:39 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "IMAGEHLP System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "IMAGEHLP\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "IMAGEHLP.DLL\0"
+            VALUE "ProductName", "Odin32 - IMAGEHLP\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/imagehlp/makefile
===================================================================
--- trunk/src/imagehlp/makefile	(revision 3028)
+++ trunk/src/imagehlp/makefile	(revision 3031)
@@ -1,66 +1,74 @@
-# $Id: makefile,v 1.8 2000-02-09 23:46:56 bird Exp $
+# $Id: makefile,v 1.9 2000-03-06 23:38:39 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       imagehlp.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = imagehlprsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\imagehlp.obj \
+$(OBJDIR)\internal.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\imagehlprsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = imagehlp
 
-OBJS =  imagehlp.obj internal.obj initterm.obj resource.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-         resource.asm $(TARGET)exp.def
-
Index: trunk/src/imm32/imm32.rc
===================================================================
--- trunk/src/imm32/imm32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: imm32.rc,v 1.1 2000-02-05 02:00:41 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "IMM32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "IMM32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "IMM32.DLL\0"
-            VALUE "ProductName", "Odin32 - IMM32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/imm32/imm32rsrc.orc
===================================================================
--- trunk/src/imm32/imm32rsrc.orc	(revision 3031)
+++ trunk/src/imm32/imm32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: imm32rsrc.orc,v 1.1 2000-03-06 23:38:40 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "IMM32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "IMM32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "IMM32.DLL\0"
+            VALUE "ProductName", "Odin32 - IMM32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/imm32/makefile
===================================================================
--- trunk/src/imm32/makefile	(revision 3028)
+++ trunk/src/imm32/makefile	(revision 3031)
@@ -1,69 +1,74 @@
-# $Id: makefile,v 1.8 2000-02-09 23:46:56 bird Exp $
+# $Id: makefile,v 1.9 2000-03-06 23:38:40 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       imm32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = lz32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\imm32.obj \
+$(OBJDIR)\imm32rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = imm32
 
-OBJS =  imm32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(TARGET).def
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
-
-
-
-
Index: trunk/src/kernel32/kernelrsrc.orc
===================================================================
--- trunk/src/kernel32/kernelrsrc.orc	(revision 3031)
+++ trunk/src/kernel32/kernelrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: kernelrsrc.orc,v 1.1 2000-03-06 23:34:18 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3 kernel32.dll)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "KERNEL32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "KERNEL32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "KERNEL32.DLL\0"
+            VALUE "ProductName", "Odin32 - KERNEL32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/kernel32/makefile
===================================================================
--- trunk/src/kernel32/makefile	(revision 3028)
+++ trunk/src/kernel32/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.87 2000-03-04 23:47:00 sandervl Exp $
+# $Id: makefile,v 1.88 2000-03-06 23:34:18 bird Exp $
 
 #
@@ -7,23 +7,20 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
-#SvL: Remove this when everything has been converted to the new build rules
-NEWBUILD=1
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-RESOURCES= kernelrsrc
-CFLAGS   = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
-!ifdef NODEBUGINFO
-CFLAGS = $(CFLAGS) -DDEFAULT_LOGGING_OFF
-CXXFLAGS = $(CXXFLAGS) -DDEFAULT_LOGGING_OFF
-!endif
+# Flag overloads and local macros.
+CLEANEXTRAS = kernelrsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
 OBJS = \
 $(OBJDIR)\KERNEL32.OBJ \
@@ -98,5 +95,4 @@
 $(OBJDIR)\fileio.obj \
 $(OBJDIR)\hmtoken.obj \
-$(OBJDIR)\$(RESOURCES).obj \
 $(OBJDIR)\atom.obj \
 $(OBJDIR)\disk.obj \
@@ -120,18 +116,35 @@
 $(OBJDIR)\oslibdebug.obj \
 $(OBJDIR)\dbglocal.obj \
-$(OBJDIR)\registry.obj
+$(OBJDIR)\registry.obj \
+$(OBJDIR)\kernelrsrc.obj
 
+
+# Target name - name of the dll without extention and path.
 TARGET = kernel32
 
-all: $(OBJDIR) $(TARGET).dll $(TARGET).LIB
 
-$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
-        $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
-        rc -r console.rc console.res
-        rc console.res $@
-        $(CP) $@ $(PDWIN32_BIN)
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf \
+                          $(OBJDIR)\console.res
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+    $(OS2RC) $(OBJDIR)\console.res $@
+
+
+# Linker file - creates the parameter file passed on to the linker.
 $(OBJDIR)\$(TARGET).lrf: makefile
-        @echo Creating file <<$(OBJDIR)\$(@B).lrf
+    @echo Creating file <<$(OBJDIR)\$(@B).lrf
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
 $(PDWIN32_LIB)\odincrt.lib
@@ -144,12 +157,12 @@
 <<keep
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-$(RESOURCES).asm: kernel32.rc
-    $(RC) $(RCFLAGS) -o $(RESOURCES).asm kernel32.rc
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
+
+# Includes the common rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.post
+
Index: trunk/src/lz32/lz32.rc
===================================================================
--- trunk/src/lz32/lz32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: lz32.rc,v 1.1 2000-02-05 02:01:38 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "LZ32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "LZ32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "LZ32.DLL\0"
-            VALUE "ProductName", "Odin32 - LZ32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/lz32/lz32rsrc.orc
===================================================================
--- trunk/src/lz32/lz32rsrc.orc	(revision 3031)
+++ trunk/src/lz32/lz32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: lz32rsrc.orc,v 1.1 2000-03-06 23:38:40 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "LZ32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "LZ32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "LZ32.DLL\0"
+            VALUE "ProductName", "Odin32 - LZ32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/lz32/makefile
===================================================================
--- trunk/src/lz32/makefile	(revision 3028)
+++ trunk/src/lz32/makefile	(revision 3031)
@@ -1,68 +1,73 @@
-# $Id: makefile,v 1.10 2000-02-09 23:46:58 bird Exp $
+# $Id: makefile,v 1.11 2000-03-06 23:38:41 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       lz32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = lz32rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\lz32.obj \
+$(OBJDIR)\lz32rsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = lz32
 
-OBJS =  lz32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET)exp.def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) \
-          $(PDWIN32_LIB)\odincrt.lib \
-          $(PDWIN32_LIB)\kernel32.lib \
-          os2386.lib \
-          $(RTLLIB_O) \
-          $(TARGET).def
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)\odincrt.lib
+$(PDWIN32_LIB)\kernel32.lib
+os2386.lib
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *exp.def *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/mpr/makefile
===================================================================
--- trunk/src/mpr/makefile	(revision 3028)
+++ trunk/src/mpr/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.12 2000-02-09 23:46:58 bird Exp $
+# $Id: makefile,v 1.13 2000-03-06 23:38:41 bird Exp $
 
 #
@@ -7,12 +7,17 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
+
+# Flag overloads and local macros.
+CLEANEXTRAS = mprrsrc.asm
 
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
@@ -20,47 +25,53 @@
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\mpr.obj \
+$(OBJDIR)\mprrsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = mpr
 
-OBJS =  mpr.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-          OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$(OBJDIR)\$(@B).lrf
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-
-clean:
-    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/mpr/mpr.rc
===================================================================
--- trunk/src/mpr/mpr.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: mpr.rc,v 1.1 2000-02-05 02:02:10 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "MPR System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "MPR\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MPR.DLL\0"
-            VALUE "ProductName", "Odin32 - MPR\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/mpr/mprrsrc.orc
===================================================================
--- trunk/src/mpr/mprrsrc.orc	(revision 3031)
+++ trunk/src/mpr/mprrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: mprrsrc.orc,v 1.1 2000-03-06 23:38:42 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "MPR System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "MPR\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MPR.DLL\0"
+            VALUE "ProductName", "Odin32 - MPR\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/msacm32/makefile
===================================================================
--- trunk/src/msacm32/makefile	(revision 3028)
+++ trunk/src/msacm32/makefile	(revision 3031)
@@ -1,72 +1,81 @@
-# $Id: makefile,v 1.9 2000-02-09 23:46:58 bird Exp $
+# $Id: makefile,v 1.10 2000-03-06 23:38:43 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       msacm32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = msacm32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\msacm32.obj \
+$(OBJDIR)\filter.obj \
+$(OBJDIR)\format.obj \
+$(OBJDIR)\internal.obj \
+$(OBJDIR)\stream.obj \
+$(OBJDIR)\driver.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\msacm32rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = msacm32
 
-OBJS =  msacm32.obj filter.obj format.obj internal.obj \
-        stream.obj driver.obj  initterm.obj resource.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/winmm.lib \
-          $(PDWIN32_LIB)/advapi32.lib \
-          OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/winmm.lib
+$(PDWIN32_LIB)/advapi32.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
-
-
-
-
Index: trunk/src/msacm32/msacm32.rc
===================================================================
--- trunk/src/msacm32/msacm32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: msacm32.rc,v 1.1 2000-02-05 02:02:46 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "MSACM32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "MSACM32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MSACM32.DLL\0"
-            VALUE "ProductName", "Odin32 - MSACM32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/msacm32/msacm32rsrc.orc
===================================================================
--- trunk/src/msacm32/msacm32rsrc.orc	(revision 3031)
+++ trunk/src/msacm32/msacm32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: msacm32rsrc.orc,v 1.1 2000-03-06 23:38:44 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "MSACM32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "MSACM32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MSACM32.DLL\0"
+            VALUE "ProductName", "Odin32 - MSACM32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/msvcrt/makefile
===================================================================
--- trunk/src/msvcrt/makefile	(revision 3028)
+++ trunk/src/msvcrt/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.13 2000-02-10 01:01:39 bird Exp $
+# $Id: makefile,v 1.14 2000-03-06 23:38:46 bird Exp $
 
 #
@@ -6,4 +6,7 @@
 #       msvcrt.dll makefile
 #
+
+# Kso: not converted.
+OLDBUILD = 1
 
 PDWIN32_INCLUDE = ..\..\include
Index: trunk/src/msvcrt/msvcrt.rc
===================================================================
--- trunk/src/msvcrt/msvcrt.rc	(revision 3028)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/* $Id: msvcrt.rc,v 1.1 1999-12-29 18:49:02 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (MSVCRT.DLL from NT 4, SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "C/C++ Runtime library\0"
-            VALUE "FileVersion", "6.00.8397.0\0"
-            VALUE "InternalName", "MSVCRT\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MSVCRT.DLL\0"
-            VALUE "ProductName", "Odin32 - MSVCRT\0"
-            VALUE "ProductVersion", "6.00.8397.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/msvcrt/msvcrt20.rc
===================================================================
--- trunk/src/msvcrt/msvcrt20.rc	(revision 3028)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/* $Id: msvcrt20.rc,v 1.1 1999-12-29 18:49:02 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (MSVCRT20.DLL from NT 4, SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "C/C++ Runtime library\0"
-            VALUE "FileVersion", "2.11.000\0"
-            VALUE "InternalName", "MSVCRT20\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MSVCRT20.DLL\0"
-            VALUE "ProductName", "Odin32 - MSVCRT20\0"
-            VALUE "ProductVersion", "2.10.000\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/msvcrt/msvcrt20rsrc.orc
===================================================================
--- trunk/src/msvcrt/msvcrt20rsrc.orc	(revision 3031)
+++ trunk/src/msvcrt/msvcrt20rsrc.orc	(revision 3031)
@@ -0,0 +1,40 @@
+/* $Id: msvcrt20rsrc.orc,v 1.1 2000-03-06 23:38:47 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (MSVCRT20.DLL from NT 4, SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "C/C++ Runtime library\0"
+            VALUE "FileVersion", "2.11.000\0"
+            VALUE "InternalName", "MSVCRT20\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MSVCRT20.DLL\0"
+            VALUE "ProductName", "Odin32 - MSVCRT20\0"
+            VALUE "ProductVersion", "2.10.000\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/msvcrt/msvcrt40.rc
===================================================================
--- trunk/src/msvcrt/msvcrt40.rc	(revision 3028)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/* $Id: msvcrt40.rc,v 1.2 2000-01-03 10:26:49 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (MSVCRT40.DLL from Win98SE)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "C/C++ Runtime library\0"
-            VALUE "FileVersion", "4.22\0"
-            VALUE "InternalName", "MSVCRT40\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MSVCRT40.DLL\0"
-            VALUE "ProductName", "Odin32 - MSVCRT40\0"
-            VALUE "ProductVersion", "4.22.0000\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/msvcrt/msvcrt40rsrc.orc
===================================================================
--- trunk/src/msvcrt/msvcrt40rsrc.orc	(revision 3031)
+++ trunk/src/msvcrt/msvcrt40rsrc.orc	(revision 3031)
@@ -0,0 +1,40 @@
+/* $Id: msvcrt40rsrc.orc,v 1.1 2000-03-06 23:38:48 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (MSVCRT40.DLL from Win98SE)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "C/C++ Runtime library\0"
+            VALUE "FileVersion", "4.22\0"
+            VALUE "InternalName", "MSVCRT40\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MSVCRT40.DLL\0"
+            VALUE "ProductName", "Odin32 - MSVCRT40\0"
+            VALUE "ProductVersion", "4.22.0000\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/msvcrt/msvcrtrsrc.orc
===================================================================
--- trunk/src/msvcrt/msvcrtrsrc.orc	(revision 3031)
+++ trunk/src/msvcrt/msvcrtrsrc.orc	(revision 3031)
@@ -0,0 +1,40 @@
+/* $Id: msvcrtrsrc.orc,v 1.1 2000-03-06 23:38:48 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (MSVCRT.DLL from NT 4, SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "C/C++ Runtime library\0"
+            VALUE "FileVersion", "6.00.8397.0\0"
+            VALUE "InternalName", "MSVCRT\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MSVCRT.DLL\0"
+            VALUE "ProductName", "Odin32 - MSVCRT\0"
+            VALUE "ProductVersion", "6.00.8397.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/msvfw32/makefile
===================================================================
--- trunk/src/msvfw32/makefile	(revision 3028)
+++ trunk/src/msvfw32/makefile	(revision 3031)
@@ -1,72 +1,76 @@
-# $Id: makefile,v 1.7 2000-02-09 23:46:58 bird Exp $
+# $Id: makefile,v 1.8 2000-03-06 23:38:49 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       msvfw32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = msvfw32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\msvfw32.obj \
+$(OBJDIR)\msvfw32rsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = msvfw32
 
-OBJS =  msvfw32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/gdi32.lib \
-          $(PDWIN32_LIB)/winmm.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$(OBJDIR)\$(@B).lrf
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/gdi32.lib
+$(PDWIN32_LIB)/winmm.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
-
-
-
-
-
Index: trunk/src/msvfw32/msvfw32.rc
===================================================================
--- trunk/src/msvfw32/msvfw32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: msvfw32.rc,v 1.1 2000-02-05 02:04:28 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "MSVFW32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "MSVFW32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MSVFW32.DLL\0"
-            VALUE "ProductName", "Odin32 - MSVFW32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/msvfw32/msvfw32rsrc.orc
===================================================================
--- trunk/src/msvfw32/msvfw32rsrc.orc	(revision 3031)
+++ trunk/src/msvfw32/msvfw32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: msvfw32rsrc.orc,v 1.1 2000-03-06 23:38:49 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "MSVFW32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "MSVFW32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MSVFW32.DLL\0"
+            VALUE "ProductName", "Odin32 - MSVFW32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/odincrt/makefile
===================================================================
--- trunk/src/odincrt/makefile	(revision 3028)
+++ trunk/src/odincrt/makefile	(revision 3031)
@@ -1,58 +1,85 @@
-# $Id: makefile,v 1.16 2000-02-09 23:46:59 bird Exp $
+# $Id: makefile,v 1.17 2000-03-06 23:38:49 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       odincrt.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CXXFLAGS = $(CXXFLAGS_ODINCRT) -I$(PDWIN32_INCLUDE)
+
+# Flag overloads and local macros.
+CLEANEXTRAS = lz32rsrc.asm
+NOTEXPDEF   = 1
+
+CXXFLAGS    = $(CXXFLAGS_ODINCRT)
 IMPLIBFLAGS = $(IMPLIBFLAGS) /NOIgnoreCase
 
+!ifdef VAC36
+RUNTIMELIBDEF   = odin36.def
+!else
+RUNTIMELIBDEF   = odincrt.def
+!endif
+
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\odincrt.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\malloc.obj \
+$(OBJDIR)\string.obj \
+$(OBJDIR)\file.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = odincrt
 
-!ifdef VAC36
-RUNTIMELIBDEF=odin36.def
-!else
-RUNTIMELIBDEF=odincrt.def
-!endif
 
-OBJS =  odincrt.obj initterm.obj malloc.obj string.obj file.obj
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
-all: $(TARGET).dll $(TARGET).lib
-
-$(TARGET).dll: $(OBJS) $(RUNTIMELIBDEF)
-    $(LD) $(LDFLAGS_ODINCRT) -Fm -Fe$@ $(OBJS) $(RUNTIMELIBDEF) $(SOMLIB)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
+# ImpLib rule - build importlibrary (and evt. other libs)
 $(TARGET).lib: $(TARGET).def
     $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
 
 
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(RUNTIMELIBDEF) $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(RUNTIMELIBDEF)
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
-
Index: trunk/src/ole32/makefile
===================================================================
--- trunk/src/ole32/makefile	(revision 3028)
+++ trunk/src/ole32/makefile	(revision 3031)
@@ -1,110 +1,126 @@
-# $Id: makefile,v 1.21 2000-02-10 00:54:51 bird Exp $
+# $Id: makefile,v 1.22 2000-03-06 23:38:50 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       ole32.dll makefile
 #
 
+
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = ole32rsrc.asm $(PDWIN32_BIN)\regsvr32.exe
 
 
-TARGET = ole32os2
-ORGTARGET = ole32
-
-OBJS =  ole32.obj \
-        antimoniker.obj \
-        bindctx.obj \
-        clsid.obj \
-        compositemoniker.obj \
-        datacache.obj \
-        defaulthandler.obj \
-        filemoniker.obj \
-        guid.obj \
-        hglobalstream.obj \
-        initialise.obj \
-        itemmoniker.obj \
-        iunknown.obj \
-        library.obj \
-        memlockbytes.obj \
-        moniker.obj \
-        oString.obj \
-        ole2.obj \
-        oleobj.obj \
-        oleClip.obj \
-        oleDrag.obj \
-        oleMenu.obj \
-        stg_bigblockfile.obj \
-        stg_stream.obj \
-        storage.obj \
-        stubs.obj \
-        taskmem.obj resource.obj  $(PDWIN32_LIB)/dllentry.obj
-
-all: $(TARGET).dll $(ORGTARGET).lib regsvr32.exe
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\ole32.obj \
+$(OBJDIR)\antimoniker.obj \
+$(OBJDIR)\bindctx.obj \
+$(OBJDIR)\clsid.obj \
+$(OBJDIR)\compositemoniker.obj \
+$(OBJDIR)\datacache.obj \
+$(OBJDIR)\defaulthandler.obj \
+$(OBJDIR)\filemoniker.obj \
+$(OBJDIR)\guid.obj \
+$(OBJDIR)\hglobalstream.obj \
+$(OBJDIR)\initialise.obj \
+$(OBJDIR)\itemmoniker.obj \
+$(OBJDIR)\iunknown.obj \
+$(OBJDIR)\library.obj \
+$(OBJDIR)\memlockbytes.obj \
+$(OBJDIR)\moniker.obj \
+$(OBJDIR)\oString.obj \
+$(OBJDIR)\ole2.obj \
+$(OBJDIR)\oleobj.obj \
+$(OBJDIR)\oleClip.obj \
+$(OBJDIR)\oleDrag.obj \
+$(OBJDIR)\oleMenu.obj \
+$(OBJDIR)\stg_bigblockfile.obj \
+$(OBJDIR)\stg_stream.obj \
+$(OBJDIR)\storage.obj \
+$(OBJDIR)\stubs.obj \
+$(OBJDIR)\taskmem.obj \
+$(OBJDIR)\ole32rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
 
 
-$(TARGET).dll: $(OBJS) $(ORGTARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
-          $(PDWIN32_LIB)\user32.lib \
-          $(PDWIN32_LIB)\gdi32.lib \
-          $(PDWIN32_LIB)\comctl32.lib \
-          $(PDWIN32_LIB)\advapi32.lib \
-          $(PDWIN32_LIB)\kernel32.lib \
-          $(PDWIN32_LIB)\oleaut32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Target and original target names - names of the dll without extention and path
+TARGET      = ole32os2
+ORGTARGET   = ole32
 
 
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib \
+        $(OBJDIR)\regsvr32.exe \
+        $(PDWIN32_BIN)\regsvr32.exe
+
+
+# Lib rule - build importlibrary (and evt. other libs)
 lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
 
-$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
-    $(CP) $** $@
 
-$(ORGTARGET).lib: $(ORGTARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(ORGTARGET)exp.def: $(ORGTARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(ORGTARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(ORGTARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/gdi32.lib
+$(PDWIN32_LIB)/comctl32.lib
+$(PDWIN32_LIB)/advapi32.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/oleaut32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(ORGTARGET).def
+<<keep
 
 
-regsvr32.obj:   regsvr32.cpp
-    $(CC) -C $(CXXFLAGS) -Ge+ -Tm+ regsvr32.cpp
 
-regsvr32.exe:   regsvr32.obj regsvr32.def \
+#
+# Regsrv32.exe rules.
+#
+$(OBJDIR)\regsvr32.obj:   regsvr32.cpp
+    $(CC) -C $(CXXFLAGS) -Ge+ -Tm+ -Fo$@ regsvr32.cpp
+
+$(OBJDIR)\regsvr32.exe:   $(OBJDIR)\regsvr32.obj regsvr32.def \
                 $(PDWIN32_LIB)/user32.lib \
                 $(PDWIN32_LIB)/kernel32.lib \
                 $(PDWIN32_LIB)/ole32.lib
     $(LD) $(LDFLAGS) -Ge+ -Fm -Fe$@ $** \
-            $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+        $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+
+$(PDWIN32_BIN)\regsvr32.exe: $(OBJDIR)\regsvr32.exe
+    $(CP) $** $@
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch *.exe \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        $(PDWIN32_BIN)\regsvr32.exe resource.asm $(TARGET)exp.def
-
Index: trunk/src/ole32/ole32.rc
===================================================================
--- trunk/src/ole32/ole32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: ole32.rc,v 1.1 2000-02-05 02:06:24 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "OLE32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "OLE32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "OLE32.DLL\0"
-            VALUE "ProductName", "Odin32 - OLE32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/ole32/ole32rsrc.orc
===================================================================
--- trunk/src/ole32/ole32rsrc.orc	(revision 3031)
+++ trunk/src/ole32/ole32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: ole32rsrc.orc,v 1.1 2000-03-06 23:38:50 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "OLE32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "OLE32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "OLE32.DLL\0"
+            VALUE "ProductName", "Odin32 - OLE32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/oleaut32/makefile
===================================================================
--- trunk/src/oleaut32/makefile	(revision 3028)
+++ trunk/src/oleaut32/makefile	(revision 3031)
@@ -1,20 +1,23 @@
-# $Id: makefile,v 1.16 2000-02-09 23:46:59 bird Exp $
+# $Id: makefile,v 1.17 2000-03-06 23:38:51 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       ole32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = oleaut32rsrc.asm
 
 !ifdef NODEBUGINFO
@@ -23,69 +26,77 @@
 !endif
 
-TARGET = olautos2
-ORGTARGET = oleaut32
 
-OBJS =  oleaut32.obj guid.obj \
-        oList.obj \
-        initterm.obj olefont.obj \
-        variant.obj \
-        ole2disp.obj parsedt.obj \
-        iPicture.obj \
-        iPictureNone.obj \
-        iPictureBmp.obj \
-        iPictureMeta.obj \
-        iPictureIcon.obj \
-        iPictureEmf.obj \
-        typelib.obj \
-        itypelib.obj \
-        itypeinfo.obj \
-        hash.obj \
-        safearray.obj stubs.obj resource.obj
-
-all: $(TARGET).dll $(ORGTARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\oleaut32.obj \
+$(OBJDIR)\guid.obj \
+$(OBJDIR)\oList.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\olefont.obj \
+$(OBJDIR)\variant.obj \
+$(OBJDIR)\ole2disp.obj \
+$(OBJDIR)\parsedt.obj \
+$(OBJDIR)\iPicture.obj \
+$(OBJDIR)\iPictureNone.obj \
+$(OBJDIR)\iPictureBmp.obj \
+$(OBJDIR)\iPictureMeta.obj \
+$(OBJDIR)\iPictureIcon.obj \
+$(OBJDIR)\iPictureEmf.obj \
+$(OBJDIR)\typelib.obj \
+$(OBJDIR)\itypelib.obj \
+$(OBJDIR)\itypeinfo.obj \
+$(OBJDIR)\hash.obj \
+$(OBJDIR)\safearray.obj \
+$(OBJDIR)\stubs.obj \
+$(OBJDIR)\oleaut32rsrc.obj
 
 
-$(TARGET).dll: $(OBJS) $(ORGTARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
-          $(PDWIN32_LIB)\pmwinx.lib \
-          $(PDWIN32_LIB)\advapi32.lib \
-          $(PDWIN32_LIB)\kernel32.lib \
-          $(PDWIN32_LIB)\user32.lib \
-          $(PDWIN32_LIB)\ole32.lib \
-          $(PDWIN32_LIB)\gdi32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Target and original target names - names of the dll without extention and path
+TARGET      = olautos2
+ORGTARGET   = oleaut32
 
 
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
+
+# Lib rule - build importlibrary (and evt. other libs)
 lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
 
-$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
-    $(CP) $** $@
 
-$(ORGTARGET).lib: $(ORGTARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(ORGTARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(ORGTARGET)exp.def: $(ORGTARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(ORGTARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(ORGTARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/advapi32.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/ole32.lib
+$(PDWIN32_LIB)/gdi32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(ORGTARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(ORGTARGET).lib \
-        resource.asm $(ORGTARGET)exp.def
-
Index: trunk/src/oleaut32/oleaut32.rc
===================================================================
--- trunk/src/oleaut32/oleaut32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: oleaut32.rc,v 1.1 2000-02-05 02:07:04 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "OLEAUT32 System dll\0"
-            VALUE "FileVersion", "2.40.4275\0"
-            VALUE "InternalName", "OLEAUT32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "OLEAUT32.DLL\0"
-            VALUE "ProductName", "Odin32 - OLEAUT32\0"
-            VALUE "ProductVersion", "2.40.4275\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/oleaut32/oleaut32rsrc.orc
===================================================================
--- trunk/src/oleaut32/oleaut32rsrc.orc	(revision 3031)
+++ trunk/src/oleaut32/oleaut32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: oleaut32rsrc.orc,v 1.1 2000-03-06 23:38:51 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "OLEAUT32 System dll\0"
+            VALUE "FileVersion", "2.40.4275\0"
+            VALUE "InternalName", "OLEAUT32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "OLEAUT32.DLL\0"
+            VALUE "ProductName", "Odin32 - OLEAUT32\0"
+            VALUE "ProductVersion", "2.40.4275\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/olecli32/makefile
===================================================================
--- trunk/src/olecli32/makefile	(revision 3028)
+++ trunk/src/olecli32/makefile	(revision 3031)
@@ -1,65 +1,73 @@
-# $Id: makefile,v 1.8 2000-02-09 23:47:00 bird Exp $
+# $Id: makefile,v 1.9 2000-03-06 23:38:51 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       olecli32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = olecli32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\olecli32.obj \
+$(OBJDIR)\olecli32rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = olecli32
 
-OBJS =  olecli32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/olecli32/olecli32.rc
===================================================================
--- trunk/src/olecli32/olecli32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: olecli32.rc,v 1.1 2000-02-05 02:07:39 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "Object Linking and Embedding Client Library\0"
-            VALUE "FileVersion", "1.07\0"
-            VALUE "InternalName", "OLECLI\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "OLECLI32.DLL\0"
-            VALUE "ProductName", "Odin Object Linking and Embedding Client Libraries for OS/2\0"
-            VALUE "ProductVersion", "3.10.0.061\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/olecli32/olecli32rsrc.orc
===================================================================
--- trunk/src/olecli32/olecli32rsrc.orc	(revision 3031)
+++ trunk/src/olecli32/olecli32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: olecli32rsrc.orc,v 1.1 2000-03-06 23:38:52 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "Object Linking and Embedding Client Library\0"
+            VALUE "FileVersion", "1.07\0"
+            VALUE "InternalName", "OLECLI\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "OLECLI32.DLL\0"
+            VALUE "ProductName", "Odin Object Linking and Embedding Client Libraries for OS/2\0"
+            VALUE "ProductVersion", "3.10.0.061\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/oledlg/makefile
===================================================================
--- trunk/src/oledlg/makefile	(revision 3028)
+++ trunk/src/oledlg/makefile	(revision 3031)
@@ -1,66 +1,73 @@
-# $Id: makefile,v 1.8 2000-02-09 23:47:00 bird Exp $
+# $Id: makefile,v 1.9 2000-03-06 23:38:52 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       oledlg.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = oledlgrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\oledlg.obj \
+$(OBJDIR)\oledlgrsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = oledlg
 
-OBJS =  oledlg.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/oledlg/oledlg.rc
===================================================================
--- trunk/src/oledlg/oledlg.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: oledlg.rc,v 1.1 2000-02-05 02:08:16 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "Odin OLE 2.0 User Interface Support\0"
-            VALUE "FileVersion", "1.0\0"
-            VALUE "InternalName", "OLEDLG\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MSVFW32.DLL\0"
-            VALUE "ProductName", "Odin OLE 2.0 User Interface Support\0"
-            VALUE "ProductVersion", "2.01\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/oledlg/oledlgrsrc.orc
===================================================================
--- trunk/src/oledlg/oledlgrsrc.orc	(revision 3031)
+++ trunk/src/oledlg/oledlgrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: oledlgrsrc.orc,v 1.1 2000-03-06 23:38:53 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "Odin OLE 2.0 User Interface Support\0"
+            VALUE "FileVersion", "1.0\0"
+            VALUE "InternalName", "OLEDLG\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MSVFW32.DLL\0"
+            VALUE "ProductName", "Odin OLE 2.0 User Interface Support\0"
+            VALUE "ProductVersion", "2.01\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/olepro32/makefile
===================================================================
--- trunk/src/olepro32/makefile	(revision 3028)
+++ trunk/src/olepro32/makefile	(revision 3031)
@@ -1,65 +1,74 @@
-# $Id: makefile,v 1.1 2000-02-21 10:33:00 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:38:53 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       olepro32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = olepro32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\olepro32.obj \
+$(OBJDIR)\olepro32rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = olepro32
 
-OBJS =  olepro32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/oleaut32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/oleaut32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/olepro32/olepro32.rc
===================================================================
--- trunk/src/olepro32/olepro32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: olepro32.rc,v 1.1 2000-02-21 10:33:00 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP6)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "\0"
-            VALUE "FileVersion", "5.0.4277\0"
-            VALUE "InternalName", "OLEPRO32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "OLEPRO32.DLL\0"
-            VALUE "ProductName", "\0"
-            VALUE "ProductVersion", "2.40\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/olepro32/olepro32rsrc.orc
===================================================================
--- trunk/src/olepro32/olepro32rsrc.orc	(revision 3031)
+++ trunk/src/olepro32/olepro32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: olepro32rsrc.orc,v 1.1 2000-03-06 23:38:54 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP6)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "\0"
+            VALUE "FileVersion", "5.0.4277\0"
+            VALUE "InternalName", "OLEPRO32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "OLEPRO32.DLL\0"
+            VALUE "ProductName", "\0"
+            VALUE "ProductVersion", "2.40\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/olesvr32/makefile
===================================================================
--- trunk/src/olesvr32/makefile	(revision 3028)
+++ trunk/src/olesvr32/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.8 2000-02-09 23:47:00 bird Exp $
+# $Id: makefile,v 1.9 2000-03-06 23:38:54 bird Exp $
 
 #
@@ -7,60 +7,67 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = olesvr32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\olesvr32.obj \
+$(OBJDIR)\olesvr32rsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = olesvr32
 
-OBJS =  olesvr32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/olesvr32/olesvr32.rc
===================================================================
--- trunk/src/olesvr32/olesvr32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: olesvr32.rc,v 1.1 2000-02-05 02:08:49 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "Object Linking and Embedding Server Library\0"
-            VALUE "FileVersion", "1.09\0"
-            VALUE "InternalName", "OLESVR\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "OLESVR32.DLL\0"
-            VALUE "ProductName", "Odin Object Linking and Embedding Libraries for OS/2\0"
-            VALUE "ProductVersion", "3.10.0.071\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/olesvr32/olesvr32rsrc.orc
===================================================================
--- trunk/src/olesvr32/olesvr32rsrc.orc	(revision 3031)
+++ trunk/src/olesvr32/olesvr32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: olesvr32rsrc.orc,v 1.1 2000-03-06 23:38:54 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "Object Linking and Embedding Server Library\0"
+            VALUE "FileVersion", "1.09\0"
+            VALUE "InternalName", "OLESVR\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "OLESVR32.DLL\0"
+            VALUE "ProductName", "Odin Object Linking and Embedding Libraries for OS/2\0"
+            VALUE "ProductVersion", "3.10.0.071\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/opengl/glide/cvg/glide/glide.rc
===================================================================
--- trunk/src/opengl/glide/cvg/glide/glide.rc	(revision 3028)
+++ 	(revision )
@@ -1,72 +1,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/cvg/glide/Attic/glide.rc,v 1.1 2000-02-25 00:37:40 sandervl Exp $
-** $Log: glide.rc,v $
-** Revision 1.1  2000-02-25 00:37:40  sandervl
-** Created Voodoo 2 dir
-**
-** Revision 1.1  2000/02/18 10:43:08  sandervl
-** Created Voodoo 1 Glide dir
-**
-*/
-
-#define OFFICIAL   1 
-#define FINAL      1 
-
-#include <fxver.h>
-#include "rcver.h"
-//#include "fxbldno.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-1 VERSIONINFO
- FILEVERSION MANVERSION, MANREVISION, 0, 1
- PRODUCTVERSION MANVERSION, MANREVISION, 0, 1
- FILEFLAGSMASK 0x0030003FL
- FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
-
- FILEOS VOS_DOS_WINDOWS32
- FILETYPE VFT_DRV
- FILESUBTYPE VFT2_DRV_INSTALLABLE
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
-            VALUE "FileDescription", "3Dfx Interactive, Inc. Glide DLL\0"
-            VALUE "FileVersion", "2.53\0"
-            VALUE "InternalName", "glide2x.dll\0"
-            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1997\0"
-            VALUE "OriginalFilename", "glide2x.dll\0"
-            VALUE "ProductName", "Glide(tm) for Voodoo Graphics\251 and OS/2 Warp\0"
-            VALUE "ProductVersion", "2.53\0"
-            VALUE "Graphics Subsystem", "Voodoo Graphics(tm)\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        /* the following line should be extended for localized versions */
-        VALUE "Translation", 0x409, 1252
-    END
-END
Index: trunk/src/opengl/glide/cvg/glide/glidersrc.orc
===================================================================
--- trunk/src/opengl/glide/cvg/glide/glidersrc.orc	(revision 3031)
+++ trunk/src/opengl/glide/cvg/glide/glidersrc.orc	(revision 3031)
@@ -0,0 +1,77 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+**
+** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/cvg/glide/glidersrc.orc,v 1.1 2000-03-06 23:33:43 bird Exp $
+** $Log: glidersrc.orc,v $
+** Revision 1.1  2000-03-06 23:33:43  bird
+** Makefiles are updated to new style.
+** Odin32 resource files are renamed to *.orc and most have changed name to avoid
+** name clashes for object files.
+**
+** Revision 1.1  2000/02/25 00:37:40  sandervl
+** Created Voodoo 2 dir
+**
+** Revision 1.1  2000/02/18 10:43:08  sandervl
+** Created Voodoo 1 Glide dir
+**
+*/
+
+#define OFFICIAL   1 
+#define FINAL      1 
+
+#include <fxver.h>
+#include "rcver.h"
+//#include "fxbldno.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION MANVERSION, MANREVISION, 0, 1
+ PRODUCTVERSION MANVERSION, MANREVISION, 0, 1
+ FILEFLAGSMASK 0x0030003FL
+ FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
+
+ FILEOS VOS_DOS_WINDOWS32
+ FILETYPE VFT_DRV
+ FILESUBTYPE VFT2_DRV_INSTALLABLE
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
+            VALUE "FileDescription", "3Dfx Interactive, Inc. Glide DLL\0"
+            VALUE "FileVersion", "2.53\0"
+            VALUE "InternalName", "glide2x.dll\0"
+            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1997\0"
+            VALUE "OriginalFilename", "glide2x.dll\0"
+            VALUE "ProductName", "Glide(tm) for Voodoo Graphics\251 and OS/2 Warp\0"
+            VALUE "ProductVersion", "2.53\0"
+            VALUE "Graphics Subsystem", "Voodoo Graphics(tm)\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* the following line should be extended for localized versions */
+        VALUE "Translation", 0x409, 1252
+    END
+END
Index: trunk/src/opengl/glide/cvg/glide/makefile
===================================================================
--- trunk/src/opengl/glide/cvg/glide/makefile	(revision 3028)
+++ trunk/src/opengl/glide/cvg/glide/makefile	(revision 3031)
@@ -1,49 +1,92 @@
-# $Id: makefile,v 1.2 2000-03-01 14:26:49 sandervl Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:43 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       Glide makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=glide
+# Local cleanup only.
+LOCALCLEAN = 1
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;$(PDWIN32_INCLUDE)
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) /Os-
+# Flag overloads and local macros.
+CLEANEXTRAS = glidersrc.asm
+
+CINCLUDE = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;
+CFLAGS   = $(CFLAGS) $(CINCLUDE) /Os-
 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) /Os-
-
-OBJS =	CPUDTECT.OBJ    DDGUMP.OBJ      DIGLIDE.OBJ     DIGUTEX.OBJ     DISST.OBJ \
-	DITEX.OBJ       G3DF.OBJ        GAA.OBJ         GBANNER.OBJ \
-	GDRAW.OBJ       GERROR.OBJ      GGLIDE.OBJ      GLFB.OBJ        GMOVIE.OBJ \
-	GPCI.OBJ        GSPLASH.OBJ     GSST.OBJ        GTEX.OBJ        GTEXDL.OBJ \
-	GU.OBJ          GUCLIP.OBJ      GUMP.OBJ        GUTEX.OBJ       GXDRAW.OBJ \
-	P6FENCE.OBJ     FIFO.OBJ
+RCFLAGS  = $(RCFLAGS) $(CINCLUDE)
 
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\CPUDTECT.OBJ \
+$(OBJDIR)\DDGUMP.OBJ \
+$(OBJDIR)\DIGLIDE.OBJ \
+$(OBJDIR)\DIGUTEX.OBJ \
+$(OBJDIR)\DISST.OBJ \
+$(OBJDIR)\DITEX.OBJ \
+$(OBJDIR)\G3DF.OBJ \
+$(OBJDIR)\GAA.OBJ \
+$(OBJDIR)\GBANNER.OBJ \
+$(OBJDIR)\GDRAW.OBJ \
+$(OBJDIR)\GERROR.OBJ \
+$(OBJDIR)\GGLIDE.OBJ \
+$(OBJDIR)\GLFB.OBJ \
+$(OBJDIR)\GMOVIE.OBJ \
+$(OBJDIR)\GPCI.OBJ \
+$(OBJDIR)\GSPLASH.OBJ \
+$(OBJDIR)\GSST.OBJ \
+$(OBJDIR)\GTEX.OBJ \
+$(OBJDIR)\GTEXDL.OBJ \
+$(OBJDIR)\GU.OBJ \
+$(OBJDIR)\GUCLIP.OBJ \
+$(OBJDIR)\GUMP.OBJ \
+$(OBJDIR)\GUTEX.OBJ \
+$(OBJDIR)\GXDRAW.OBJ \
+$(OBJDIR)\P6FENCE.OBJ \
+$(OBJDIR)\FIFO.OBJ \
+$(OBJDIR)\glidersrc.obj
 
-$(TARGET).lib: $(OBJS)
-	$(RM) $(TARGET).lib
-	$(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = glide
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/glide/cvg/init/init.orc
===================================================================
--- trunk/src/opengl/glide/cvg/init/init.orc	(revision 3031)
+++ trunk/src/opengl/glide/cvg/init/init.orc	(revision 3031)
@@ -0,0 +1,73 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+**
+** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/cvg/init/init.orc,v 1.1 2000-03-06 23:33:43 bird Exp $
+** $Log: init.orc,v $
+** Revision 1.1  2000-03-06 23:33:43  bird
+** Makefiles are updated to new style.
+** Odin32 resource files are renamed to *.orc and most have changed name to avoid
+** name clashes for object files.
+**
+** Revision 1.1  2000/02/25 00:37:52  sandervl
+** Created Voodoo 2 dir
+**
+*/
+
+#define OFFICIAL   1 
+#define FINAL      1 
+
+#include <fxver.h>
+#include "rcver.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#define VERSIONNAME             "sst1init.dll\0"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
+ PRODUCTVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
+ FILEFLAGSMASK 0x0030003FL
+ FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
+
+ FILEOS VOS_DOS_WINDOWS32
+ FILETYPE VFT_DRV
+ FILESUBTYPE VFT2_DRV_INSTALLABLE
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
+            VALUE "FileDescription", "3Dfx Interactive, Inc. InitCode DLL\0"
+            VALUE "FileVersion", VERSIONSTR
+            VALUE "InternalName", VERSIONNAME
+            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1996\0"
+            VALUE "OriginalFilename", VERSIONNAME
+            VALUE "ProductName", "InitCode for Voodoo Graphics\251 and Windows\256  95\0"
+            VALUE "ProductVersion", VERSIONSTR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* the following line should be extended for localized versions */
+        VALUE "Translation", 0x409, 1252
+    END
+END
Index: trunk/src/opengl/glide/cvg/init/init.rc
===================================================================
--- trunk/src/opengl/glide/cvg/init/init.rc	(revision 3028)
+++ 	(revision )
@@ -1,68 +1,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/cvg/init/Attic/init.rc,v 1.1 2000-02-25 00:37:52 sandervl Exp $
-** $Log: init.rc,v $
-** Revision 1.1  2000-02-25 00:37:52  sandervl
-** Created Voodoo 2 dir
-**
-*/
-
-#define OFFICIAL   1 
-#define FINAL      1 
-
-#include <fxver.h>
-#include "rcver.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#define VERSIONNAME             "sst1init.dll\0"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
- PRODUCTVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
- FILEFLAGSMASK 0x0030003FL
- FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
-
- FILEOS VOS_DOS_WINDOWS32
- FILETYPE VFT_DRV
- FILESUBTYPE VFT2_DRV_INSTALLABLE
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
-            VALUE "FileDescription", "3Dfx Interactive, Inc. InitCode DLL\0"
-            VALUE "FileVersion", VERSIONSTR
-            VALUE "InternalName", VERSIONNAME
-            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1996\0"
-            VALUE "OriginalFilename", VERSIONNAME
-            VALUE "ProductName", "InitCode for Voodoo Graphics\251 and Windows\256  95\0"
-            VALUE "ProductVersion", VERSIONSTR
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        /* the following line should be extended for localized versions */
-        VALUE "Translation", 0x409, 1252
-    END
-END
Index: trunk/src/opengl/glide/cvg/init/makefile
===================================================================
--- trunk/src/opengl/glide/cvg/init/makefile	(revision 3028)
+++ trunk/src/opengl/glide/cvg/init/makefile	(revision 3031)
@@ -1,46 +1,71 @@
-# $Id: makefile,v 1.1 2000-02-25 00:37:52 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:44 bird Exp $
 #
 # PD-Win32 API
 #
-#       Glide makefile
+#       Init makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
 PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
+PDWIN32_BIN = ..\..\..\..\..\$(OBJDIR)
 PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
+LOCALCLEAN  = 1
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-TARGET=init
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\glide;..\texus;..\..\swlibs\pcilib
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\glide;..\texus;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
 
-OBJS =	DAC.OBJ GAMMA.OBJ GDEBUG.OBJ INFO.OBJ PARSE.OBJ \
-	PRINT.OBJ SLI.OBJ SST1INIT.OBJ UTIL.OBJ VIDEO.OBJ
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\DAC.OBJ \
+$(OBJDIR)\GAMMA.OBJ \
+$(OBJDIR)\GDEBUG.OBJ \
+$(OBJDIR)\INFO.OBJ \
+$(OBJDIR)\PARSE.OBJ \
+$(OBJDIR)\PRINT.OBJ \
+$(OBJDIR)\SLI.OBJ \
+$(OBJDIR)\SST1INIT.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIDEO.OBJ
 
-all: $(TARGET).lib
 
-$(TARGET).lib: $(OBJS)
-	$(RM) $(TARGET).lib
-	$(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS),,
+# Target name - name of the dll without extention and path.
+TARGET  = init
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib target rule - builds the library.
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
 
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/glide/cvg/makefile
===================================================================
--- trunk/src/opengl/glide/cvg/makefile	(revision 3028)
+++ trunk/src/opengl/glide/cvg/makefile	(revision 3031)
@@ -1,94 +1,108 @@
-# $Id: makefile,v 1.6 2000-03-04 20:03:43 bird Exp $
+# $Id: makefile,v 1.7 2000-03-06 23:33:43 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       Glide\cvg makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
+
+# Have extra clean rule.
+CLEAN2 = 1
+
+
+# Compiler, tools, and interference rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.mk
+
+
+# Flag overloads and local macros.
+CLEANEXTRAS = rsrc.asm
+
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\initterm.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = glide2x
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS = $(CFLAGS)  -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
-OBJS =  initterm.obj \
-        glideres.obj \
-        ..\swlibs\pcilib\pcilib.lib \
-        texus\texus.lib \
-        init\init.lib \
-        glide\glide.lib \
 
-all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-..\swlibs\pcilib\pcilib.lib:
+
+
+# Libs rule - Make (sub) libraries. (Not import libraries!)
+libs:
     cd ..\swlibs\pcilib
-    $(MAKE_CMD)
-    cd ..\..\cvg
-
-init\init.lib:
-    cd init
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\..\cvg\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
+    cd ..\texus
+    $(MAKE_CMD) $@
     cd ..
 
-glide\glide.lib:
-    cd glide
-    $(MAKE_CMD)
-    cd ..
 
-texus\texus.lib:
-    cd texus
-    $(MAKE_CMD)
-    cd ..
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)\Glide\Voodoo2
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+..\swlibs\pcilib\$(OBJDIR)\pcilib.lib
+texus\$(OBJDIR)\texus.lib
+init\$(OBJDIR)\init.lib
+glide\$(OBJDIR)\glide.lib
+$(PDWIN32_LIB)\kernel32.lib
+$(PDWIN32_LIB)\odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+
+# Copy rule - copies the dll.
+$(PDWIN32_BIN)\Glide\Voodoo2\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
     $(CP) $** $@
 
-$(TARGET).lib: $(TARGET).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).def
-    $(CP) $@ $(PDWIN32_LIB)
 
-RCFLAGS = $(RCFLAGS) -I..\swlibs\fxmisc -Iglide
-
-glideres.asm: glide\glide.rc
-    $(RC) $(RCFLAGS) -o glideres.asm glide\glide.rc
-
-initterm.obj: initterm.cpp
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd ..\swlibs\pcilib
-    $(MAKE_CMD) dep
-    cd ..\..\cvg\glide
-    $(MAKE_CMD) dep
-    cd ..\init
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
+    cd ..\..\cvg\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
     cd ..\texus
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.map *.dll
-    $(RM) *.lib
-    $(RM) glideres.asm
+# Extra cleanrule.
+clean2:
     cd ..\swlibs\pcilib
     $(MAKE_CMD) clean
@@ -101,2 +115,8 @@
     cd ..
 
+
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+
+
+
Index: trunk/src/opengl/glide/cvg/texus/makefile
===================================================================
--- trunk/src/opengl/glide/cvg/texus/makefile	(revision 3028)
+++ trunk/src/opengl/glide/cvg/texus/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.1 2000-02-25 00:37:59 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:44 bird Exp $
 #
 # PD-Win32 API
@@ -6,40 +6,78 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=TEXUS
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init;..\glide;..\..\swlibs\pcilib
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS =	3DF.OBJ         CLAMP.OBJ       DEQUANT.OBJ     DIFFUSE.OBJ     GLDUTIL.OBJ \
-	MIPMAP.OBJ      NCC.OBJ         NCCNNET.OBJ     PAL256.OBJ      PPM.OBJ \
-	QUANTIZE.OBJ    READ.OBJ        RESAMPLE.OBJ    RGT.OBJ         TEXUSLIB.OBJ \
-	TGA.OBJ         UTIL.OBJ        VIEW.OBJ        WRITE.OBJ
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init;..\glide;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-all: $(TARGET).lib
 
-$(TARGET).lib: $(OBJS)
-	$(RM) $(TARGET).lib
-	$(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\3DF.OBJ \
+$(OBJDIR)\CLAMP.OBJ \
+$(OBJDIR)\DEQUANT.OBJ \
+$(OBJDIR)\DIFFUSE.OBJ \
+$(OBJDIR)\GLDUTIL.OBJ \
+$(OBJDIR)\MIPMAP.OBJ \
+$(OBJDIR)\NCC.OBJ \
+$(OBJDIR)\NCCNNET.OBJ \
+$(OBJDIR)\PAL256.OBJ \
+$(OBJDIR)\PPM.OBJ \
+$(OBJDIR)\QUANTIZE.OBJ \
+$(OBJDIR)\READ.OBJ \
+$(OBJDIR)\RESAMPLE.OBJ \
+$(OBJDIR)\RGT.OBJ \
+$(OBJDIR)\TEXUSLIB.OBJ \
+$(OBJDIR)\TGA.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIEW.OBJ \
+$(OBJDIR)\WRITE.OBJ
 
+
+# Target name - name of the library without extention and path.
+TARGET = texus
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/glide/makefile
===================================================================
--- trunk/src/opengl/glide/makefile	(revision 3028)
+++ trunk/src/opengl/glide/makefile	(revision 3031)
@@ -1,50 +1,22 @@
-# $Id: makefile,v 1.3 2000-03-04 20:03:42 bird Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:43 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       main glide makefile
 #
 
-PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+# Directories
+PDWIN32_INCLUDE = ..\..\include
+
+# Common tools macros. (MAKE_CMD)
+!include ..\..\..\include\pdwin32.tools
 
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
-
-TARGET1 = cvg\glide2x
-TARGET2 = sst1\glide2x
-
-all: $(TARGET1).dll $(TARGET2).dll
-lib: $(TARGET1).lib
-
-$(TARGET1).dll:
+# All, Lib, Clean and Dep rules.
+all lib clean dep:
     cd cvg
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\sst1
+    $(MAKE_CMD) $@
     cd ..
 
-$(TARGET2).dll:
-    cd sst1
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET1).lib:
-    cd cvg
-    $(MAKE_CMD) $(@F)
-    cd ..
-
-clean:
-    cd cvg
-    $(MAKE_CMD) clean
-    cd ..\sst1
-    $(MAKE_CMD) clean
-    cd ..
-
-dep:
-    cd cvg
-    $(MAKE_CMD) dep
-    cd ..\sst1
-    $(MAKE_CMD) dep
-    cd ..
-
Index: trunk/src/opengl/glide/sst1/glide/glide.rc
===================================================================
--- trunk/src/opengl/glide/sst1/glide/glide.rc	(revision 3028)
+++ 	(revision )
@@ -1,72 +1,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/sst1/glide/Attic/glide.rc,v 1.1 2000-02-25 00:31:15 sandervl Exp $
-** $Log: glide.rc,v $
-** Revision 1.1  2000-02-25 00:31:15  sandervl
-** Created new Voodoo 1 Glide dir
-**
-** Revision 1.1  2000/02/18 10:43:08  sandervl
-** Created Voodoo 1 Glide dir
-**
-*/
-
-#define OFFICIAL   1 
-#define FINAL      1 
-
-#include <fxver.h>
-#include "rcver.h"
-//#include "fxbldno.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-1 VERSIONINFO
- FILEVERSION MANVERSION, MANREVISION, 0, 1
- PRODUCTVERSION MANVERSION, MANREVISION, 0, 1
- FILEFLAGSMASK 0x0030003FL
- FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
-
- FILEOS VOS_DOS_WINDOWS32
- FILETYPE VFT_DRV
- FILESUBTYPE VFT2_DRV_INSTALLABLE
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
-            VALUE "FileDescription", "3Dfx Interactive, Inc. Glide DLL\0"
-            VALUE "FileVersion", "2.46\0"
-            VALUE "InternalName", "glide2x.dll\0"
-            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1997\0"
-            VALUE "OriginalFilename", "glide2x.dll\0"
-            VALUE "ProductName", "Glide(tm) for Voodoo Graphics\251 and OS/2 Warp\0"
-            VALUE "ProductVersion", "2.46\0"
-            VALUE "Graphics Subsystem", "Voodoo Graphics(tm)\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        /* the following line should be extended for localized versions */
-        VALUE "Translation", 0x409, 1252
-    END
-END
Index: trunk/src/opengl/glide/sst1/glide/glidersrc.orc
===================================================================
--- trunk/src/opengl/glide/sst1/glide/glidersrc.orc	(revision 3031)
+++ trunk/src/opengl/glide/sst1/glide/glidersrc.orc	(revision 3031)
@@ -0,0 +1,77 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+**
+** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/sst1/glide/glidersrc.orc,v 1.1 2000-03-06 23:33:45 bird Exp $
+** $Log: glidersrc.orc,v $
+** Revision 1.1  2000-03-06 23:33:45  bird
+** Makefiles are updated to new style.
+** Odin32 resource files are renamed to *.orc and most have changed name to avoid
+** name clashes for object files.
+**
+** Revision 1.1  2000/02/25 00:31:15  sandervl
+** Created new Voodoo 1 Glide dir
+**
+** Revision 1.1  2000/02/18 10:43:08  sandervl
+** Created Voodoo 1 Glide dir
+**
+*/
+
+#define OFFICIAL   1 
+#define FINAL      1 
+
+#include <fxver.h>
+#include "rcver.h"
+//#include "fxbldno.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION MANVERSION, MANREVISION, 0, 1
+ PRODUCTVERSION MANVERSION, MANREVISION, 0, 1
+ FILEFLAGSMASK 0x0030003FL
+ FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
+
+ FILEOS VOS_DOS_WINDOWS32
+ FILETYPE VFT_DRV
+ FILESUBTYPE VFT2_DRV_INSTALLABLE
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
+            VALUE "FileDescription", "3Dfx Interactive, Inc. Glide DLL\0"
+            VALUE "FileVersion", "2.46\0"
+            VALUE "InternalName", "glide2x.dll\0"
+            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1997\0"
+            VALUE "OriginalFilename", "glide2x.dll\0"
+            VALUE "ProductName", "Glide(tm) for Voodoo Graphics\251 and OS/2 Warp\0"
+            VALUE "ProductVersion", "2.46\0"
+            VALUE "Graphics Subsystem", "Voodoo Graphics(tm)\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* the following line should be extended for localized versions */
+        VALUE "Translation", 0x409, 1252
+    END
+END
Index: trunk/src/opengl/glide/sst1/glide/makefile
===================================================================
--- trunk/src/opengl/glide/sst1/glide/makefile	(revision 3028)
+++ trunk/src/opengl/glide/sst1/glide/makefile	(revision 3031)
@@ -1,49 +1,89 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:20 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:45 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       Glide makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=glide
+# Local cleanup only.
+LOCALCLEAN = 1
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;$(PDWIN32_INCLUDE)
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = glidersrc.asm
 
-OBJS =	CPUDTECT.OBJ    DDGUMP.OBJ      DIGLIDE.OBJ     DIGUTEX.OBJ     DISST.OBJ \
-	DITEX.OBJ       G3DF.OBJ        GAA.OBJ         GBANNER.OBJ \
-	GDRAW.OBJ       GERROR.OBJ      GGLIDE.OBJ      GLFB.OBJ        GMOVIE.OBJ \
-	GPCI.OBJ        GSPLASH.OBJ     GSST.OBJ        GTEX.OBJ        GTEXDL.OBJ \
-	GU.OBJ          GUCLIP.OBJ      GUMP.OBJ        GUTEX.OBJ       GXDRAW.OBJ \
-	P6FENCE.OBJ     SST96.OBJ
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\texus;..\..\swlibs\pcilib;
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
+RCFLAGS     = $(RCFLAGS) $(CINCLUDE)
 
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\CPUDTECT.OBJ \
+$(OBJDIR)\DDGUMP.OBJ \
+$(OBJDIR)\DIGLIDE.OBJ \
+$(OBJDIR)\DIGUTEX.OBJ \
+$(OBJDIR)\DISST.OBJ \
+$(OBJDIR)\DITEX.OBJ \
+$(OBJDIR)\G3DF.OBJ \
+$(OBJDIR)\GAA.OBJ \
+$(OBJDIR)\GBANNER.OBJ \
+$(OBJDIR)\GDRAW.OBJ \
+$(OBJDIR)\GERROR.OBJ \
+$(OBJDIR)\GGLIDE.OBJ \
+$(OBJDIR)\GLFB.OBJ \
+$(OBJDIR)\GMOVIE.OBJ \
+$(OBJDIR)\GPCI.OBJ \
+$(OBJDIR)\GSPLASH.OBJ \
+$(OBJDIR)\GSST.OBJ \
+$(OBJDIR)\GTEX.OBJ \
+$(OBJDIR)\GTEXDL.OBJ \
+$(OBJDIR)\GU.OBJ \
+$(OBJDIR)\GUCLIP.OBJ \
+$(OBJDIR)\GUMP.OBJ \
+$(OBJDIR)\GUTEX.OBJ \
+$(OBJDIR)\GXDRAW.OBJ \
+$(OBJDIR)\P6FENCE.OBJ \
+$(OBJDIR)\SST96.OBJ \
+$(OBJDIR)\glidersrc.obj
 
-$(TARGET).lib: $(OBJS)
-	$(RM) $(TARGET).lib
-	$(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = glide
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h ..\init\initvg\*.h ..\init\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/glide/sst1/init/initvg/init.orc
===================================================================
--- trunk/src/opengl/glide/sst1/init/initvg/init.orc	(revision 3031)
+++ trunk/src/opengl/glide/sst1/init/initvg/init.orc	(revision 3031)
@@ -0,0 +1,73 @@
+/*
+** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
+** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
+** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
+** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
+** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
+** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
+** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
+** 
+** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
+** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
+** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
+** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
+** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
+** THE UNITED STATES.  
+** 
+** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
+**
+** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/sst1/init/initvg/init.orc,v 1.1 2000-03-06 23:33:46 bird Exp $
+** $Log: init.orc,v $
+** Revision 1.1  2000-03-06 23:33:46  bird
+** Makefiles are updated to new style.
+** Odin32 resource files are renamed to *.orc and most have changed name to avoid
+** name clashes for object files.
+**
+** Revision 1.1  2000/02/25 00:31:33  sandervl
+** Created new Voodoo 1 Glide dir
+**
+*/
+
+#define OFFICIAL   1 
+#define FINAL      1 
+
+#include <fxver.h>
+#include "rcver.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#define VERSIONNAME             "sst1init.dll\0"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
+ PRODUCTVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
+ FILEFLAGSMASK 0x0030003FL
+ FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
+
+ FILEOS VOS_DOS_WINDOWS32
+ FILETYPE VFT_DRV
+ FILESUBTYPE VFT2_DRV_INSTALLABLE
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
+            VALUE "FileDescription", "3Dfx Interactive, Inc. InitCode DLL\0"
+            VALUE "FileVersion", VERSIONSTR
+            VALUE "InternalName", VERSIONNAME
+            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1996\0"
+            VALUE "OriginalFilename", VERSIONNAME
+            VALUE "ProductName", "InitCode for Voodoo Graphics\251 and Windows\256  95\0"
+            VALUE "ProductVersion", VERSIONSTR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* the following line should be extended for localized versions */
+        VALUE "Translation", 0x409, 1252
+    END
+END
Index: trunk/src/opengl/glide/sst1/init/initvg/init.rc
===================================================================
--- trunk/src/opengl/glide/sst1/init/initvg/init.rc	(revision 3028)
+++ 	(revision )
@@ -1,68 +1,0 @@
-/*
-** THIS SOFTWARE IS SUBJECT TO COPYRIGHT PROTECTION AND IS OFFERED ONLY
-** PURSUANT TO THE 3DFX GLIDE GENERAL PUBLIC LICENSE. THERE IS NO RIGHT
-** TO USE THE GLIDE TRADEMARK WITHOUT PRIOR WRITTEN PERMISSION OF 3DFX
-** INTERACTIVE, INC. A COPY OF THIS LICENSE MAY BE OBTAINED FROM THE 
-** DISTRIBUTOR OR BY CONTACTING 3DFX INTERACTIVE INC(info@3dfx.com). 
-** THIS PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
-** EXPRESSED OR IMPLIED. SEE THE 3DFX GLIDE GENERAL PUBLIC LICENSE FOR A
-** FULL TEXT OF THE NON-WARRANTY PROVISIONS.  
-** 
-** USE, DUPLICATION OR DISCLOSURE BY THE GOVERNMENT IS SUBJECT TO
-** RESTRICTIONS AS SET FORTH IN SUBDIVISION (C)(1)(II) OF THE RIGHTS IN
-** TECHNICAL DATA AND COMPUTER SOFTWARE CLAUSE AT DFARS 252.227-7013,
-** AND/OR IN SIMILAR OR SUCCESSOR CLAUSES IN THE FAR, DOD OR NASA FAR
-** SUPPLEMENT. UNPUBLISHED RIGHTS RESERVED UNDER THE COPYRIGHT LAWS OF
-** THE UNITED STATES.  
-** 
-** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED
-**
-** $Header: /home/ktk/tmp/odin/2007/netlabs.cvs/odin32/src/opengl/glide/sst1/init/initvg/Attic/init.rc,v 1.1 2000-02-25 00:31:33 sandervl Exp $
-** $Log: init.rc,v $
-** Revision 1.1  2000-02-25 00:31:33  sandervl
-** Created new Voodoo 1 Glide dir
-**
-*/
-
-#define OFFICIAL   1 
-#define FINAL      1 
-
-#include <fxver.h>
-#include "rcver.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-#define VERSIONNAME             "sst1init.dll\0"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
- PRODUCTVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
- FILEFLAGSMASK 0x0030003FL
- FILEFLAGS (VER_PRIVATEBUILD|VER_PRERELEASE|VER_DEBUG)
-
- FILEOS VOS_DOS_WINDOWS32
- FILETYPE VFT_DRV
- FILESUBTYPE VFT2_DRV_INSTALLABLE
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "CompanyName", "3Dfx Interactive, Inc.\0"
-            VALUE "FileDescription", "3Dfx Interactive, Inc. InitCode DLL\0"
-            VALUE "FileVersion", VERSIONSTR
-            VALUE "InternalName", VERSIONNAME
-            VALUE "LegalCopyright", "Copyright \251 3Dfx Interactive, Inc. 1996\0"
-            VALUE "OriginalFilename", VERSIONNAME
-            VALUE "ProductName", "InitCode for Voodoo Graphics\251 and Windows\256  95\0"
-            VALUE "ProductVersion", VERSIONSTR
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        /* the following line should be extended for localized versions */
-        VALUE "Translation", 0x409, 1252
-    END
-END
Index: trunk/src/opengl/glide/sst1/init/initvg/makefile
===================================================================
--- trunk/src/opengl/glide/sst1/init/initvg/makefile	(revision 3028)
+++ trunk/src/opengl/glide/sst1/init/initvg/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:33 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:47 bird Exp $
 #
 # PD-Win32 API
@@ -6,33 +6,56 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\..\tools\bin
 
+
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\..\3dfx.mak
 
-CINCLUDE=-I..\..\incsrc;..\..\..\swlibs\fxmisc;..\..\init;..\..\glide;..\..\texus;..\..\..\swlibs\pcilib
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = glide.asm
 
-OBJS =	DAC.OBJ         GAMMA.OBJ       GDEBUG.OBJ      INFO.OBJ        PARSE.OBJ \
-	PRINT.OBJ       SLI.OBJ         SST1INIT.OBJ    UTIL.OBJ        VIDEO.OBJ
+CINCLUDE    = -I..\..\incsrc;..\..\..\swlibs\fxmisc;..\..\init;..\..\glide;..\..\texus;..\..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-all: $(OBJS)
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\DAC.OBJ \
+$(OBJDIR)\GAMMA.OBJ \
+$(OBJDIR)\GDEBUG.OBJ \
+$(OBJDIR)\INFO.OBJ \
+$(OBJDIR)\PARSE.OBJ \
+$(OBJDIR)\PRINT.OBJ \
+$(OBJDIR)\SLI.OBJ \
+$(OBJDIR)\SST1INIT.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIDEO.OBJ
+
+
+# All - rule make all objects.
+all:    $(OBJDIR) \
+        $(OBJS)
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\..\incsrc\*.h ..\..\..\swlibs\fxmisc\*.h ..\*.h ..\..\glide\*.h ..\..\texus\*.h ..\..\..\swlibs\pcilib\*.h 
+        ..\..\incsrc\*.h ..\..\..\swlibs\fxmisc\*.h ..\*.h ..\..\glide\*.h \
+        ..\..\texus\*.h ..\..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/glide/sst1/init/makefile
===================================================================
--- trunk/src/opengl/glide/sst1/init/makefile	(revision 3028)
+++ trunk/src/opengl/glide/sst1/init/makefile	(revision 3031)
@@ -1,41 +1,82 @@
-# $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:46 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       sst1\Init makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
+# Local cleanup only and extra cleanrule.
+LOCALCLEAN = 1
+CLEAN2     = 1
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-TARGET1=init
-TARGET2=initvg
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;initvg;..\glide;..\texus;..\..\swlibs\pcilib
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
-
-OBJS =  H3DRVR.OBJ      INIT.OBJ        VG96DRVR.OBJ    VGDRVR.OBJ \
-        $(TARGET2)\DAC.OBJ         $(TARGET2)\GAMMA.OBJ       $(TARGET2)\GDEBUG.OBJ      $(TARGET2)\INFO.OBJ        $(TARGET2)\PARSE.OBJ \
-        $(TARGET2)\PRINT.OBJ       $(TARGET2)\SLI.OBJ         $(TARGET2)\SST1INIT.OBJ    $(TARGET2)\UTIL.OBJ        $(TARGET2)\VIDEO.OBJ
-
-all: $(TARGET2).lib $(TARGET1).lib
-
-$(TARGET1).lib: $(OBJS)
-        $(RM) $(TARGET1).lib
-        $(ILIB) $(ILIBFLAGS) $(TARGET1).lib $(OBJS),,
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;initvg;..\glide;..\texus;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
 
-$(TARGET2).lib:
-    cd initvg
-    $(MAKE_CMD)
+# Object files. All objects should be prefixed with $(OBJDIR)!
+INITSUB = initvg
+OBJS = \
+$(OBJDIR)\H3DRVR.OBJ \
+$(OBJDIR)\INIT.OBJ \
+$(OBJDIR)\VG96DRVR.OBJ \
+$(OBJDIR)\VGDRVR.OBJ
+
+# More object files
+OBJSSUB = \
+$(INITSUB)\$(OBJDIR)\DAC.OBJ \
+$(INITSUB)\$(OBJDIR)\GAMMA.OBJ \
+$(INITSUB)\$(OBJDIR)\GDEBUG.OBJ \
+$(INITSUB)\$(OBJDIR)\INFO.OBJ \
+$(INITSUB)\$(OBJDIR)\PARSE.OBJ \
+$(INITSUB)\$(OBJDIR)\PRINT.OBJ \
+$(INITSUB)\$(OBJDIR)\SLI.OBJ \
+$(INITSUB)\$(OBJDIR)\SST1INIT.OBJ \
+$(INITSUB)\$(OBJDIR)\UTIL.OBJ \
+$(INITSUB)\$(OBJDIR)\VIDEO.OBJ
+
+
+# Target name - name of the library without extention and path.
+TARGET  = init
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        initsub \
+        $(OBJDIR)\$(TARGET).lib \
+
+
+# Make objectfiles in subdirectories.
+initsub:
+    cd $(INITSUB)
+    $(MAKE_CMD) all
     cd ..
 
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS) $(OBJSSUB);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
@@ -43,15 +84,15 @@
         ..\incsrc\*.h ..\..\swlibs\fxmisc\*.h initvg\*.h ..\glide\*.h ..\texus\*.h ..\..\swlibs\pcilib\*.h
     cd initvg
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
+    cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+
+
+# extra clean rule
+clean2:
     cd initvg
     $(MAKE_CMD) clean
     cd ..
-
Index: trunk/src/opengl/glide/sst1/makefile
===================================================================
--- trunk/src/opengl/glide/sst1/makefile	(revision 3028)
+++ trunk/src/opengl/glide/sst1/makefile	(revision 3031)
@@ -1,9 +1,11 @@
-# $Id: makefile,v 1.2 2000-03-04 20:03:43 bird Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:44 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       sst1\Glide makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
 PDWIN32_LIB = ..\..\..\..\lib
@@ -11,39 +13,45 @@
 PDWIN32_TOOLS = ..\..\..\..\tools\bin
 
+
+# Have extra clean rule.
+CLEAN2 = 1
+
+# Compiler, tools, and interference rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.mk
+
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\initterm.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = glide2x
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS = $(CFLAGS)  -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS)  -I$(PDWIN32_INCLUDE)
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        libs \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
-OBJS =  initterm.obj \
-        glideres.obj \
-        ..\swlibs\pcilib\pcilib.lib \
-        texus\texus.lib \
-        init\init.lib \
-        glide\glide.lib \
 
-all: ..\swlibs\pcilib\pcilib.lib init\init.lib texus\texus.lib glide\glide.lib $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-..\swlibs\pcilib\pcilib.lib:
+
+# Libs rule - Make (sub) libraries. (Not import libraries!)
+libs:
     cd ..\swlibs\pcilib
-    $(MAKE_CMD)
-    cd ..\..\sst1
-
-init\init.lib:
-    cd init
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\..\sst1\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
+    cd ..\texus
+    $(MAKE_CMD) $@
     cd ..
 
-glide\glide.lib:
-    cd glide
-    $(MAKE_CMD)
-    cd ..
-
-texus\texus.lib:
-    cd texus
-    $(MAKE_CMD)
-    cd ..
 
 $(TARGET).dll: $(OBJS) $(TARGET).def
@@ -51,49 +59,60 @@
           $(PDWIN32_LIB)/kernel32.lib \
           $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)\Glide\Voodoo1
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+..\swlibs\pcilib\$(OBJDIR)\pcilib.lib
+texus\$(OBJDIR)\texus.lib
+init\$(OBJDIR)\init.lib
+glide\$(OBJDIR)\glide.lib
+$(PDWIN32_LIB)\kernel32.lib
+$(PDWIN32_LIB)\odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Copy rule.
+$(PDWIN32_BIN)\Glide\Voodoo1\$(TARGET).dll: $(OBJDIR)\$(TARGET).dll
     $(CP) $** $@
 
-$(TARGET).lib: $(TARGET).def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET).def
-    $(CP) $@ $(PDWIN32_LIB)
 
-RCFLAGS = $(RCFLAGS) -I..\swlibs\fxmisc -Iglide
-
-glideres.asm: glide\glide.rc
-    $(RC) $(RCFLAGS) -o glideres.asm glide\glide.rc
-
-initterm.obj: initterm.cpp
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd ..\swlibs\pcilib
-    $(MAKE_CMD) dep
-    cd ..\..\sst1\glide
-    $(MAKE_CMD) dep
-    cd ..\init
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
+    cd ..\..\sst1\init
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
     cd ..\texus
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.map *.dll
-    $(RM) *.lib
-    $(RM) glideres.asm
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+
+
+# Extra clean rule
+clean2:
     cd ..\swlibs\pcilib
     $(MAKE_CMD) clean
-    cd ..\..\sst1\glide
+    cd ..\..\sst1\init
     $(MAKE_CMD) clean
-    cd ..\init
+    cd ..\glide
     $(MAKE_CMD) clean
     cd ..\texus
Index: trunk/src/opengl/glide/sst1/texus/makefile
===================================================================
--- trunk/src/opengl/glide/sst1/texus/makefile	(revision 3028)
+++ trunk/src/opengl/glide/sst1/texus/makefile	(revision 3031)
@@ -1,45 +1,84 @@
-# $Id: makefile,v 1.1 2000-02-25 00:31:37 sandervl Exp $
+# $Id: makefile,v 1.2 2000-03-06 23:33:47 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       Texus makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=TEXUS
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\3dfx.mak
 
-CINCLUDE=-I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\glide;..\..\swlibs\pcilib
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
+CINCLUDE    = -I..\incsrc;..\..\swlibs\fxmisc;..\init\initvg;..\init;..\glide;..\..\swlibs\pcilib
+CFLAGS      = $(CFLAGS) $(CINCLUDE)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)
 
-OBJS =	3DF.OBJ         CLAMP.OBJ       DEQUANT.OBJ     DIFFUSE.OBJ     GLDUTIL.OBJ \
-	MIPMAP.OBJ      NCC.OBJ         NCCNNET.OBJ     PAL256.OBJ      PPM.OBJ \
-	QUANTIZE.OBJ    READ.OBJ        RESAMPLE.OBJ    RGT.OBJ         TEXUSLIB.OBJ \
-	TGA.OBJ         UTIL.OBJ        VIEW.OBJ        WRITE.OBJ
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\3DF.OBJ \
+$(OBJDIR)\CLAMP.OBJ \
+$(OBJDIR)\DEQUANT.OBJ \
+$(OBJDIR)\DIFFUSE.OBJ \
+$(OBJDIR)\GLDUTIL.OBJ \
+$(OBJDIR)\MIPMAP.OBJ \
+$(OBJDIR)\NCC.OBJ \
+$(OBJDIR)\NCCNNET.OBJ \
+$(OBJDIR)\PAL256.OBJ \
+$(OBJDIR)\PPM.OBJ \
+$(OBJDIR)\QUANTIZE.OBJ \
+$(OBJDIR)\READ.OBJ \
+$(OBJDIR)\RESAMPLE.OBJ \
+$(OBJDIR)\RGT.OBJ \
+$(OBJDIR)\TEXUSLIB.OBJ \
+$(OBJDIR)\TGA.OBJ \
+$(OBJDIR)\UTIL.OBJ \
+$(OBJDIR)\VIEW.OBJ \
+$(OBJDIR)\WRITE.OBJ
 
-$(TARGET).lib: $(OBJS)
-	$(RM) $(TARGET).lib
-	$(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = texus
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\init\initvg\*.h ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h 
+        ..\incsrc\*.h ..\..\swlibs\fxmisc*.h ..\init\initvg\*.h \
+        ..\glide\*.h ..\init\*.h ..\..\swlibs\pcilib\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/glide/swlibs/pcilib/makefile
===================================================================
--- trunk/src/opengl/glide/swlibs/pcilib/makefile	(revision 3028)
+++ trunk/src/opengl/glide/swlibs/pcilib/makefile	(revision 3031)
@@ -1,18 +1,27 @@
-# $Id: makefile,v 1.2 2000-03-02 13:22:02 sandervl Exp $
+# $Id: makefile,v 1.3 2000-03-06 23:33:47 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       Glide makefile
+#       swlibs\pcilib makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
-TARGET=pcilib
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 !include ..\..\sst1\3dfx.mak
+
+
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
 CINCLUDE=-I..\..\sst1\incsrc;..\fxmisc;..\..\sst1\init\initvg;..\..\sst1\glide;..\..\sst1\texus;..\..\sst1\init;$(PDWIN32_INCLUDE)
@@ -21,23 +30,41 @@
 CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)
 
-OBJS = fxos2.obj fxpci.obj sst1_pci.obj fxinfo.obj
 
-all: $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\fxos2.obj \
+$(OBJDIR)\fxpci.obj \
+$(OBJDIR)\sst1_pci.obj \
+$(OBJDIR)\fxinfo.obj
 
-$(TARGET).lib: $(OBJS)
-	$(RM) $(TARGET).lib
-	$(ILIB) $(ILIBFLAGS) $(TARGET).lib $(OBJS) ,,
 
+# Target name - name of the library without extention and path.
+TARGET  = pcilib
+
+
+# All rule - build objs and target library.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win $(CINCLUDE) \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h \
-        ..\..\sst1\incsrc\*.h ..\fxmisc\*.h ..\..\sst1\init\initvg\*.h ..\..\sst1\glide*.h ..\..\sst1\texus\*.h ..\..\sst1\init\*.h 
+        ..\..\sst1\incsrc\*.h ..\fxmisc\*.h ..\..\sst1\init\initvg\*.h \
+        ..\..\sst1\glide*.h ..\..\sst1\texus\*.h ..\..\sst1\init\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.pch
-    $(RM) *.lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/glu/glu32.rc
===================================================================
--- trunk/src/opengl/glu/glu32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: glu32.rc,v 1.1 2000-02-09 13:44:31 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Silicon Graphics, Inc\0"
-            VALUE "FileDescription", "OpenGL Utility Library DLL\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "glu32\0"
-            VALUE "LegalCopyright", "Copyright (C) 2000 Silicon Graphics, Inc\0"
-            VALUE "LegalTrademarks", "Copryright (C) Silicon Graphics, Inc\0"
-            VALUE "OriginalFilename", "glu32\0"
-            VALUE "ProductName", "Odin32 - GLU32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/opengl/glu/glu32rsrc.orc
===================================================================
--- trunk/src/opengl/glu/glu32rsrc.orc	(revision 3031)
+++ trunk/src/opengl/glu/glu32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: glu32rsrc.orc,v 1.1 2000-03-06 23:33:48 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Silicon Graphics, Inc\0"
+            VALUE "FileDescription", "OpenGL Utility Library DLL\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "glu32\0"
+            VALUE "LegalCopyright", "Copyright (C) 2000 Silicon Graphics, Inc\0"
+            VALUE "LegalTrademarks", "Copryright (C) Silicon Graphics, Inc\0"
+            VALUE "OriginalFilename", "glu32\0"
+            VALUE "ProductName", "Odin32 - GLU32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/opengl/glu/makefile
===================================================================
--- trunk/src/opengl/glu/makefile	(revision 3028)
+++ trunk/src/opengl/glu/makefile	(revision 3031)
@@ -1,323 +1,80 @@
-# $Id: makefile,v 1.11 2000-03-04 19:49:55 bird Exp $
+# $Id: makefile,v 1.12 2000-03-06 23:33:48 bird Exp $
 
 #
-# PD-Win32
+# Odin32 API
 #
 # Top-level makefile for glu32
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\lib
+PDWIN32_BIN     = ..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\tools\bin
 
+# Have extra clean rule.
+CLEAN2 = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa\GL
 
-TARGET = GLU32
+# Flag overloads and local macros.
+CLEANEXTRAS = glu32rsrc.asm
 
-all: $(TARGET).DLL $(TARGET).LIB
-
-SOURCES = \
-  nurbs\interface\bezierEval.cpp \
-  nurbs\interface\bezierPatch.cpp \
-  nurbs\interface\bezierPatchMesh.cpp \
-  nurbs\interface\glcurveval.cpp \
-  nurbs\interface\glinterface.cpp \
-  nurbs\interface\glrenderer.cpp \
-  nurbs\interface\glsurfeval.cpp \
-  nurbs\interface\incurveeval.cpp \
-  nurbs\interface\insurfeval.cpp \
-  nurbs\interface\bezierEval.h \
-  nurbs\interface\bezierPatch.h \
-  nurbs\interface\bezierPatchMesh.h \
-  nurbs\interface\glcurveval.h \
-  nurbs\interface\glimports.h \
-  nurbs\interface\glrenderer.h \
-  nurbs\interface\glsurfeval.h \
-  nurbs\interface\mystdio.h \
-  nurbs\interface\mystdlib.h \
-  nurbs\internals\arc.cpp \
-  nurbs\internals\arcsorter.cpp \
-  nurbs\internals\arctess.cpp \
-  nurbs\internals\backend.cpp \
-  nurbs\internals\basiccrveval.cpp \
-  nurbs\internals\basicsurfeval.cpp \
-  nurbs\internals\bin.cpp \
-  nurbs\internals\bufpool.cpp \
-  nurbs\internals\cachingeval.cpp \
-  nurbs\internals\ccw.cpp \
-  nurbs\internals\coveandtiler.cpp \
-  nurbs\internals\curve.cpp \
-  nurbs\internals\curvelist.cpp \
-  nurbs\internals\curvesub.cpp \
-  nurbs\internals\dataTransform.cpp \
-  nurbs\internals\displaylist.cpp \
-  nurbs\internals\flist.cpp \
-  nurbs\internals\flistsorter.cpp \
-  nurbs\internals\hull.cpp \
-  nurbs\internals\intersect.cpp \
-  nurbs\internals\knotvector.cpp \
-  nurbs\internals\mapdesc.cpp \
-  nurbs\internals\mapdescv.cpp \
-  nurbs\internals\maplist.cpp \
-  nurbs\internals\mesher.cpp \
-  nurbs\internals\monotonizer.cpp \
-  nurbs\internals\monoTriangulationBackend.cpp \
-  nurbs\internals\mycode.cpp \
-  nurbs\internals\nurbsinterfac.cpp \
-  nurbs\internals\nurbstess.cpp \
-  nurbs\internals\patch.cpp \
-  nurbs\internals\patchlist.cpp \
-  nurbs\internals\quilt.cpp \
-  nurbs\internals\reader.cpp \
-  nurbs\internals\renderhints.cpp \
-  nurbs\internals\slicer.cpp \
-  nurbs\internals\sorter.cpp \
-  nurbs\internals\splitarcs.cpp \
-  nurbs\internals\subdivider.cpp \
-  nurbs\internals\tobezier.cpp \
-  nurbs\internals\trimline.cpp \
-  nurbs\internals\trimregion.cpp \
-  nurbs\internals\trimvertpool.cpp \
-  nurbs\internals\uarray.cpp \
-  nurbs\internals\varray.cpp \
-  nurbs\internals\arc.h \
-  nurbs\internals\arcsorter.h \
-  nurbs\internals\arctess.h \
-  nurbs\internals\backend.h \
-  nurbs\internals\basiccrveval.h \
-  nurbs\internals\basicsurfeval.h \
-  nurbs\internals\bezierarc.h \
-  nurbs\internals\bin.h \
-  nurbs\internals\bufpool.h \
-  nurbs\internals\cachingeval.h \
-  nurbs\internals\coveandtiler.h \
-  nurbs\internals\curve.h \
-  nurbs\internals\curvelist.h \
-  nurbs\internals\dataTransform.h \
-  nurbs\internals\defines.h \
-  nurbs\internals\displaylist.h \
-  nurbs\internals\displaymode.h \
-  nurbs\internals\flist.h \
-  nurbs\internals\flistsorter.h \
-  nurbs\internals\gridline.h \
-  nurbs\internals\gridtrimvertex.h \
-  nurbs\internals\gridvertex.h \
-  nurbs\internals\hull.h \
-  nurbs\internals\jarcloc.h \
-  nurbs\internals\knotvector.h \
-  nurbs\internals\mapdesc.h \
-  nurbs\internals\maplist.h \
-  nurbs\internals\mesher.h \
-  nurbs\internals\myassert.h \
-  nurbs\internals\mymath.h \
-  nurbs\internals\mysetjmp.h \
-  nurbs\internals\mystring.h \
-  nurbs\internals\nurbsconsts.h \
-  nurbs\internals\nurbstess.h \
-  nurbs\internals\patch.h \
-  nurbs\internals\patchlist.h \
-  nurbs\internals\pwlarc.h \
-  nurbs\internals\quilt.h \
-  nurbs\internals\reader.h \
-  nurbs\internals\renderhints.h \
-  nurbs\internals\simplemath.h \
-  nurbs\internals\slicer.h \
-  nurbs\internals\sorter.h \
-  nurbs\internals\subdivider.h \
-  nurbs\internals\trimline.h \
-  nurbs\internals\trimregion.h \
-  nurbs\internals\trimvertex.h \
-  nurbs\internals\trimvertpool.h \
-  nurbs\internals\types.h \
-  nurbs\internals\uarray.h \
-  nurbs\internals\varray.h \
-  nurbs\nurbtess\directedLine.cpp \
-  nurbs\nurbtess\gridWrap.cpp \
-  nurbs\nurbtess\monoChain.cpp \
-  nurbs\nurbtess\monoPolyPart.cpp \
-  nurbs\nurbtess\monoTriangulation.cpp \
-  nurbs\nurbtess\partitionX.cpp \
-  nurbs\nurbtess\partitionY.cpp \
-  nurbs\nurbtess\polyDBG.cpp \
-  nurbs\nurbtess\polyUtil.cpp \
-  nurbs\nurbtess\primitiveStream.cpp \
-  nurbs\nurbtess\quicksort.cpp \
-  nurbs\nurbtess\rectBlock.cpp \
-  nurbs\nurbtess\sampleComp.cpp \
-  nurbs\nurbtess\sampleCompBot.cpp \
-  nurbs\nurbtess\sampleCompRight.cpp \
-  nurbs\nurbtess\sampleCompTop.cpp \
-  nurbs\nurbtess\sampledLine.cpp \
-  nurbs\nurbtess\sampleMonoPoly.cpp \
-  nurbs\nurbtess\searchTree.cpp \
-  nurbs\nurbtess\definitions.h \
-  nurbs\nurbtess\directedLine.h \
-  nurbs\nurbtess\glimports.h \
-  nurbs\nurbtess\gridWrap.h \
-  nurbs\nurbtess\monoChain.h \
-  nurbs\nurbtess\monoPolyPart.h \
-  nurbs\nurbtess\monoTriangulation.h \
-  nurbs\nurbtess\mystdio.h \
-  nurbs\nurbtess\mystdlib.h \
-  nurbs\nurbtess\partitionX.h \
-  nurbs\nurbtess\partitionY.h \
-  nurbs\nurbtess\polyDBG.h \
-  nurbs\nurbtess\polyUtil.h \
-  nurbs\nurbtess\primitiveStream.h \
-  nurbs\nurbtess\quicksort.h \
-  nurbs\nurbtess\rectBlock.h \
-  nurbs\nurbtess\sampleComp.h \
-  nurbs\nurbtess\sampleCompBot.h \
-  nurbs\nurbtess\sampleCompRight.h \
-  nurbs\nurbtess\sampleCompTop.h \
-  nurbs\nurbtess\sampledLine.h \
-  nurbs\nurbtess\sampleMonoPoly.h \
-  nurbs\nurbtess\searchTree.h \
-  nurbs\nurbtess\zlassert.h \
-  tess\dict.c \
-  tess\geom.c \
-  tess\memalloc.c \
-  tess\mesh.c \
-  tess\normal.c \
-  tess\priorityq.c \
-  tess\render.c \
-  tess\sweep.c \
-  tess\tess.c \
-  tess\tessmono.c \
-  tess\dict-list.h \
-  tess\dict.h \
-  tess\geom.h \
-  tess\memalloc.h \
-  tess\mesh.h \
-  tess\normal.h \
-  tess\priorityq-heap.h \
-  tess\priorityq-sort.h \
-  tess\priorityq.h \
-  tess\render.h \
-  tess\sweep.h \
-  tess\tess.h \
-  tess\tessmono.h \
-  util\glue.c \
-  util\error.c \
-  util\mipmap.c \
-  util\project.c \
-  util\quad.c \
-  util\registry.c \
-  util\gluint.h
-
-OBJS = \
-  initterm.obj \
-  resource.obj \
-  nurbs\interface\bezierEval.obj \
-  nurbs\interface\bezierPatch.obj \
-  nurbs\interface\bezierPatchMesh.obj \
-  nurbs\interface\glcurveval.obj \
-  nurbs\interface\glinterface.obj \
-  nurbs\interface\glrenderer.obj \
-  nurbs\interface\glsurfeval.obj \
-  nurbs\interface\incurveeval.obj \
-  nurbs\interface\insurfeval.obj \
-  nurbs\internals\arc.obj \
-  nurbs\internals\arcsorter.obj \
-  nurbs\internals\arctess.obj \
-  nurbs\internals\backend.obj \
-  nurbs\internals\basiccrveval.obj \
-  nurbs\internals\basicsurfeval.obj \
-  nurbs\internals\bin.obj \
-  nurbs\internals\bufpool.obj \
-  nurbs\internals\cachingeval.obj \
-  nurbs\internals\ccw.obj \
-  nurbs\internals\coveandtiler.obj \
-  nurbs\internals\curve.obj \
-  nurbs\internals\curvelist.obj \
-  nurbs\internals\curvesub.obj \
-  nurbs\internals\dataTransform.obj \
-  nurbs\internals\displaylist.obj \
-  nurbs\internals\flist.obj \
-  nurbs\internals\flistsorter.obj \
-  nurbs\internals\hull.obj \
-  nurbs\internals\intersect.obj \
-  nurbs\internals\knotvector.obj \
-  nurbs\internals\mapdesc.obj \
-  nurbs\internals\mapdescv.obj \
-  nurbs\internals\maplist.obj \
-  nurbs\internals\mesher.obj \
-  nurbs\internals\monotonizer.obj \
-  nurbs\internals\monoTriangulationBackend.obj \
-  nurbs\internals\mycode.obj \
-  nurbs\internals\nurbsinterfac.obj \
-  nurbs\internals\nurbstess.obj \
-  nurbs\internals\patch.obj \
-  nurbs\internals\patchlist.obj \
-  nurbs\internals\quilt.obj \
-  nurbs\internals\reader.obj \
-  nurbs\internals\renderhints.obj \
-  nurbs\internals\slicer.obj \
-  nurbs\internals\sorter.obj \
-  nurbs\internals\splitarcs.obj \
-  nurbs\internals\subdivider.obj \
-  nurbs\internals\tobezier.obj \
-  nurbs\internals\trimline.obj \
-  nurbs\internals\trimregion.obj \
-  nurbs\internals\trimvertpool.obj \
-  nurbs\internals\uarray.obj \
-  nurbs\internals\varray.obj \
-  nurbs\nurbtess\directedLine.obj \
-  nurbs\nurbtess\gridWrap.obj \
-  nurbs\nurbtess\monoChain.obj \
-  nurbs\nurbtess\monoPolyPart.obj \
-  nurbs\nurbtess\monoTriangulation.obj \
-  nurbs\nurbtess\partitionX.obj \
-  nurbs\nurbtess\partitionY.obj \
-  nurbs\nurbtess\polyDBG.obj \
-  nurbs\nurbtess\polyUtil.obj \
-  nurbs\nurbtess\primitiveStream.obj \
-  nurbs\nurbtess\quicksort.obj \
-  nurbs\nurbtess\rectBlock.obj \
-  nurbs\nurbtess\sampleComp.obj \
-  nurbs\nurbtess\sampleCompBot.obj \
-  nurbs\nurbtess\sampleCompRight.obj \
-  nurbs\nurbtess\sampleCompTop.obj \
-  nurbs\nurbtess\sampledLine.obj \
-  nurbs\nurbtess\sampleMonoPoly.obj \
-  nurbs\nurbtess\searchTree.obj \
-  tess\dict.obj \
-  tess\geom.obj \
-  tess\memalloc.obj \
-  tess\mesh.obj \
-  tess\normal.obj \
-  tess\priorityq.obj \
-  tess\render.obj \
-  tess\sweep.obj \
-  tess\tess.obj \
-  tess\tessmono.obj \
-  util\glue.obj \
-  util\error.obj \
-  util\mipmap.obj \
-  util\project.obj \
-  util\quad.obj \
-  util\registry.obj
+CFLAGS      = $(CFLAGS) -I..\mesa\GL
+CXXFLAGS    = $(CXXFLAGS) -I..\mesa\GL
 
 
-$(TARGET).DLL: $(SOURCES) initterm.obj resource.obj $(TARGET).lrf $(TARGET).def
-    cd util
-    $(MAKE_CMD)
-    cd ..\tess
-    $(MAKE_CMD)
-    cd ..\nurbs
-    $(MAKE_CMD)
-    cd ..
-    $(LD2) $(LD2FLAGS) /FREE @$(TARGET).lrf
-    $(CP) $@ $(PDWIN32_BIN)
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\glu32rsrc.obj
 
 
-$(TARGET).lrf: makefile
-    @echo Creating file <<$(@B).lrf
+# Target name - name of the library without extention and path.
+TARGET = glu32
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Libs rule - Make (sub) libraries. (Not import libraries!)
+libs:
+    cd util
+    $(MAKE_CMD) $@
+    cd ..\tess
+    $(MAKE_CMD) $@
+    cd ..\nurbs
+    $(MAKE_CMD) $@
+    cd ..
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) libs $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
-/OUT:$(TARGET).DLL
+nurbs\interface\$(OBJDIR)\interface.lib
+nurbs\internals\$(OBJDIR)\internals.lib
+nurbs\nurbtess\$(OBJDIR)\nurbtess.lib
+tess\$(OBJDIR)\tess.lib
+util\$(OBJDIR)\util.lib
 $(PDWIN32_LIB)\ODINCRT.LIB
 $(PDWIN32_LIB)\KERNEL32.LIB
@@ -329,35 +86,19 @@
 
 
-$(TARGET).lib: $(TARGET)exp.def
-        $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-        $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-        $(IMPDEF) $** $@
-
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \
     *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
     cd util
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..\tess
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..\nurbs
-    $(MAKE_CMD) dep
+    $(MAKE_CMD) $@
     cd ..
 
-!ifndef NODEP
-!include .depend
-!endif
 
-
-clean:
-    $(RM) *.obj *.dll *.lib *.lrf *exp.def resource.asm \
-      $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
+# Extra Clean.
+clean2:
     cd util
     $(MAKE_CMD) clean
@@ -368,2 +109,6 @@
     cd ..
 
+
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
+
Index: trunk/src/opengl/glu/nurbs/interface/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/interface/makefile	(revision 3028)
+++ trunk/src/opengl/glu/nurbs/interface/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.5 2000-03-01 14:50:16 sandervl Exp $
+# $Id: makefile,v 1.6 2000-03-06 23:33:49 bird Exp $
 #
 # PD-Win32 API
@@ -6,34 +6,68 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess -I$(PDWIN32_INCLUDE) -I..\..\include  -I..\..\..\mesa
 
-CFLAGS = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS = glcurveval.obj glinterface.obj glrenderer.obj glsurfeval.obj \
-       insurfeval.obj bezierPatch.obj bezierEval.obj bezierPatchMesh.obj \
-       incurveeval.obj
+CINCLUDE    = -I..\..\..\mesa\GL -I..\.. -I..\internals -I..\nurbtess \
+              -I..\..\include  -I..\..\..\mesa
 
-all: $(OBJS)
+CFLAGS      = $(CFLAGS) $(CINCLUDE)  -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\glcurveval.obj \
+$(OBJDIR)\glinterface.obj \
+$(OBJDIR)\glrenderer.obj \
+$(OBJDIR)\glsurfeval.obj \
+$(OBJDIR)\insurfeval.obj \
+$(OBJDIR)\bezierPatch.obj \
+$(OBJDIR)\bezierEval.obj \
+$(OBJDIR)\bezierPatchMesh.obj \
+$(OBJDIR)\incurveeval.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = interface
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
         ..\internals\*.h ..\nurbtess\*.h ..\..\..\mesa\GL\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.pch
-
Index: trunk/src/opengl/glu/nurbs/internals/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/internals/makefile	(revision 3028)
+++ trunk/src/opengl/glu/nurbs/internals/makefile	(revision 3031)
@@ -1,48 +1,113 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:49 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/nurbs/internals makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include -I$(PDWIN32_INCLUDE)
-CDEFS=-DSTANDALONE -DLIBRARYBUILD -DNDEBUG
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS)
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) $(CDEFS)
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS = arc.obj arcsorter.obj arctess.obj backend.obj basiccrveval.obj \
-       basicsurfeval.obj bin.obj bufpool.obj cachingeval.obj ccw.obj \
-       coveandtiler.obj curve.obj curvelist.obj curvesub.obj displaylist.obj \
-       flist.obj flistsorter.obj hull.obj intersect.obj knotvector.obj \
-       mapdesc.obj mapdescv.obj maplist.obj mesher.obj monotonizer.obj \
-       mycode.obj nurbsinterfac.obj nurbstess.obj patch.obj patchlist.obj \
-       quilt.obj reader.obj renderhints.obj slicer.obj sorter.obj \
-       splitarcs.obj subdivider.obj tobezier.obj trimline.obj trimregion.obj \
-       trimvertpool.obj uarray.obj varray.obj dataTransform.obj \
-       monoTriangulationBackend.obj
+CINCLUDE    = -I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include
+CDEFS       = -DSTANDALONE -DLIBRARYBUILD -DNDEBUG
 
-all: $(OBJS)
+CFLAGS      = $(CFLAGS) $(CINCLUDE) $(CDEFS)
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) $(CDEFS)
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\arc.obj \
+$(OBJDIR)\arcsorter.obj \
+$(OBJDIR)\arctess.obj \
+$(OBJDIR)\backend.obj \
+$(OBJDIR)\basiccrveval.obj \
+$(OBJDIR)\basicsurfeval.obj \
+$(OBJDIR)\bin.obj \
+$(OBJDIR)\bufpool.obj \
+$(OBJDIR)\cachingeval.obj \
+$(OBJDIR)\ccw.obj \
+$(OBJDIR)\coveandtiler.obj \
+$(OBJDIR)\curve.obj \
+$(OBJDIR)\curvelist.obj \
+$(OBJDIR)\curvesub.obj \
+$(OBJDIR)\displaylist.obj \
+$(OBJDIR)\flist.obj \
+$(OBJDIR)\flistsorter.obj \
+$(OBJDIR)\hull.obj \
+$(OBJDIR)\intersect.obj \
+$(OBJDIR)\knotvector.obj \
+$(OBJDIR)\mapdesc.obj \
+$(OBJDIR)\mapdescv.obj \
+$(OBJDIR)\maplist.obj \
+$(OBJDIR)\mesher.obj \
+$(OBJDIR)\monotonizer.obj \
+$(OBJDIR)\mycode.obj
+
+OBJS2 = \
+$(OBJDIR)\nurbsinterfac.obj \
+$(OBJDIR)\nurbstess.obj \
+$(OBJDIR)\patch.obj \
+$(OBJDIR)\patchlist.obj \
+$(OBJDIR)\quilt.obj \
+$(OBJDIR)\reader.obj \
+$(OBJDIR)\renderhints.obj \
+$(OBJDIR)\slicer.obj \
+$(OBJDIR)\sorter.obj \
+$(OBJDIR)\splitarcs.obj \
+$(OBJDIR)\subdivider.obj \
+$(OBJDIR)\tobezier.obj \
+$(OBJDIR)\trimline.obj \
+$(OBJDIR)\trimregion.obj \
+$(OBJDIR)\trimvertpool.obj \
+$(OBJDIR)\uarray.obj \
+$(OBJDIR)\varray.obj \
+$(OBJDIR)\dataTransform.obj \
+$(OBJDIR)\monoTriangulationBackend.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = internals
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS) $(OBJS2)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS2);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
         ..\nurbtess\*.h ..\..\..\mesa\GL\*.h ..\..\include\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.pch
-
Index: trunk/src/opengl/glu/nurbs/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/makefile	(revision 3028)
+++ trunk/src/opengl/glu/nurbs/makefile	(revision 3031)
@@ -1,45 +1,29 @@
-# $Id: makefile,v 1.5 2000-03-04 19:59:20 bird Exp $
+# $Id: makefile,v 1.6 2000-03-06 23:33:48 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/nurbs makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
 PDWIN32_LIB     = ..\..\..\..\lib
-PDWIN32_BIN     = ..\..\..\..\bin
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
 PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-all:
+# All, libs, dep and clean rule.
+clean dep all libs:
     cd interface
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
     cd ..\internals
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
     cd ..\nurbtess
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
     cd ..
 
-
-dep:
-    cd interface
-    $(MAKE_CMD) dep
-    cd ..\internals
-    $(MAKE_CMD) dep
-    cd ..\nurbtess
-    $(MAKE_CMD) dep
-    cd ..
-
-
-clean:
-    cd interface
-    $(MAKE_CMD) clean
-    cd ..\internals
-    $(MAKE_CMD) clean
-    cd ..\nurbtess
-    $(MAKE_CMD) clean
-    cd ..
-
Index: trunk/src/opengl/glu/nurbs/nurbtess/makefile
===================================================================
--- trunk/src/opengl/glu/nurbs/nurbtess/makefile	(revision 3028)
+++ trunk/src/opengl/glu/nurbs/nurbtess/makefile	(revision 3031)
@@ -1,43 +1,82 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:49 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:49 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/nurbs/nurbtess makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CINCLUDE=-I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I$(PDWIN32_INCLUDE) -I..\..\include
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
-
-OBJS = directedLine.obj gridWrap.obj monoTriangulation.obj partitionY.obj \
-       polyDBG.obj polyUtil.obj primitiveStream.obj quicksort.obj \
-       rectBlock.obj sampleComp.obj sampleCompBot.obj sampleCompRight.obj \
-       sampleCompTop.obj sampleMonoPoly.obj sampledLine.obj searchTree.obj \
-       partitionX.obj monoChain.obj monoPolyPart.obj
-
-all: $(OBJS)
+CINCLUDE    = -I..\internals -I..\nurbtess -I..\..\..\mesa\GL -I..\..\include
+CFLAGS      = $(CFLAGS) $(CINCLUDE) -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -DNDEBUG
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\directedLine.obj \
+$(OBJDIR)\gridWrap.obj \
+$(OBJDIR)\monoTriangulation.obj \
+$(OBJDIR)\partitionY.obj \
+$(OBJDIR)\polyDBG.obj \
+$(OBJDIR)\polyUtil.obj \
+$(OBJDIR)\primitiveStream.obj \
+$(OBJDIR)\quicksort.obj \
+$(OBJDIR)\rectBlock.obj \
+$(OBJDIR)\sampleComp.obj \
+$(OBJDIR)\sampleCompBot.obj \
+$(OBJDIR)\sampleCompRight.obj \
+$(OBJDIR)\sampleCompTop.obj \
+$(OBJDIR)\sampleMonoPoly.obj \
+$(OBJDIR)\sampledLine.obj \
+$(OBJDIR)\searchTree.obj \
+$(OBJDIR)\partitionX.obj \
+$(OBJDIR)\monoChain.obj \
+$(OBJDIR)\monoPolyPart.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = nurbtess
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
         ..\..\mesa\*.h ..\nurbtess\*.h ..\internals\*.h ..\..\include\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.pch
-
Index: trunk/src/opengl/glu/tess/makefile
===================================================================
--- trunk/src/opengl/glu/tess/makefile	(revision 3028)
+++ trunk/src/opengl/glu/tess/makefile	(revision 3031)
@@ -1,38 +1,75 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:50 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/tess makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
-CDEFS=-DNDEBUG -Tdp
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) $(CDEFS) -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE) -$(CDEFS) -DNDEBUG
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS= dict.obj memalloc.obj mesh.obj normal.obj priorityq.obj \
-      render.obj sweep.obj tess.obj tessmono.obj geom.obj
-
-all: $(OBJS)
+CINCLUDE    = -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
+CDEFS       = -DNDEBUG -Tdp
+CFLAGS      = $(CFLAGS) $(CINCLUDE) $(CDEFS) -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE) -$(CDEFS) -DNDEBUG
 
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS= \
+$(OBJDIR)\dict.obj \
+$(OBJDIR)\memalloc.obj \
+$(OBJDIR)\mesh.obj \
+$(OBJDIR)\normal.obj \
+$(OBJDIR)\priorityq.obj \
+$(OBJDIR)\render.obj \
+$(OBJDIR)\sweep.obj \
+$(OBJDIR)\tess.obj \
+$(OBJDIR)\tessmono.obj \
+$(OBJDIR)\geom.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = tess
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc  \
         ..\..\mesa\*.h ..\*.h ..\include\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj
Index: trunk/src/opengl/glu/util/makefile
===================================================================
--- trunk/src/opengl/glu/util/makefile	(revision 3028)
+++ trunk/src/opengl/glu/util/makefile	(revision 3031)
@@ -1,36 +1,69 @@
-# $Id: makefile,v 1.3 2000-02-29 13:56:50 sandervl Exp $
+# $Id: makefile,v 1.4 2000-03-06 23:33:50 bird Exp $
+
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glu/util makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
-PDWIN32_LIB = ..\..\..\..\lib
-PDWIN32_BIN = ..\..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\..\lib
+PDWIN32_BIN     = ..\..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\..\tools\bin
 
 
+# Local cleanup only.
+LOCALCLEAN = 1
+
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CINCLUDE=-I.. -I..\..\mesa -I$(PDWIN32_INCLUDE) -I..\include -I..\..\mesa\GL
 
-CFLAGS = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG
-CXXFLAGS = $(CXXFLAGS) $(CINCLUDE)  -Tdp -DNDEBUG
+# Flag overloads and local macros.
+CLEANEXTRAS =
 
-OBJS= error.obj glue.obj mipmap.obj project.obj quad.obj registry.obj
-
-all: $(OBJS)
+CINCLUDE    = -I.. -I..\..\mesa -I..\include -I..\..\mesa\GL
+CFLAGS      = $(CFLAGS) $(CINCLUDE) -Tdp -DNDEBUG
+CXXFLAGS    = $(CXXFLAGS) $(CINCLUDE)  -Tdp -DNDEBUG
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\error.obj \
+$(OBJDIR)\glue.obj \
+$(OBJDIR)\mipmap.obj \
+$(OBJDIR)\project.obj \
+$(OBJDIR)\quad.obj \
+$(OBJDIR)\registry.obj
+
+
+# Target name - name of the library without extention and path.
+TARGET = util
+
+
+# Create all libraries (not importlibraries)
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).lib
+
+
+# Create all libraries (not importlibraries)
+libs: all
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+$(OBJDIR)\$(TARGET).lib: $(OBJS)
+    $(RM) $@
+    $(ILIB) $(ILIBFLAGS) $@ $(OBJS);
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) $(CINCLUDE) *.c *.cpp *.h *.asm *.inc \
         ..\include\*.h ..\..\mesa\*.h ..\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.map
Index: trunk/src/opengl/glut/Makefile
===================================================================
--- trunk/src/opengl/glut/Makefile	(revision 3028)
+++ trunk/src/opengl/glut/Makefile	(revision 3031)
@@ -1,48 +1,106 @@
-# $Id: Makefile,v 1.10 2000-03-05 10:19:37 jeroen Exp $
+# $Id: Makefile,v 1.11 2000-03-06 23:33:11 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       glut32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\include
-PDWIN32_LIB = ..\..\..\lib
-PDWIN32_BIN = ..\..\..\bin
-PDWIN32_TOOLS = ..\..\..\tools\bin
+PDWIN32_LIB     = ..\..\..\lib
+PDWIN32_BIN     = ..\..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS   = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
-CXXFLAGS = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -I..\mesa
+# Flag overloads and local macros.
+CLEANEXTRAS = 32rsrc.asm
 
-TARGET=GLUT32
-
-all: $(TARGET).DLL $(TARGET).LIB
-
-OBJS = glut_8x13.obj glut_9x15.obj glut_bitmap.obj glut_bwidth.obj glut_cindex.obj \
-       glut_cmap.obj glut_cursor.obj glut_dials.obj glut_dstr.obj glut_event.obj \
-       glut_ext.obj glut_fullscrn.obj glut_gamemode.obj glut_get.obj glut_hel10.obj \
-       glut_hel12.obj glut_hel18.obj glut_init.obj glut_input.obj glut_joy.obj glut_key.obj \
-       glut_keyctrl.obj glut_keyup.obj glut_mesa.obj glut_modifier.obj glut_mroman.obj \
-       glut_overlay.obj glut_roman.obj glut_shapes.obj glut_space.obj glut_stroke.obj \
-       glut_swap.obj glut_swidth.obj glut_tablet.obj glut_teapot.obj glut_tr10.obj \
-       glut_tr24.obj glut_util.obj glut_vidresize.obj glut_warp.obj glut_win.obj \
-       glut_winmisc.obj win32_glx.obj win32_menu.obj win32_util.obj win32_winproc.obj \
-       win32_x11.obj glut_term.obj initterm.obj resource.obj
-
-all: $(TARGET).DLL
-
-$(TARGET).DLL: $(OBJS) $(TARGET).def $(TARGET).lrf
-    $(LD2) $(LD2FLAGS) /FREE @$(TARGET).lrf
-    $(CP) $@ $(PDWIN32_BIN)
+CFLAGS      = -Tdp -I..\mesa\GL -I..\glu $(CFLAGS) -I..\mesa
+CXXFLAGS    = -Tdp -I..\mesa\GL -I..\glu $(CXXFLAGS) -I..\mesa
 
 
-$(TARGET).lrf: makefile
-    @echo Creating file <<$(@B).lrf
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\glut_8x13.obj \
+$(OBJDIR)\glut_9x15.obj \
+$(OBJDIR)\glut_bitmap.obj \
+$(OBJDIR)\glut_bwidth.obj \
+$(OBJDIR)\glut_cindex.obj \
+$(OBJDIR)\glut_cmap.obj \
+$(OBJDIR)\glut_cursor.obj \
+$(OBJDIR)\glut_dials.obj \
+$(OBJDIR)\glut_dstr.obj \
+$(OBJDIR)\glut_event.obj \
+$(OBJDIR)\glut_ext.obj \
+$(OBJDIR)\glut_fullscrn.obj \
+$(OBJDIR)\glut_gamemode.obj \
+$(OBJDIR)\glut_get.obj \
+$(OBJDIR)\glut_hel10.obj \
+$(OBJDIR)\glut_hel12.obj \
+$(OBJDIR)\glut_hel18.obj \
+$(OBJDIR)\glut_init.obj \
+$(OBJDIR)\glut_input.obj \
+$(OBJDIR)\glut_joy.obj \
+$(OBJDIR)\glut_key.obj \
+$(OBJDIR)\glut_keyctrl.obj \
+$(OBJDIR)\glut_keyup.obj \
+$(OBJDIR)\glut_mesa.obj \
+$(OBJDIR)\glut_modifier.obj \
+$(OBJDIR)\glut_mroman.obj \
+$(OBJDIR)\glut_overlay.obj \
+$(OBJDIR)\glut_roman.obj \
+$(OBJDIR)\glut_shapes.obj \
+$(OBJDIR)\glut_space.obj \
+$(OBJDIR)\glut_stroke.obj \
+$(OBJDIR)\glut_swap.obj \
+$(OBJDIR)\glut_swidth.obj \
+$(OBJDIR)\glut_tablet.obj \
+$(OBJDIR)\glut_teapot.obj \
+$(OBJDIR)\glut_tr10.obj \
+$(OBJDIR)\glut_tr24.obj \
+$(OBJDIR)\glut_util.obj \
+$(OBJDIR)\glut_vidresize.obj \
+$(OBJDIR)\glut_warp.obj \
+$(OBJDIR)\glut_win.obj \
+$(OBJDIR)\glut_winmisc.obj \
+$(OBJDIR)\win32_glx.obj \
+$(OBJDIR)\win32_menu.obj \
+$(OBJDIR)\win32_util.obj \
+$(OBJDIR)\win32_winproc.obj \
+$(OBJDIR)\win32_x11.obj \
+$(OBJDIR)\glut_term.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\glut32rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
+TARGET  = glut32
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
 $(OBJS)
-/OUT:$(TARGET).DLL /DLL
 $(PDWIN32_LIB)\ODINCRT.LIB
 $(RTLLIB_O)
@@ -58,26 +116,11 @@
 
 
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\mesa\GL \
         *.c *.cpp *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.lrf *exp.def resource.asm \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib
Index: trunk/src/opengl/glut/glut32.rc
===================================================================
--- trunk/src/opengl/glut/glut32.rc	(revision 3028)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/* $Id: glut32.rc,v 1.2 2000-03-04 19:10:14 jeroen Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "OpenGL Utility Toolkit DLL\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "glut32\0"
-            VALUE "LegalCopyright", "Copyright (C) 2000 Mark J. Kilgard, Nate Robins & others\0"
-            VALUE "LegalTrademarks", "Copryright (C) Mark J. Kilgard, Nate Robins & others\0"
-            VALUE "OriginalFilename", "glut32\0"
-            VALUE "ProductName", "Odin32 - GLUT32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/opengl/glut/glut32rsrc.orc
===================================================================
--- trunk/src/opengl/glut/glut32rsrc.orc	(revision 3031)
+++ trunk/src/opengl/glut/glut32rsrc.orc	(revision 3031)
@@ -0,0 +1,40 @@
+/* $Id: glut32rsrc.orc,v 1.1 2000-03-06 23:33:12 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "\0"
+            VALUE "FileDescription", "OpenGL Utility Toolkit DLL\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "glut32\0"
+            VALUE "LegalCopyright", "Copyright (C) 2000 Mark J. Kilgard, Nate Robins & others\0"
+            VALUE "LegalTrademarks", "Copryright (C) Mark J. Kilgard, Nate Robins & others\0"
+            VALUE "OriginalFilename", "glut32\0"
+            VALUE "ProductName", "Odin32 - GLUT32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/opengl/makefile
===================================================================
--- trunk/src/opengl/makefile	(revision 3028)
+++ trunk/src/opengl/makefile	(revision 3031)
@@ -1,161 +1,32 @@
-# $Id: makefile,v 1.16 2000-03-04 20:18:05 bird Exp $
+# $Id: makefile,v 1.17 2000-03-06 23:33:42 bird Exp $
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       opengl32.dll makefile
 #
 
+# Directories
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+
+# Common tools macros. (MAKE_CMD)
+!include $(PDWIN32_INCLUDE)\pdwin32.mk
 
 
-!include $(PDWIN32_INCLUDE)/pdwin32.mk
+# dummy all rule - invoking nmake withtout target caused it to do all of the targets below..
+_all: all
 
 
-#SvL: Only build the release version of glide, mesa & glu(t)
-#     There's no need for debug (even without dbg info) builds in the daily build archive
-# MAKE_CMD=nmake
-#KSO: Don't work as we use to have DEBUG defined as an enviroment variable.
-#     I have updated the opengl makefiles to consider NODEBUGINFO. If you don't wan't
-#     any debuginfo you could now add NODEBUGINFO=1 to MAKE_CMD.
-
-CFLAGS   = $(CFLAGS)   -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
-
-#TARGET1  = opengl32
-#DTARGET1 = opengl32
-TARGET2  = glu\glu32
-DTARGET2 = glu32
-TARGET3  = glut\glut32
-DTARGET3 = glut32
-TARGET4  = glide
-DTARGET4 = glide2x
-TARGET5  = mesa
-DTARGET5 = opengl32
-TARGET6  = 3dfxmesa
-
-#OBJS1=  opengl32.obj initterm.obj resource.obj
-
-#all: $(TARGET1).dll $(TARGET1).lib \
-all: $(TARGET5) $(TARGET2).dll $(TARGET2).lib \
-     $(TARGET3).dll $(TARGET3).lib $(TARGET4) $(TARGET6)
-
-#$(TARGET1).dll: $(OBJS1) $(TARGET1).def
-#    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS1) $(TARGET1).def \
-#          $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/kernel32.lib \
-#          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-#          OS2386.LIB $(RTLLIB_O)
-#    $(CP) $@ $(PDWIN32_BIN)
-
-
-#$(TARGET1).lib: $(TARGET1)exp.def
-#    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET1)exp.def
-#    $(CP) $@ $(PDWIN32_LIB)
-
-#$(TARGET1)exp.def: $(TARGET1).def
-#    $(IMPDEF) $** $@
-
-
-#resource.asm: $(TARGET1).rc
-#    $(RC) $(RCFLAGS) -o resource.asm $(TARGET1).rc
-
-
-$(TARGET2).dll:
-    cd glu
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET3).dll:
-    cd glut
-    $(MAKE_CMD)
-    cd ..
-
-
-$(TARGET2).lib:
-    cd glu
-    $(MAKE_CMD) $(@F)
-    cd ..
-
-
-$(TARGET3).lib:
-    cd glut
-    $(MAKE_CMD) $(@F)
-    cd ..
-
-
-$(TARGET4):
-    cd glide
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET5):
+# All, Lib, Clean and Dep rules.
+clean dep all lib:
     cd mesa
-    $(MAKE_CMD)
-    cd ..
-
-$(TARGET6):
-    cd mesa\3dfx
-    $(MAKE_CMD)
+    $(MAKE_CMD) $@
+    cd ..\glu
+    $(MAKE_CMD) $@
+    cd ..\glut
+    $(MAKE_CMD) $@
+    cd ..\glide
+    $(MAKE_CMD) $@
+    cd ..\mesa\3dfx
+    $(MAKE_CMD) $@
     cd ..\..
 
-#lib: $(TARGET1).lib $(PDWIN32_LIB)\$(DTARGET1).lib \
-lib: $(TARGET2).lib $(PDWIN32_LIB)\$(DTARGET2).lib \
-     $(TARGET3).lib $(PDWIN32_LIB)\$(DTARGET3).lib \
-     $(PDWIN32_LIB)\$(DTARGET4).lib \
-     $(PDWIN32_LIB)\$(DTARGET5).lib
-
-#$(PDWIN32_LIB)\$(DTARGET1).lib: $(TARGET1).lib
-#    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(DTARGET2).lib: $(TARGET2).lib
-    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(DTARGET3).lib: $(TARGET3).lib
-    $(CP) $** $@
-
-$(PDWIN32_LIB)\$(DTARGET4).lib:
-    cd glide
-    $(MAKE_CMD) lib
-    cd ..
-
-$(PDWIN32_LIB)\$(DTARGET5).lib:
-    cd mesa
-    $(MAKE_CMD) lib
-    cd ..
-
-dep:
-    $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
-        *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
-    cd glut
-    $(MAKE_CMD) dep
-    cd ..\glu
-    $(MAKE_CMD) dep
-    cd ..\glide
-    $(MAKE_CMD) dep
-    cd ..\mesa
-    $(MAKE_CMD) dep
-    cd 3dfx
-    $(MAKE_CMD) dep
-    cd ..\..
-
-!ifndef NODEP
-!include .depend
-!endif
-
-
-clean:
-    $(RM) *.obj *.lib *.dll *.map resource.asm *exp.def
-    cd glut
-    $(MAKE_CMD) clean
-    cd ..\glu
-    $(MAKE_CMD) clean
-    cd ..\glide
-    $(MAKE_CMD) clean
-    cd ..\mesa
-    $(MAKE_CMD) clean
-    cd 3dfx
-    $(MAKE_CMD) clean
-    cd ..\..
-
Index: trunk/src/opengl/mesa/3dfx/fxMesa32.orc
===================================================================
--- trunk/src/opengl/mesa/3dfx/fxMesa32.orc	(revision 3031)
+++ trunk/src/opengl/mesa/3dfx/fxMesa32.orc	(revision 3031)
@@ -0,0 +1,32 @@
+#include <windows.h>
+
+#define IDR_VERSION1  1
+IDR_VERSION1	VERSIONINFO
+  FILEVERSION	 3,1,0,0
+  PRODUCTVERSION 3,1,0,0
+  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
+  FILEFLAGS	0
+  FILEOS	VOS_DOS_WINDOWS32
+  FILETYPE	VFT_DLL
+  FILESUBTYPE	0	// not used
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, char set = Windows, Multilingual
+
+    BEGIN
+      VALUE "FileDescription", "fxmesa32 3D Graphics Library\0"
+      VALUE "FileVersion",	"3.1\0"
+      VALUE "InternalName",	"FXMESAGL32\0"
+      VALUE "OriginalFilename",	"OPENGL32.DLL\0"
+      VALUE "ProductName",	"OPENGL32.DLL\0"
+      VALUE "Comments",	"Thanks to Brian Paul for making this possible\r\nRequires GLIDE2X.DLL.\0"
+      VALUE "LegalCopyright", "Copyright (C) 1995-1997 Brian Paul\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END
Index: trunk/src/opengl/mesa/3dfx/fxMesa32.rc
===================================================================
--- trunk/src/opengl/mesa/3dfx/fxMesa32.rc	(revision 3028)
+++ 	(revision )
@@ -1,32 +1,0 @@
-#include <windows.h>
-
-#define IDR_VERSION1  1
-IDR_VERSION1	VERSIONINFO
-  FILEVERSION	 3,1,0,0
-  PRODUCTVERSION 3,1,0,0
-  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-  FILEFLAGS	0
-  FILEOS	VOS_DOS_WINDOWS32
-  FILETYPE	VFT_DLL
-  FILESUBTYPE	0	// not used
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    //language ID = U.S. English, char set = Windows, Multilingual
-
-    BEGIN
-      VALUE "FileDescription", "fxmesa32 3D Graphics Library\0"
-      VALUE "FileVersion",	"3.1\0"
-      VALUE "InternalName",	"FXMESAGL32\0"
-      VALUE "OriginalFilename",	"OPENGL32.DLL\0"
-      VALUE "ProductName",	"OPENGL32.DLL\0"
-      VALUE "Comments",	"Thanks to Brian Paul for making this possible\r\nRequires GLIDE2X.DLL.\0"
-      VALUE "LegalCopyright", "Copyright (C) 1995-1997 Brian Paul\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0409, 1252
-  END
-END
Index: trunk/src/opengl/mesa/3dfx/makefile
===================================================================
--- trunk/src/opengl/mesa/3dfx/makefile	(revision 3028)
+++ trunk/src/opengl/mesa/3dfx/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.5 2000-03-04 19:41:39 bird Exp $
+# $Id: makefile,v 1.6 2000-03-06 23:33:51 bird Exp $
 #
 # PD-Win32
@@ -6,4 +6,5 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\..\..\include
 PDWIN32_LIB = ..\..\..\..\lib
@@ -11,52 +12,140 @@
 PDWIN32_TOOLS = ..\..\..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
-
 MESADEFS= -DNO_PARALLEL -DNO_STEREO -DGL_MESA_window_pos -DTHREADS \
           -DUSE_X86_ASM_NOT -DUSE_MMX_ASM_NOT -DUSE_3DNOW_ASM_NOT \
           -DFX -DFX_V2 -DFX_SILENT -DBUILD_GL32
 
-CFLAGS   = -I.. -I..\GL $(CFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
-CXXFLAGS = -I.. -I..\GL $(CXXFLAGS_WIN32APP) -I$(PDWIN32_INCLUDE) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS)
+CFLAGS   = -I.. -I..\GL $(CFLAGS_WIN32APP) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS) /Wcnd- /Tdp
+CXXFLAGS = -I.. -I..\GL $(CXXFLAGS_WIN32APP) -I..\..\glut -I..\..\glide\cvg\glide -I..\..\glide\swlibs\fxmisc -I..\..\glide\cvg\incsrc $(MESADEFS)
 
-TARGET = OPENGL32
 
-all: $(TARGET).DLL
+#
+# Interference rule for sources in the parent directory.
+#
+{..}.c{$(OBJDIR)}.obj:
+    $(CC) $(CFLAGS) -c -Fo$(OBJDIR)\$(@B).obj $<
 
-OBJS =  fxapi.obj \
-    fxcva.obj \
-    fxclip.obj \
-    fxdd.obj \
-    fxddspan.obj \
-    fxddtex.obj \
-    fxglidew.obj \
-    fxfastpath.obj \
-    fxpipeline.obj \
-    fxrender.obj \
-    fxsanity.obj \
-    fxsetup.obj \
-    fxtexman.obj \
-    fxtrifuncs.obj \
-    fxvsetup.obj \
-    fxwgl.obj initterm.obj resource.obj \
-    accum.obj alpha.obj alphabuf.obj api1.obj api2.obj apiext.obj \
-    attrib.obj bbox.obj bitmap.obj blend.obj clip.obj colortab.obj config.obj context.obj \
-    copypix.obj cva.obj depth.obj dlist.obj drawpix.obj enable.obj enums.obj eval.obj \
-    extensions.obj feedback.obj fog.obj get.obj glmisc.obj hash.obj image.obj light.obj \
-    lines.obj logic.obj masking.obj matrix.obj mmath.obj mthreads.obj pb.obj pipeline.obj \
-    pixel.obj pointers.obj points.obj polygon.obj quads.obj rastpos.obj readpix.obj \
-    rect.obj scissor.obj shade.obj span.obj stages.obj stencil.obj teximage.obj texobj.obj texstate.obj \
-    texture.obj translate.obj triangle.obj varray.obj vb.obj vbcull.obj vbfill.obj \
-    vbindirect.obj vbrender.obj vbxform.obj vector.obj vertices.obj winpos.obj xform.obj zoom.obj \
-    osmesa.obj
 
-$(TARGET).DLL: $(OBJS) $(TARGET).lrf $(TARGET).def
-    -$(LD2) $(LD2FLAGS) /FREE /NOE @$(TARGET).lrf
-    $(CP) $@ $(PDWIN32_BIN)\Glide
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\fxapi.obj \
+$(OBJDIR)\fxcva.obj \
+$(OBJDIR)\fxclip.obj \
+$(OBJDIR)\fxdd.obj \
+$(OBJDIR)\fxddspan.obj \
+$(OBJDIR)\fxddtex.obj \
+$(OBJDIR)\fxglidew.obj \
+$(OBJDIR)\fxfastpath.obj \
+$(OBJDIR)\fxpipeline.obj \
+$(OBJDIR)\fxrender.obj \
+$(OBJDIR)\fxsanity.obj \
+$(OBJDIR)\fxsetup.obj \
+$(OBJDIR)\fxtexman.obj \
+$(OBJDIR)\fxtrifuncs.obj \
+$(OBJDIR)\fxvsetup.obj \
+$(OBJDIR)\fxwgl.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\fxmesa32.obj \
+$(OBJDIR)\accum.obj \
+$(OBJDIR)\alpha.obj \
+$(OBJDIR)\alphabuf.obj \
+$(OBJDIR)\api1.obj \
+$(OBJDIR)\api2.obj \
+$(OBJDIR)\apiext.obj \
+$(OBJDIR)\attrib.obj \
+$(OBJDIR)\bbox.obj \
+$(OBJDIR)\bitmap.obj \
+$(OBJDIR)\blend.obj \
+$(OBJDIR)\clip.obj \
+$(OBJDIR)\colortab.obj \
+$(OBJDIR)\config.obj \
+$(OBJDIR)\context.obj \
+$(OBJDIR)\copypix.obj \
+$(OBJDIR)\cva.obj \
+$(OBJDIR)\depth.obj \
+$(OBJDIR)\dlist.obj \
+$(OBJDIR)\drawpix.obj \
+$(OBJDIR)\enable.obj \
+$(OBJDIR)\enums.obj \
+$(OBJDIR)\eval.obj \
+$(OBJDIR)\extensions.obj \
+$(OBJDIR)\feedback.obj \
+$(OBJDIR)\fog.obj \
+$(OBJDIR)\get.obj \
+$(OBJDIR)\glmisc.obj \
+$(OBJDIR)\hash.obj \
+$(OBJDIR)\image.obj \
+$(OBJDIR)\light.obj \
+$(OBJDIR)\lines.obj \
+$(OBJDIR)\logic.obj \
+$(OBJDIR)\masking.obj \
+$(OBJDIR)\matrix.obj \
+$(OBJDIR)\mmath.obj \
+$(OBJDIR)\mthreads.obj \
+$(OBJDIR)\pb.obj \
+$(OBJDIR)\pipeline.obj \
+$(OBJDIR)\pixel.obj \
+$(OBJDIR)\pointers.obj \
+$(OBJDIR)\points.obj \
+$(OBJDIR)\polygon.obj \
+$(OBJDIR)\quads.obj \
+$(OBJDIR)\rastpos.obj \
+$(OBJDIR)\readpix.obj \
+$(OBJDIR)\rect.obj \
+$(OBJDIR)\scissor.obj \
+$(OBJDIR)\shade.obj \
+$(OBJDIR)\span.obj \
+$(OBJDIR)\stages.obj \
+$(OBJDIR)\stencil.obj \
+$(OBJDIR)\teximage.obj \
+$(OBJDIR)\texobj.obj \
+$(OBJDIR)\texstate.obj \
+$(OBJDIR)\texture.obj \
+$(OBJDIR)\translate.obj \
+$(OBJDIR)\triangle.obj \
+$(OBJDIR)\varray.obj \
+$(OBJDIR)\vb.obj \
+$(OBJDIR)\vbcull.obj \
+$(OBJDIR)\vbfill.obj \
+$(OBJDIR)\vbindirect.obj \
+$(OBJDIR)\vbrender.obj \
+$(OBJDIR)\vbxform.obj \
+$(OBJDIR)\vector.obj \
+$(OBJDIR)\vertices.obj \
+$(OBJDIR)\winpos.obj \
+$(OBJDIR)\xform.obj \
+$(OBJDIR)\zoom.obj \
+$(OBJDIR)\osmesa.obj
 
-$(TARGET).lrf: makefile
-  @echo Creating file <<$(@B).lrf
+
+# Target name - name of the dll without extention and path.
+TARGET = opengl32
+
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
-/OUT:$(TARGET).DLL
 $(PDWIN32_LIB)\ODINCRT.LIB
 $(PDWIN32_LIB)\KERNEL32.LIB
@@ -69,175 +158,12 @@
 <<keep
 
-resource.asm: fxmesa32.rc
-    $(RC) $(RCFLAGS) -o resource.asm fxmesa32.rc
 
-#
-# Tried to create a general interference rule for these?
-# As long as there isn't any .c, .cpp or .asm files with matching
-# names in the current directory thise shouldn't be any problem.
-# For example:
-#   {..}.c.obj:
-#       $(CC) $(CFLAGS) -c $<
-#
-# Regards knut.
-#
-
-accum.obj: ..\accum.c
-    $(CC) $(CFLAGS) -c ..\accum.c
-
-alpha.obj: ..\alpha.c
-    $(CC) $(CFLAGS) -c ..\alpha.c
-alphabuf.obj: ..\alphabuf.c
-    $(CC) $(CFLAGS) -c ..\alphabuf.c
-api1.obj: ..\api1.c
-    $(CC) $(CFLAGS) -c ..\api1.c
-api2.obj: ..\api2.c
-    $(CC) $(CFLAGS) -c ..\api2.c
-apiext.obj: ..\apiext.c
-    $(CC) $(CFLAGS) -c ..\apiext.c
-attrib.obj: ..\attrib.c
-    $(CC) $(CFLAGS) -c ..\attrib.c
-bbox.obj: ..\bbox.c
-    $(CC) $(CFLAGS) -c ..\bbox.c
-bitmap.obj: ..\bitmap.c
-    $(CC) $(CFLAGS) -c ..\bitmap.c
-blend.obj: ..\blend.c
-    $(CC) $(CFLAGS) -c ..\blend.c
-clip.obj: ..\clip.c
-    $(CC) $(CFLAGS) -c ..\clip.c
-colortab.obj: ..\colortab.c
-    $(CC) $(CFLAGS) -c ..\colortab.c
-config.obj: ..\config.c
-    $(CC) $(CFLAGS) -c ..\config.c
-context.obj: ..\context.c
-    $(CC) $(CFLAGS) -c ..\context.c
-copypix.obj: ..\copypix.c
-    $(CC) $(CFLAGS) -c ..\copypix.c
-cva.obj: ..\cva.c
-    $(CC) $(CFLAGS) -c ..\cva.c
-depth.obj: ..\depth.c
-    $(CC) $(CFLAGS) -c ..\depth.c
-dlist.obj: ..\dlist.c
-    $(CC) $(CFLAGS) -c ..\dlist.c
-drawpix.obj: ..\drawpix.c
-    $(CC) $(CFLAGS) -c ..\drawpix.c
-enable.obj: ..\enable.c
-    $(CC) $(CFLAGS) -c ..\enable.c
-enums.obj: ..\enums.c
-    $(CC) $(CFLAGS) -c ..\enums.c
-eval.obj: ..\eval.c
-    $(CC) $(CFLAGS) -c ..\eval.c
-extensions.obj: ..\extensions.c
-    $(CC) $(CFLAGS) -c ..\extensions.c
-feedback.obj: ..\feedback.c
-    $(CC) $(CFLAGS) -c ..\feedback.c
-fog.obj: ..\fog.c
-    $(CC) $(CFLAGS) -c ..\fog.c
-get.obj: ..\get.c
-    $(CC) $(CFLAGS) -c ..\get.c
-glmisc.obj: ..\glmisc.c
-    $(CC) $(CFLAGS) -c ..\glmisc.c
-hash.obj: ..\hash.c
-    $(CC) $(CFLAGS) -c ..\hash.c
-image.obj: ..\image.c
-    $(CC) $(CFLAGS) -c ..\image.c
-light.obj: ..\light.c
-    $(CC) $(CFLAGS) -c ..\light.c
-lines.obj: ..\lines.c
-    $(CC) $(CFLAGS) -c ..\lines.c
-logic.obj: ..\logic.c
-    $(CC) $(CFLAGS) -c ..\logic.c
-masking.obj: ..\masking.c
-    $(CC) $(CFLAGS) -c ..\masking.c
-matrix.obj: ..\matrix.c
-    $(CC) $(CFLAGS) -c ..\matrix.c
-mmath.obj: ..\mmath.c
-    $(CC) $(CFLAGS) -c ..\mmath.c
-mthreads.obj: ..\mthreads.c
-    $(CC) $(CFLAGS) -c ..\mthreads.c
-pb.obj: ..\pb.c
-    $(CC) $(CFLAGS) -c ..\pb.c
-pipeline.obj: ..\pipeline.c
-    $(CC) $(CFLAGS) -c ..\pipeline.c
-pixel.obj: ..\pixel.c
-    $(CC) $(CFLAGS) -c ..\pixel.c
-pointers.obj: ..\pointers.c
-    $(CC) $(CFLAGS) -c ..\pointers.c
-points.obj: ..\points.c
-    $(CC) $(CFLAGS) -c ..\points.c
-polygon.obj: ..\polygon.c
-    $(CC) $(CFLAGS) -c ..\polygon.c
-quads.obj: ..\quads.c
-    $(CC) $(CFLAGS) -c ..\quads.c
-rastpos.obj: ..\rastpos.c
-    $(CC) $(CFLAGS) -c ..\rastpos.c
-readpix.obj: ..\readpix.c
-    $(CC) $(CFLAGS) -c ..\readpix.c
-rect.obj: ..\rect.c
-    $(CC) $(CFLAGS) -c ..\rect.c
-scissor.obj: ..\scissor.c
-    $(CC) $(CFLAGS) -c ..\scissor.c
-shade.obj: ..\shade.c
-    $(CC) $(CFLAGS) -c ..\shade.c
-span.obj: ..\span.c
-    $(CC) $(CFLAGS) -c ..\span.c
-stages.obj: ..\stages.c
-    $(CC) $(CFLAGS) -c ..\stages.c
-stencil.obj: ..\stencil.c
-    $(CC) $(CFLAGS) -c ..\stencil.c
-teximage.obj: ..\teximage.c
-    $(CC) $(CFLAGS) -c ..\teximage.c
-texobj.obj: ..\texobj.c
-    $(CC) $(CFLAGS) -c ..\texobj.c
-texstate.obj: ..\texstate.c
-    $(CC) $(CFLAGS) -c ..\texstate.c
-texture.obj: ..\texture.c
-    $(CC) $(CFLAGS) -c ..\texture.c
-translate.obj: ..\translate.c
-    $(CC) $(CFLAGS) -c ..\translate.c
-triangle.obj: ..\triangle.c
-    $(CC) $(CFLAGS) -c ..\triangle.c
-varray.obj: ..\varray.c
-    $(CC) $(CFLAGS) -c ..\varray.c
-vb.obj: ..\vb.c
-    $(CC) $(CFLAGS) -c ..\vb.c
-vbcull.obj: ..\vbcull.c
-    $(CC) $(CFLAGS) -c ..\vbcull.c
-vbfill.obj: ..\vbfill.c
-    $(CC) $(CFLAGS) -c ..\vbfill.c
-vbindirect.obj: ..\vbindirect.c
-    $(CC) $(CFLAGS) -c ..\vbindirect.c
-vbrender.obj: ..\vbrender.c
-    $(CC) $(CFLAGS) -c ..\vbrender.c
-vbxform.obj: ..\vbxform.c
-    $(CC) $(CFLAGS) -c ..\vbxform.c
-vector.obj: ..\vector.c
-    $(CC) $(CFLAGS) -c ..\vector.c
-vertices.obj: ..\vertices.c
-    $(CC) $(CFLAGS) -c ..\vertices.c
-winpos.obj: ..\winpos.c
-    $(CC) $(CFLAGS) -c ..\winpos.c
-xform.obj: ..\xform.c
-    $(CC) $(CFLAGS) -c ..\xform.c
-zoom.obj: ..\zoom.c
-    $(CC) $(CFLAGS) -c ..\zoom.c
-osmesa.obj: ..\osmesa.c
-    $(CC) $(CFLAGS) -c ..\osmesa.c
-wmesa.obj: ..\wmesa.obj
-    $(CC) $(CFLAGS) -c ..\osmesa.obj
-internal.obj: ..\internal.c
-    $(CC) $(CFLAGS) -c ..\internal.c
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win -I..\..\glut -I..\GL -I.. -I$(PDWIN32_INCLUDE)\glide \
         *.c *.cpp *.h *.asm *.inc ..\*.c $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
-clean:
-    $(RM) *.obj *.dll *.lib *.lrf resource.asm $(PDWIN32_BIN)\$(TARGET).dll \
-        $(PDWIN32_LIB)\$(TARGET).lib
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/opengl/mesa/mesarsrc.orc
===================================================================
--- trunk/src/opengl/mesa/mesarsrc.orc	(revision 3031)
+++ trunk/src/opengl/mesa/mesarsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: mesarsrc.orc,v 1.1 2000-03-06 23:33:50 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "OpenGL Client DLL\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "opengl32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "opengl32\0"
+            VALUE "ProductName", "Odin32 - OPENGL32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/opengl/mesa/opengl32.rc
===================================================================
--- trunk/src/opengl/mesa/opengl32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: opengl32.rc,v 1.1 2000-03-01 18:49:33 jeroen Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "OpenGL Client DLL\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "opengl32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "opengl32\0"
-            VALUE "ProductName", "Odin32 - OPENGL32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/pe2lx/makefile
===================================================================
--- trunk/src/pe2lx/makefile	(revision 3028)
+++ trunk/src/pe2lx/makefile	(revision 3031)
@@ -1,8 +1,10 @@
-# $Id: makefile,v 1.9 1999-08-21 12:29:30 sandervl Exp $
+# $Id: makefile,v 1.10 2000-03-06 23:38:55 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
-#	pe2lx.exe makefile
+#       pe2lx.exe makefile
+#
+# WARNING: This is the old PE2LX. The new Pe2Lx is found in src\win32k\pe2lx.
 #
 
@@ -31,5 +33,5 @@
 
 $(TARGET).exe: $(OBJS)
-	$(LD) $(LDFLAGS) -Fe$@ $(OBJS) \
+        $(LD) $(LDFLAGS) -Fe$@ $(OBJS) \
         $(PDWIN32_LIB)\LIBCONV.LIB $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
         $(CP) $(TARGET).exe $(PDWIN32_BIN)
@@ -63,4 +65,4 @@
 
 clean:
-	$(RM) *.obj *.lib *.dll *~ *.map *.pch *.exe
-	$(RM) $(PDWIN32_BIN)\$(TARGET).exe
+        $(RM) *.obj *.lib *.dll *~ *.map *.pch *.exe
+        $(RM) $(PDWIN32_BIN)\$(TARGET).exe
Index: trunk/src/peldr/makefile
===================================================================
--- trunk/src/peldr/makefile	(revision 3028)
+++ trunk/src/peldr/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.14 2000-02-09 23:47:01 bird Exp $
+# $Id: makefile,v 1.15 2000-03-06 23:38:55 bird Exp $
 
 #
@@ -7,41 +7,65 @@
 #
 
+# Tell that we're producing an executable
+EXETARGET = 1
+
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-CFLAGS   = $(CFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
-CXXFLAGS = $(CXXFLAGS) /Ge+ -I$(PDWIN32_INCLUDE) -Gn-
-LDFLAGS  = $(LDFLAGS_ODINCRT) /Ge+ /B"/pmtype:pm /stack:0x100000 /NOBASE /Map" \
-           os2386.lib
+
+# Flag overloads and local macros.
+CLEANEXTRAS = $(PDWIN32_BIN)\$(TARGET).exe
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = $(OBJDIR)\pe.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = pe
 
-OBJS =  pe.obj
 
-all: $(TARGET).exe
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).exe \
+        $(PDWIN32_BIN)\$(TARGET).exe
 
 
-$(TARGET).exe: $(OBJS) makefile
-    $(LD) $(LDFLAGS) -Fe$@ $(OBJS)
-    $(CP) $(TARGET).exe $(PDWIN32_BIN)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - dummy rule.
+lib:
 
 
+# Exe rule - builds the target exe.
+$(OBJDIR)\$(TARGET).exe: $(OBJS) $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS_ODINCRT) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).exe
+/MAP:$(OBJDIR)\$(TARGET).map
+/PMTYPE:pm
+/STACK:0x100000
+/NOBASE
+$(OBJS)
+os2386.lib
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch *.exe \
-        $(PDWIN32_BIN)\$(TARGET).exe
-
Index: trunk/src/psapi/makefile
===================================================================
--- trunk/src/psapi/makefile	(revision 3028)
+++ trunk/src/psapi/makefile	(revision 3031)
@@ -1,69 +1,73 @@
-# $Id: makefile,v 1.7 2000-02-09 23:47:01 bird Exp $
+# $Id: makefile,v 1.8 2000-03-06 23:38:55 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       psapi.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = psapirsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\psapi.obj \
+$(OBJDIR)\psapirsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = psapi
 
-OBJS =  psapi.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
-
-
-
-
Index: trunk/src/psapi/psapi.rc
===================================================================
--- trunk/src/psapi/psapi.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: psapi.rc,v 1.1 2000-02-05 02:09:25 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "PSAPI System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "PSAPI\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "PSAPI.DLL\0"
-            VALUE "ProductName", "Odin32 - PSAPI\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/psapi/psapirsrc.orc
===================================================================
--- trunk/src/psapi/psapirsrc.orc	(revision 3031)
+++ trunk/src/psapi/psapirsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: psapirsrc.orc,v 1.1 2000-03-06 23:38:56 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "PSAPI System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "PSAPI\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "PSAPI.DLL\0"
+            VALUE "ProductName", "Odin32 - PSAPI\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/rasapi32/makefile
===================================================================
--- trunk/src/rasapi32/makefile	(revision 3028)
+++ trunk/src/rasapi32/makefile	(revision 3031)
@@ -1,71 +1,73 @@
-# $Id: makefile,v 1.8 2000-02-09 23:47:02 bird Exp $
+# $Id: makefile,v 1.9 2000-03-06 23:38:56 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       rasapi32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = rasapi32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\rasapi32.obj \
+$(OBJDIR)\rasapi32rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = rasapi32
 
-OBJS =  rasapi32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
-
-
-
-
-
Index: trunk/src/rasapi32/rasapi32.rc
===================================================================
--- trunk/src/rasapi32/rasapi32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: rasapi32.rc,v 1.1 2000-02-05 02:09:55 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "RASAPI32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "RASAPI32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "RASAPI32.DLL\0"
-            VALUE "ProductName", "Odin32 - RASAPI32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/rasapi32/rasapi32rsrc.orc
===================================================================
--- trunk/src/rasapi32/rasapi32rsrc.orc	(revision 3031)
+++ trunk/src/rasapi32/rasapi32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: rasapi32rsrc.orc,v 1.1 2000-03-06 23:38:56 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "RASAPI32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "RASAPI32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "RASAPI32.DLL\0"
+            VALUE "ProductName", "Odin32 - RASAPI32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/shell32/makefile
===================================================================
--- trunk/src/shell32/makefile	(revision 3028)
+++ trunk/src/shell32/makefile	(revision 3031)
@@ -1,75 +1,106 @@
-# $Id: makefile,v 1.21 2000-02-09 23:47:02 bird Exp $
+# $Id: makefile,v 1.22 2000-03-06 23:38:57 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       shell32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
-
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
+# Flag overloads and local macros.
+CLEANEXTRAS = shres.asm
 
 CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
 CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS =  \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\brsfolder.obj \
+$(OBJDIR)\classes.obj \
+$(OBJDIR)\contmenu.obj \
+$(OBJDIR)\dataobject.obj \
+$(OBJDIR)\enumidlist.obj \
+$(OBJDIR)\folders.obj \
+$(OBJDIR)\iconcache.obj \
+$(OBJDIR)\memorystream.obj \
+$(OBJDIR)\pidl.obj \
+$(OBJDIR)\regstream.obj \
+$(OBJDIR)\shell32_main.obj \
+$(OBJDIR)\shellguid.obj \
+$(OBJDIR)\shelllink.obj \
+$(OBJDIR)\shlmenu.obj \
+$(OBJDIR)\shellole.obj \
+$(OBJDIR)\shellord.obj \
+$(OBJDIR)\shellpath.obj \
+$(OBJDIR)\shv_bg_cmenu.obj \
+$(OBJDIR)\shlfolder.obj \
+$(OBJDIR)\shlview.obj \
+$(OBJDIR)\shell.obj \
+$(OBJDIR)\unknown.obj \
+$(OBJDIR)\misc.obj \
+$(OBJDIR)\she.obj \
+$(OBJDIR)\sh.obj \
+$(OBJDIR)\shpolicy.obj \
+$(OBJDIR)\shres.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = shell32
 
-OBJS =  initterm.obj \
-        brsfolder.obj classes.obj contmenu.obj dataobject.obj \
-        enumidlist.obj folders.obj iconcache.obj memorystream.obj \
-        pidl.obj regstream.obj shell32_main.obj \
-        shellguid.obj shelllink.obj shlmenu.obj shellole.obj \
-        shellord.obj shellpath.obj shv_bg_cmenu.obj \
-        shlfolder.obj shlview.obj shell.obj unknown.obj misc.obj \
-        she.obj sh.obj resource.obj shpolicy.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/advapi32.lib \
-          $(PDWIN32_LIB)/gdi32.lib $(PDWIN32_LIB)/ole32.lib  \
-          $(PDWIN32_LIB)/version.lib $(PDWIN32_LIB)/comctl32.lib   \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: shres.rc shell32_en.rc
-    $(RC) $(RCFLAGS) -o resource.asm shres.rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/advapi32.lib
+$(PDWIN32_LIB)/gdi32.lib
+$(PDWIN32_LIB)/ole32.lib
+$(PDWIN32_LIB)/version.lib
+$(PDWIN32_LIB)/comctl32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/shell32/shell32_Ca.orc
===================================================================
--- trunk/src/shell32/shell32_Ca.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Ca.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Ca.orc,v 1.1 2000-03-06 23:38:57 bird Exp $ */
+LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Quant a %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "D'Acord", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine ha estat construit per:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Ca.rc
===================================================================
--- trunk/src/shell32/shell32_Ca.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Ca.rc,v 1.2 1999-10-09 11:17:01 sandervl Exp $ */
-LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Quant a %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "D'Acord", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine ha estat construit per:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Cs.orc
===================================================================
--- trunk/src/shell32/shell32_Cs.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Cs.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Cs.orc,v 1.1 2000-03-06 23:38:58 bird Exp $ */
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "O aplikaci %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Cs.rc
===================================================================
--- trunk/src/shell32/shell32_Cs.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Cs.rc,v 1.2 1999-10-09 11:17:01 sandervl Exp $ */
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "O aplikaci %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Da.orc
===================================================================
--- trunk/src/shell32/shell32_Da.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Da.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Da.orc,v 1.1 2000-03-06 23:38:58 bird Exp $ */
+LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Om %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine havde ikke været mulig uden hjælp fra disse personer:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Da.rc
===================================================================
--- trunk/src/shell32/shell32_Da.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Da.rc,v 1.2 1999-10-09 11:17:01 sandervl Exp $ */
-LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine havde ikke været mulig uden hjælp fra disse personer:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_De.orc
===================================================================
--- trunk/src/shell32/shell32_De.orc	(revision 3031)
+++ trunk/src/shell32/shell32_De.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_De.orc,v 1.1 2000-03-06 23:38:59 bird Exp $ */
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Info über %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_De.rc
===================================================================
--- trunk/src/shell32/shell32_De.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_De.rc,v 1.2 1999-10-09 11:17:01 sandervl Exp $ */
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Info über %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_En.orc
===================================================================
--- trunk/src/shell32/shell32_En.orc	(revision 3031)
+++ trunk/src/shell32/shell32_En.orc	(revision 3031)
@@ -0,0 +1,29 @@
+/* $Id: shell32_En.orc,v 1.1 2000-03-06 23:38:59 bird Exp $ */
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+#if 1
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 216, 170
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "About %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 156, 147, 50, 12, WS_TABSTOP
+ LISTBOX 99, 8, 85, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 50, 14, 16
+ LTEXT "", 100, 8, 50, 137, 33
+ LTEXT "Odin was brought to you by:", 98, 8, 75, 137, 10
+ CONTROL "",2001,"Static",SS_BITMAP,8,2,148,26
+}
+#else
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "About %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12, WS_TABSTOP
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Odin was brought to you by:", 98, 8, 55, 137, 10
+}
+#endif
Index: trunk/src/shell32/shell32_En.rc
===================================================================
--- trunk/src/shell32/shell32_En.rc	(revision 3028)
+++ 	(revision )
@@ -1,29 +1,0 @@
-/* $Id: shell32_En.rc,v 1.4 2000-01-18 22:27:56 sandervl Exp $ */
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-#if 1
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 216, 170
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "About %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 156, 147, 50, 12, WS_TABSTOP
- LISTBOX 99, 8, 85, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 50, 14, 16
- LTEXT "", 100, 8, 50, 137, 33
- LTEXT "Odin was brought to you by:", 98, 8, 75, 137, 10
- CONTROL "",2001,"Static",SS_BITMAP,8,2,148,26
-}
-#else
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "About %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12, WS_TABSTOP
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Odin was brought to you by:", 98, 8, 55, 137, 10
-}
-#endif
Index: trunk/src/shell32/shell32_Eo.orc
===================================================================
--- trunk/src/shell32/shell32_Eo.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Eo.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Eo.orc,v 1.1 2000-03-06 23:39:00 bird Exp $ */
+LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Pri %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "Enorde", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Eo.rc
===================================================================
--- trunk/src/shell32/shell32_Eo.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Eo.rc,v 1.2 1999-10-09 11:17:01 sandervl Exp $ */
-LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Pri %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "Enorde", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Es.orc
===================================================================
--- trunk/src/shell32/shell32_Es.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Es.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Es.orc,v 1.1 2000-03-06 23:39:00 bird Exp $ */
+LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Acerca de %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "Aceptar", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine es disponible gracias a:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Es.rc
===================================================================
--- trunk/src/shell32/shell32_Es.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Es.rc,v 1.2 1999-10-09 11:17:02 sandervl Exp $ */
-LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Acerca de %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "Aceptar", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine es disponible gracias a:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Fi.orc
===================================================================
--- trunk/src/shell32/shell32_Fi.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Fi.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Fi.orc,v 1.1 2000-03-06 23:39:01 bird Exp $ */
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Tietoja: %s"
+FONT 10, "Järjestelmä"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine:n tekijät:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Fi.rc
===================================================================
--- trunk/src/shell32/shell32_Fi.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Fi.rc,v 1.2 1999-10-09 11:17:02 sandervl Exp $ */
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Tietoja: %s"
-FONT 10, "Järjestelmä"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine:n tekijät:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Fr.orc
===================================================================
--- trunk/src/shell32/shell32_Fr.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Fr.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Fr.orc,v 1.1 2000-03-06 23:39:01 bird Exp $ */
+LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "A propos de %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine est une réalisation de:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Fr.rc
===================================================================
--- trunk/src/shell32/shell32_Fr.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Fr.rc,v 1.2 1999-10-09 11:17:02 sandervl Exp $ */
-LANGUAGE LANG_FRENCH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "A propos de %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine est une réalisation de:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Hu.orc
===================================================================
--- trunk/src/shell32/shell32_Hu.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Hu.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Hu.orc,v 1.1 2000-03-06 23:39:02 bird Exp $ */
+LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "A %s-rõl"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Hu.rc
===================================================================
--- trunk/src/shell32/shell32_Hu.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Hu.rc,v 1.2 1999-10-09 11:17:02 sandervl Exp $ */
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "A %s-rõl"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_It.orc
===================================================================
--- trunk/src/shell32/shell32_It.orc	(revision 3031)
+++ trunk/src/shell32/shell32_It.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_It.orc,v 1.1 2000-03-06 23:39:02 bird Exp $ */
+LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Informazioni su %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_It.rc
===================================================================
--- trunk/src/shell32/shell32_It.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_It.rc,v 1.2 1999-10-09 11:17:02 sandervl Exp $ */
-LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Informazioni su %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Ko.rc
===================================================================
--- trunk/src/shell32/shell32_Ko.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Ko.rc,v 1.2 1999-10-09 11:17:02 sandervl Exp $ */
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "%s¿¡ °üÇÏ¿©"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "È®ÀÎ", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Nl.orc
===================================================================
--- trunk/src/shell32/shell32_Nl.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Nl.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Nl.orc,v 1.1 2000-03-06 23:39:03 bird Exp $ */
+LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Info %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12, WS_TABSTOP
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine is geschreven door:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Nl.rc
===================================================================
--- trunk/src/shell32/shell32_Nl.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Nl.rc,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
-LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Info %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12, WS_TABSTOP
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine is geschreven door:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_No.orc
===================================================================
--- trunk/src/shell32/shell32_No.orc	(revision 3031)
+++ trunk/src/shell32/shell32_No.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_No.orc,v 1.1 2000-03-06 23:39:04 bird Exp $ */
+LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Om %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_No.rc
===================================================================
--- trunk/src/shell32/shell32_No.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_No.rc,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
-LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Pl.orc
===================================================================
--- trunk/src/shell32/shell32_Pl.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Pl.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Pl.orc,v 1.1 2000-03-06 23:39:04 bird Exp $ */
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "O %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Pl.rc
===================================================================
--- trunk/src/shell32/shell32_Pl.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Pl.rc,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "O %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine was brought to you by:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Pt.orc
===================================================================
--- trunk/src/shell32/shell32_Pt.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Pt.orc	(revision 3031)
@@ -0,0 +1,16 @@
+/* $Id: shell32_Pt.orc,v 1.1 2000-03-06 23:39:05 bird Exp $ */
+LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Sobre %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine foi disponibilizado por:", 98, 8, 55, 137, 10
+}
+
+
Index: trunk/src/shell32/shell32_Pt.rc
===================================================================
--- trunk/src/shell32/shell32_Pt.rc	(revision 3028)
+++ 	(revision )
@@ -1,16 +1,0 @@
-/* $Id: shell32_Pt.rc,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
-LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Sobre %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine foi disponibilizado por:", 98, 8, 55, 137, 10
-}
-
-
Index: trunk/src/shell32/shell32_Ru.orc
===================================================================
--- trunk/src/shell32/shell32_Ru.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Ru.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Ru.orc,v 1.1 2000-03-06 23:39:06 bird Exp $ */
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Î %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12, WS_TABSTOP
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Ðàçðàáîò÷èêè Wine :", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Ru.rc
===================================================================
--- trunk/src/shell32/shell32_Ru.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Ru.rc,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Î %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12, WS_TABSTOP
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Ðàçðàáîò÷èêè Wine :", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Sv.orc
===================================================================
--- trunk/src/shell32/shell32_Sv.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Sv.orc	(revision 3031)
@@ -0,0 +1,15 @@
+/* $Id: shell32_Sv.orc,v 1.1 2000-03-06 23:39:07 bird Exp $ */
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Om %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine hade inte varit möjligt utan dessa personer:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Sv.rc
===================================================================
--- trunk/src/shell32/shell32_Sv.rc	(revision 3028)
+++ 	(revision )
@@ -1,15 +1,0 @@
-/* $Id: shell32_Sv.rc,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
-LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Om %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "OK", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine hade inte varit möjligt utan dessa personer:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_Wa.orc
===================================================================
--- trunk/src/shell32/shell32_Wa.orc	(revision 3031)
+++ trunk/src/shell32/shell32_Wa.orc	(revision 3031)
@@ -0,0 +1,20 @@
+/* $Id: shell32_Wa.orc,v 1.1 2000-03-06 23:39:08 bird Exp $ */
+LANGUAGE LANG_WALON, SUBLANG_DEFAULT
+
+/*
+ * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
+ * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
+ */
+
+SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Å dfait di %s"
+FONT 10, "System"
+{
+ DEFPUSHBUTTON "I Va", 1, 153, 130, 50, 12
+ LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
+ ICON "", 1088, 189, 10, 14, 16
+ LTEXT "", 100, 8, 10, 137, 33
+ LTEXT "Wine a estu fwait par:", 98, 8, 55, 137, 10
+}
+
Index: trunk/src/shell32/shell32_Wa.rc
===================================================================
--- trunk/src/shell32/shell32_Wa.rc	(revision 3028)
+++ 	(revision )
@@ -1,20 +1,0 @@
-/* $Id: shell32_Wa.rc,v 1.2 1999-10-09 11:17:03 sandervl Exp $ */
-LANGUAGE LANG_WALON, SUBLANG_DEFAULT
-
-/*
- * Si vos voloz aider avou li ratoûrnaedje des libes programes è walon,
- * vos poloz scrîre a l' adresse emile <linux-wa@chanae.alphanet.ch>
- */
-
-SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Å dfait di %s"
-FONT 10, "System"
-{
- DEFPUSHBUTTON "I Va", 1, 153, 130, 50, 12
- LISTBOX 99, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER
- ICON "", 1088, 189, 10, 14, 16
- LTEXT "", 100, 8, 10, 137, 33
- LTEXT "Wine a estu fwait par:", 98, 8, 55, 137, 10
-}
-
Index: trunk/src/shell32/shell32_xx.orc
===================================================================
--- trunk/src/shell32/shell32_xx.orc	(revision 3031)
+++ trunk/src/shell32/shell32_xx.orc	(revision 3031)
@@ -0,0 +1,5 @@
+/* $Id: shell32_xx.orc,v 1.1 2000-03-06 23:39:08 bird Exp $ */
+/* Language neutral resources.
+ * Icons and bitmaps should go in here.
+ */
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
Index: trunk/src/shell32/shell32_xx.rc
===================================================================
--- trunk/src/shell32/shell32_xx.rc	(revision 3028)
+++ 	(revision )
@@ -1,5 +1,0 @@
-/* $Id: shell32_xx.rc,v 1.2 1999-10-09 11:17:04 sandervl Exp $ */
-/* Language neutral resources.
- * Icons and bitmaps should go in here.
- */
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
Index: trunk/src/shell32/shres.orc
===================================================================
--- trunk/src/shell32/shres.orc	(revision 3031)
+++ trunk/src/shell32/shres.orc	(revision 3031)
@@ -0,0 +1,1250 @@
+/* $Id: shres.orc,v 1.1 2000-03-06 23:39:08 bird Exp $ */
+/*
+ * Top level resource file for Common Dialogs
+ *
+ */
+
+#include "winuser.h"
+#include "winnls.h"
+#include "shlobj.h"
+#include "shresdef.h"
+#include "odinrsrc.h"
+
+/*--------------------- FIXME --------------------------
+ *
+ * These must be seperated into the language files
+ * and translated. The language 0,0 is a hack to get it
+ * loaded properly for all languages by pretending that
+ * they are neutral.
+ * The menus are not jet properly implemented.
+ * Don't localize it yet. (js)
+ */
+
+LANGUAGE 0,0
+
+//SvL: Odin logo bitmap
+5555 BITMAP DISCARDABLE "Odinlogo.bmp"
+
+MENU_001 MENU DISCARDABLE
+BEGIN
+	MENUITEM "Lar&ge Icons",	FCIDM_SHVIEW_BIGICON
+	MENUITEM "S&mall Icons",	FCIDM_SHVIEW_SMALLICON
+	MENUITEM "&List",		FCIDM_SHVIEW_LISTVIEW
+	MENUITEM "&Details",		FCIDM_SHVIEW_REPORTVIEW
+END
+
+MENU_002 MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  POPUP "&View"
+	  BEGIN
+	    MENUITEM "Lar&ge Icons",	FCIDM_SHVIEW_BIGICON
+	    MENUITEM "S&mall Icons",	FCIDM_SHVIEW_SMALLICON
+	    MENUITEM "&List",		FCIDM_SHVIEW_LISTVIEW
+	    MENUITEM "&Details",	FCIDM_SHVIEW_REPORTVIEW
+	  END
+	  MENUITEM SEPARATOR
+	  POPUP "Arrange &Icons"
+	  BEGIN
+	    MENUITEM "By &Name",	0x30	/* column 0 */
+	    MENUITEM "By &Type",	0x32	/* column 2 */
+	    MENUITEM "By &Size",	0x31	/* ... */
+	    MENUITEM "By &Date",	0x33
+	    MENUITEM SEPARATOR
+	    MENUITEM "&Auto Arrange",	FCIDM_SHVIEW_AUTOARRANGE
+	  END
+	  MENUITEM "Line up Icons",	FCIDM_SHVIEW_SNAPTOGRID
+	  MENUITEM SEPARATOR
+	  MENUITEM "Paste",		FCIDM_SHVIEW_INSERT
+	  MENUITEM "Paste as Link",	FCIDM_SHVIEW_INSERTLINK
+	  POPUP "New"
+	  BEGIN
+	    MENUITEM "New &Folder",	0x7053
+	    MENUITEM "New &Link",	0x7052
+	    MENUITEM SEPARATOR
+	  END
+	  MENUITEM "Propertys",		FCIDM_SHVIEW_PROPERTIES
+	END
+END
+
+MENU_SHV_FILE MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  MENUITEM "C&ut",		FCIDM_SHVIEW_CUT
+	  MENUITEM "&Copy",	FCIDM_SHVIEW_COPY
+	  MENUITEM SEPARATOR
+	  MENUITEM "&Link",	0x7051
+	  MENUITEM "&Delete",	FCIDM_SHVIEW_DELETE
+	  MENUITEM "&Rename",	0x7050
+	  MENUITEM SEPARATOR
+	  MENUITEM "&Propertys",	FCIDM_SHVIEW_PROPERTIES
+	END
+END
+SHBRSFORFOLDER_MSGBOX DIALOG 15, 40, 128, 152
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Choose a Directory:"
+FONT 8, "Helv"
+{
+ DEFPUSHBUTTON "OK", 1, 4, 132, 50, 12
+ PUSHBUTTON "Cancel", 2, 58, 132, 50, 12
+ CONTROL "Tree1",99,"SysTreeView32",
+ 	TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
+	WS_BORDER | WS_TABSTOP,
+	4, 4, 120, 120
+}
+
+/*
+	columns in the shellview
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_SHV_COLUMN1		"File"
+	IDS_SHV_COLUMN2		"Size"
+	IDS_SHV_COLUMN3		"Type"
+	IDS_SHV_COLUMN4		"Modifyed"
+	IDS_SHV_COLUMN5		"Size"		/* drive view */
+	IDS_SHV_COLUMN6		"Size avaiable"	/* drive view */
+}
+
+/*
+	special folders
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_DESKTOP		"Desktop"
+	IDS_MYCOMPUTER		"My Computer"
+}
+
+/*
+	context menus
+*/
+STRINGTABLE DISCARDABLE
+{
+	IDS_VIEW_LARGE		"Lar&ge Icons"
+	IDS_VIEW_SMALL		"S&mall Icons"
+	IDS_VIEW_LIST		"&List"
+	IDS_VIEW_DETAILS	"&Details"
+	IDS_SELECT		"Select"
+	IDS_OPEN		"Open"
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "\0"
+            VALUE "FileVersion", "0.0\0"
+            VALUE "InternalName", "Odin32 - SHELL32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "\0"
+            VALUE "ProductName", "Odin32 - SHELL32\0"
+            VALUE "ProductVersion", "1.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
+
+/* document */
+0	ICON
+{'
+00 00 01 00 04 00 10 10 10 00 00 00 00 00 28 01
+00 00 46 00 00 00 10 10 00 00 00 00 00 00 68 05
+00 00 6e 01 00 00 20 20 10 00 00 00 00 00 e8 02
+00 00 d6 06 00 00 20 20 00 00 00 00 00 00 a8 08
+00 00 be 09 00 00 28 00 00 00 10 00 00 00 20 00
+00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 77 77
+77 77 77 77 77 77 77 77 77 88 88 88 88 77 77 77
+78 88 88 88 88 87 78 88 87 88 77 77 f8 88 78 88
+88 88 88 77 f8 88 7f 88 88 8f f8 88 f8 88 7f 87
+77 77 f8 77 f8 88 7f 88 88 88 f8 88 f8 88 7f 77
+77 7f f8 87 f8 88 7f 88 88 88 f8 88 f8 88 7f 77
+77 77 f8 77 f8 88 7f 88 88 87 f8 88 f8 88 7f 78
+77 77 f8 ff f8 88 7f 88 88 88 f8 ff ff 87 7f ff
+ff ff f8 77 77 77 77 77 77 77 77 77 77 77 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
+00 00 10 00 00 00 20 00 00 00 01 00 08 00 00 00
+00 00 40 01 00 00 00 00 00 00 00 00 00 00 00 01
+00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
+66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
+00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
+cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
+66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
+00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
+cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
+66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
+00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
+cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
+66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
+00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
+cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
+66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
+00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
+cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
+66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
+00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
+cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
+66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
+00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
+cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
+66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
+00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
+cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
+66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
+00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
+cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
+66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
+00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
+cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
+66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
+00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
+cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
+66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
+00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
+cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
+66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
+00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
+cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
+66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
+00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
+cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
+66 00 cc cc 99 00 cc cc cc 00 cc cc ff 00 cc ff
+00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
+cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
+66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
+00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
+cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
+66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
+00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
+cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
+66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
+00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
+cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac a5 81 81 81 81
+81 81 81 81 ac ac ac ac ac ac ac 81 81 81 81 81
+81 81 81 56 81 ab ac 56 56 56 81 ac 81 81 ac ac
+ac ac d7 56 56 81 ab 81 81 81 81 81 81 81 81 56
+ac ac d7 81 81 81 ac d7 81 81 81 81 81 d7 d7 56
+56 81 d7 81 81 81 ac d7 81 ac ac 88 ac ac d7 56
+ac ac d7 81 81 81 ac d7 56 56 56 56 56 56 d7 56
+56 56 d7 81 81 81 ac d7 ac ac ac ac ac d7 d7 56
+81 ac d7 81 81 81 ac d7 56 56 56 56 81 56 d7 56
+56 56 d7 81 81 81 ac d7 ac ac ac ac ac ac d7 56
+ac ac d7 7a 81 81 ac d7 56 56 81 56 81 a6 d7 56
+7b 81 d7 7a 81 81 ac d7 ac 81 ac ac ac ac d7 56
+d7 d7 d7 81 81 81 ac d7 56 56 81 56 7b 81 d7 56
+d7 ad ad d7 81 a5 ac d7 d7 d7 d7 d7 d7 d7 d7 81
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 28 00 00 00 20 00 00 00 40 00
+00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 77 77
+77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
+77 77 77 78 88 88 88 88 88 88 88 88 77 77 77 77
+77 77 78 88 88 88 88 88 88 88 88 00 77 77 77 77
+77 77 7f ff ff ff ff ff ff ff ff 80 88 87 77 88
+88 88 8f ff ff ff ff ff ff ff ff 80 80 87 77 00
+00 00 88 88 88 88 88 88 88 87 ff 88 f8 87 78 88
+88 88 88 88 88 88 88 00 87 7f ff 88 f8 87 77 ff
+ff ff ff ff ff ff ff 80 87 7f ff 88 f8 87 77 ff
+ff ff ff ff ff ff ff 80 88 87 ff 88 f8 87 77 ff
+88 88 88 88 88 ff ff 80 88 88 ff 88 f8 87 77 ff
+88 77 77 77 77 77 ff 80 77 7f ff 88 f8 87 77 ff
+88 77 77 77 77 77 ff 80 77 7f ff 88 f8 87 77 ff
+88 88 88 88 88 88 ff 80 88 88 ff 88 f8 87 77 ff
+88 88 88 88 88 88 ff 80 88 88 ff 88 f8 87 77 ff
+87 78 77 78 f7 7f ff 80 88 77 ff 88 f8 87 77 ff
+87 78 77 78 f7 7f ff 80 88 77 ff 88 f8 87 77 ff
+88 88 88 88 88 87 ff 80 88 88 ff 88 f8 87 77 ff
+88 88 88 88 88 88 ff 80 88 87 ff 88 f8 87 77 ff
+77 78 77 78 78 77 ff 80 77 87 ff 88 f8 87 77 ff
+77 78 77 78 78 77 ff 80 77 87 ff 88 f8 87 77 ff
+88 88 88 88 78 7f ff 80 88 88 ff 86 f8 87 77 ff
+88 88 88 88 88 87 ff 80 78 7f ff 86 f8 87 77 ff
+77 88 78 77 77 87 ff 80 ff ff ff 86 f8 87 77 ff
+77 88 78 77 77 87 ff 80 ff ff ff 88 f8 87 77 ff
+88 88 88 88 88 88 ff 84 f7 77 77 7f f8 87 77 ff
+88 88 88 88 78 7f ff 80 ff ff ff ff f8 77 77 ff
+ff ff ff ff ff ff ff 88 77 77 77 77 77 77 77 ff
+ff ff ff ff ff ff ff 88 77 77 77 77 77 77 77 77
+77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 77 77 77 77 77 77 77 77 77 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 28 00
+00 00 20 00 00 00 40 00 00 00 01 00 08 00 00 00
+00 00 80 04 00 00 00 00 00 00 00 00 00 00 00 01
+00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
+66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
+00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
+cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
+66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
+00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
+cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
+66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
+00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
+cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
+66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
+00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
+cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
+66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
+00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
+cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
+66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
+00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
+cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
+66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
+00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
+cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
+66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
+00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
+cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
+66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
+00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
+cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
+66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
+00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
+cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
+66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
+00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
+cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
+66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
+00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
+cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
+66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
+00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
+cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
+66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
+00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
+cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
+66 00 dc c0 b2 00 cc cc cc 00 cc cc ff 00 cc ff
+00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
+cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
+66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
+00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
+cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
+66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
+00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
+cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
+66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
+00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
+cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+a5 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56
+56 56 ac ac ac ac ac ac ac ac ac ac ac ac ac 81
+56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56
+2b 2b ac ac ac ac ac ac ac ac ac ac ac ac ac d7
+d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
+81 2b 56 56 81 ac ac ac 81 81 81 81 81 81 81 d7
+d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
+81 2b 56 00 56 ac ac ac 2b 2b 2b 2b 2b 2b 56 81
+81 81 56 56 56 56 57 56 57 56 81 81 56 ac d7 d7
+81 56 d7 56 56 ac ac 81 56 56 56 56 56 56 56 56
+56 56 56 56 56 56 56 56 2b 2b 81 ac ac d7 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
+d7 d7 d7 d7 d7 d7 d7 d7 81 2b 81 ac ac d7 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
+d7 d7 d7 d7 d7 d7 d7 d7 81 2b 56 56 56 ac d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 56 56
+56 56 56 56 d7 d7 d7 d7 81 2b 56 56 56 81 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 81 81 ac ac ac 88
+88 88 ac ac 88 ac d7 d7 81 2b ac ac ac d7 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 81 81 ac ac ac ac
+ac ac ac ac ac ac d7 d7 81 2b ac ac ac d7 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 56 81 56 56 56 56
+56 81 56 81 56 56 d7 d7 81 00 56 56 56 81 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 56 56
+56 56 56 56 56 81 d7 d7 81 00 81 56 56 56 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 81 ac ac 81 ac ac
+ac 81 ad ac ac d7 d7 d7 81 2b 81 81 ac ac d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 81 ac ac 81 ac ac
+ac 81 ad ac ac d7 d7 d7 81 2b 81 81 ac ac d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 56
+56 56 81 56 56 82 d7 d7 81 2b 56 56 56 56 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 56 81 56 56 56 56
+56 81 56 81 56 56 d7 d7 81 00 81 56 56 82 d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 ac ac ac 81 ac ac
+ac 81 ac 81 ac ac d7 d7 81 2b ac ac 81 ac d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 ac ac ac 81 ac ac
+ac 81 ac 81 ac ac d7 d7 81 2b ac ac 81 ac d7 d7
+81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 81
+56 56 ac 56 a6 d7 d7 d7 81 00 56 56 56 81 d7 d7
+81 55 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 56
+56 56 81 56 56 82 d7 d7 81 00 ac 56 a6 d7 d7 d7
+81 55 d7 56 56 ac ac ac d7 d7 ac ac 81 81 ac 81
+ac ac ac ac 81 ac d7 d7 81 2b d7 d7 d7 d7 d7 d7
+81 55 d7 56 56 ac ac ac d7 d7 ac ac 81 81 ac 81
+ac ac ac ac 81 ac d7 d7 81 2b d7 d7 d7 d7 d7 d7
+81 81 d7 56 56 ac ac ac d7 d7 56 56 56 56 56 56
+56 56 56 56 56 81 d7 d7 81 4f d7 ac ac ac ac ac
+ac d7 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 81
+56 56 ac 56 a6 d7 d7 d7 81 2b d7 d7 d7 d7 d7 d7
+d7 d7 d7 56 a5 ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
+d7 d7 d7 d7 d7 d7 d7 d7 81 80 ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
+d7 d7 d7 d7 d7 d7 d7 d7 81 80 ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
+ac ac ac ac ac ac 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00
+'}
+
+/* folder */
+3	ICON
+{'
+00 00 01 00 04 00 10 10 10 00 00 00 00 00 28 01
+00 00 46 00 00 00 10 10 00 00 00 00 00 00 68 05
+00 00 6e 01 00 00 20 20 10 00 00 00 00 00 e8 02
+00 00 d6 06 00 00 20 20 00 00 00 00 00 00 a8 08
+00 00 be 09 00 00 28 00 00 00 10 00 00 00 20 00
+00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
+ff ff ff 80 08 ff ff ff ff ff 80 80 30 08 ff ff
+ff 80 88 80 30 8f ff ff 80 88 88 80 3f ff ff 80
+88 88 88 80 3f ff 80 87 77 88 88 80 3f ff 87 77
+77 78 88 80 3f ff 87 77 77 77 88 80 3f ff 87 77
+77 77 78 80 3f ff 8f 77 77 77 77 81 3f ff 8f f7
+77 78 10 37 8f ff 8f ff 77 83 87 78 ff ff 8f ff
+78 37 77 88 ff ff 8f 78 37 88 88 8f ff ff 88 37
+88 ff ff ff ff ff f8 88 ff ff ff ff ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
+00 00 10 00 00 00 20 00 00 00 01 00 08 00 00 00
+00 00 40 01 00 00 00 00 00 00 00 00 00 00 00 01
+00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
+66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
+00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
+cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
+66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
+00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
+cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
+66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
+00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
+cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
+66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
+00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
+cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
+66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
+00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
+cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
+66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
+00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
+cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
+66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
+00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
+cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
+66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
+00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
+cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
+66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
+00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
+cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
+66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
+00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
+cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
+66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
+00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
+cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
+66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
+00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
+cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
+66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
+00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
+cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
+66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
+00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
+cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
+66 00 cc cc 99 00 cc cc cc 00 cc cc ff 00 cc ff
+00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
+cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
+66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
+00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
+cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
+66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
+00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
+cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
+66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
+00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
+cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
+56 00 07 56 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 56 2b
+56 2b 32 00 00 81 d7 d7 d7 d7 d7 d7 56 2b 56 81
+81 2b 32 00 56 d7 d7 d7 d7 d7 56 2b 56 81 81 81
+81 2b 32 d7 d7 d7 d7 d7 56 2b 56 81 81 81 81 81
+81 2b 32 d7 d7 d7 81 2b 56 ac ac ac 81 81 81 81
+81 2b 32 d7 d7 d7 56 ac ac ac ac ac ac 81 81 81
+81 2b 32 d7 d7 d7 56 ac ac ac ac ac ac ac 81 81
+81 2b 32 d7 d7 d7 56 ac ac ac ac ac ac ac ac 81
+81 2b 32 d7 d7 d7 56 d7 ac ac ac ac ac ac ac ac
+81 2c 32 d7 d7 d7 56 d7 d7 ac ac ac ac 56 2c 2b
+32 89 56 d7 d7 d7 56 d7 d7 d7 ac ac 56 34 5f 89
+89 56 d7 d7 d7 d7 56 d7 d7 d7 ac 56 32 89 89 89
+5e 56 d7 d7 d7 d7 56 d7 ac 56 32 89 56 56 56 56
+81 d7 d7 d7 d7 d7 56 56 32 89 56 56 d7 d7 d7 d7
+d7 d7 d7 d7 d7 d7 d7 56 56 56 d7 d7 d7 d7 d7 d7
+d7 d7 d7 d7 d7 d7 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 28 00 00 00 20 00 00 00 40 00
+00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
+ff ff ff ff ff ff ff ff ff 00 00 ff ff ff ff ff
+ff ff ff ff ff ff ff ff 00 80 b0 00 ff ff ff ff
+ff ff ff ff ff ff ff 00 88 80 b0 00 00 ff ff ff
+ff ff ff ff ff ff 00 88 77 80 b0 00 00 0f ff ff
+ff ff ff ff ff 00 88 77 77 80 b0 00 00 ff ff ff
+ff ff ff ff 00 88 77 77 77 80 b0 00 ff ff ff ff
+ff ff ff 00 88 77 77 77 77 80 b0 ff ff ff ff ff
+ff ff 00 88 77 77 77 77 77 80 b0 ff ff ff ff ff
+ff 00 88 77 77 77 77 77 77 80 b0 ff ff ff ff ff
+00 88 77 77 77 77 77 77 77 80 b0 ff ff ff ff 00
+88 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 88
+77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 77
+77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 77
+77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 77
+77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 f7
+f7 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 7f
+77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 f7
+f7 f7 77 77 77 77 77 77 77 80 b0 ff ff ff f0 ff
+7f 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 f7
+f7 f7 f7 77 77 77 77 77 78 0b b0 ff ff ff f0 ff
+ff 7f 77 77 77 77 80 88 00 bf 0f ff ff ff f0 ff
+f7 f7 f7 f7 77 80 0b 00 bb bf 0f ff ff ff f0 ff
+ff ff 7f 77 78 0b bb bb bf f0 ff ff ff ff f0 ff
+ff f7 f7 77 70 bb bb ff ff f0 ff ff ff ff f0 ff
+ff ff ff f8 00 bf ff ff ff 0f ff ff ff ff f0 ff
+ff ff f8 00 bf ff ff ff f0 0f ff ff ff ff f0 ff
+ff f8 00 bf ff 00 ff f0 0f ff ff ff ff ff f0 ff
+f8 00 bf ff 00 ff 00 0f ff ff ff ff ff ff f0 f8
+00 bf ff 00 ff ff ff ff ff ff ff ff ff ff f0 00
+bf ff 00 ff ff ff ff ff ff ff ff ff ff ff ff f0
+ff 00 ff ff ff ff ff ff ff ff ff ff ff ff ff f0
+00 ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 28 00
+00 00 20 00 00 00 40 00 00 00 01 00 08 00 00 00
+00 00 80 04 00 00 00 00 00 00 00 00 00 00 00 01
+00 00 00 00 00 00 ff ff ff 00 a8 dc ff 00 58 a8
+ff 00 c0 c0 c0 00 a4 a0 a0 00 58 58 58 00 30 30
+30 00 00 00 40 00 00 00 00 00 dc c0 b2 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 08 08 08 08
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 08 08 05 08 02 08
+08 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 08 08 05 05 05 08 02 08
+08 08 08 08 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 08 08 05 05 04 04 05 08 02 08
+08 08 08 08 08 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 08 08 05 05 04 04 04 04 05 08 02 08
+08 08 08 08 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 08 08 05 05 04 04 04 04 04 04 05 08 02 08
+08 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+08 08 05 05 04 04 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 08
+05 05 04 04 04 04 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 00 00 00 00 00 08 08 05 05
+04 04 04 04 04 04 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 00 00 00 08 08 05 05 04 04
+04 03 04 04 04 04 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 00 08 08 05 05 04 04 03 04
+03 04 04 04 04 04 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 08 05 05 04 04 03 03 03 03
+04 03 04 03 04 04 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 08 04 04 03 03 03 03 03 04
+03 04 03 04 04 04 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 08 03 03 03 03 03 03 03 03
+03 03 04 03 04 03 04 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 08 03 03 03 03 03 03 03 03
+03 04 03 04 03 04 04 04 04 04 04 04 05 07 02 08
+00 00 00 00 00 00 00 08 00 03 00 03 03 03 03 03
+03 03 03 03 04 03 04 03 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 08 03 00 03 03 03 03 03 03
+03 03 03 04 03 04 03 04 04 04 04 04 05 08 02 08
+00 00 00 00 00 00 00 08 00 03 00 03 00 03 03 03
+03 03 03 03 03 03 04 03 04 03 04 04 05 08 02 08
+00 00 00 00 00 00 00 08 00 00 03 00 03 03 03 03
+03 03 03 03 03 04 03 04 03 04 03 04 05 08 02 08
+00 00 00 00 00 00 00 08 00 03 00 03 00 03 00 03
+03 03 03 03 03 03 03 03 04 03 04 05 08 02 02 08
+00 00 00 00 00 00 00 08 00 00 00 00 03 00 03 03
+03 03 03 03 03 04 05 08 05 05 08 08 02 01 08 00
+00 00 00 00 00 00 00 08 00 00 00 03 00 03 00 03
+00 03 03 04 05 08 08 02 07 08 02 02 02 01 08 00
+00 00 00 00 00 00 00 08 00 00 00 00 00 00 03 00
+03 03 03 05 08 02 02 02 02 02 02 01 01 08 00 00
+00 00 00 00 00 00 00 08 00 00 00 00 00 03 00 03
+03 04 04 08 02 02 02 02 01 01 01 01 01 08 00 00
+00 00 00 00 00 00 00 08 00 00 00 00 00 00 00 00
+00 05 08 08 02 01 01 01 01 01 01 01 08 00 00 00
+00 00 00 00 00 00 00 08 00 00 00 00 00 00 00 05
+08 08 02 01 01 01 01 01 01 01 01 08 08 00 00 00
+00 00 00 00 00 00 00 08 00 00 00 00 00 05 08 08
+02 01 01 01 08 08 01 01 01 08 08 00 00 00 00 00
+00 00 00 00 00 00 00 08 00 00 00 05 08 08 02 01
+01 01 08 08 00 00 08 08 06 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 08 00 05 08 08 02 01 01 01
+08 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 08 08 08 02 01 01 01 08 08
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 08 01 01 08 08 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 08 08 08 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00
+'}
+
+/* drive */
+8	ICON
+{'
+00 00 01 00 04 00 10 10 10 00 00 00 00 00 28 01
+00 00 46 00 00 00 10 10 00 00 00 00 00 00 68 05
+00 00 6e 01 00 00 20 20 10 00 00 00 00 00 e8 02
+00 00 d6 06 00 00 20 20 00 00 00 00 00 00 a8 08
+00 00 be 09 00 00 28 00 00 00 10 00 00 00 20 00
+00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
+ff ff ff ff ff ff ff ff 78 88 ff ff ff ff ff 86
+07 78 8f ff ff ff f8 88 88 77 88 ff ff ff 88 88
+87 77 78 8f ff ff 88 88 77 77 77 88 ff ff 87 88
+87 77 77 78 8f ff f8 88 88 77 77 77 88 ff ff 88
+88 87 77 77 78 ff ff f8 88 87 77 77 78 ff ff ff
+87 77 77 77 88 ff ff ff f8 77 77 88 88 ff ff ff
+ff 87 80 88 88 ff ff ff ff f8 f8 88 88 ff ff ff
+ff ff ff ff 88 ff ff ff ff ff ff ff 78 ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
+00 00 10 00 00 00 20 00 00 00 01 00 08 00 00 00
+00 00 40 01 00 00 00 00 00 00 00 00 00 00 00 01
+00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
+66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
+00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
+cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
+66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
+00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
+cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
+66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
+00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
+cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
+66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
+00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
+cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
+66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
+00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
+cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
+66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
+00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
+cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
+66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
+00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
+cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
+66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
+00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
+cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
+66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
+00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
+cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
+66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
+00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
+cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
+66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
+00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
+cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
+66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
+00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
+cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
+66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
+00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
+cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
+66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
+00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
+cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
+66 00 cc cc 99 00 cc cc cc 00 cc cc ff 00 cc ff
+00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
+cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
+66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
+00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
+cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
+66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
+00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
+cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
+66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
+00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
+cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
+d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 a5 56 56 81 d7 d7
+d7 d7 d7 d7 d7 d7 d7 d7 81 55 2b ac ac 81 81 d7
+d7 d7 d7 d7 d7 d7 d7 56 56 81 56 58 ac ac 81 81
+d7 d7 d7 d7 d7 d7 56 81 81 81 81 ac ac ac ac 81
+81 d7 d7 d7 d7 d7 56 81 81 81 ac ac ac ac ac ac
+81 81 d7 d7 d7 d7 56 ac 81 81 81 ac ac ac ac ac
+ac 81 81 d7 d7 d7 d7 56 81 81 81 81 ac ac ac ac
+ac ac 81 81 d7 d7 d7 d7 56 81 81 81 81 ac ac ac
+ac ac ac 56 d7 d7 d7 d7 d7 56 81 81 81 ac ac ac
+ac ac ac 56 d7 d7 d7 d7 d7 d7 56 ac ac ac ac ac
+ac ac 56 81 d7 d7 d7 d7 d7 d7 d7 56 ac ac ac ac
+56 56 56 81 d7 d7 d7 d7 d7 d7 d7 d7 56 ac 56 2b
+81 81 56 81 d7 d7 d7 d7 d7 d7 d7 d7 d7 56 d7 81
+56 56 56 81 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
+d7 d7 56 56 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
+d7 d7 a5 56 d7 d7 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 28 00 00 00 20 00 00 00 40 00
+00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff f0 00 ff ff ff ff ff ff ff ff ff ff ff
+ff ff f8 07 7f 0f ff ff ff ff ff ff ff ff ff ff
+ff f0 08 77 7f 70 ff ff ff ff ff ff ff ff ff ff
+f0 08 88 77 7f 77 0f ff ff ff ff ff ff ff ff f0
+07 88 88 79 7f 77 70 ff ff ff ff ff ff ff ff 07
+77 88 88 79 7f 77 77 0f ff ff ff ff ff ff f0 77
+77 88 88 7f f7 f7 77 70 ff ff ff ff ff ff f0 77
+77 88 87 77 77 7f 77 77 0f ff ff ff ff ff f0 77
+77 87 77 77 77 77 f7 77 70 ff ff ff ff ff f0 77
+77 77 77 77 77 77 7f 77 77 0f ff ff ff ff f0 77
+77 77 77 77 77 77 77 f7 77 70 ff ff ff ff f0 77
+77 77 77 77 77 77 77 7f 77 77 0f ff ff ff ff 07
+77 77 77 77 77 77 77 77 f7 77 70 ff ff ff ff f0
+77 77 77 77 77 77 77 77 7f 77 77 0f ff ff ff ff
+07 77 77 77 77 77 77 77 77 f7 77 0f ff ff ff ff
+f0 77 77 77 77 77 77 77 77 7f 77 0f ff ff ff ff
+ff 07 77 77 77 77 77 77 77 77 f7 0f ff ff ff ff
+ff f0 77 77 77 ff 77 77 77 77 7f 0f ff ff ff ff
+ff ff 07 77 ff 77 77 77 77 77 77 0f ff ff ff ff
+ff ff f0 7f 77 77 77 77 77 77 00 ff ff ff ff ff
+ff ff ff 07 77 77 77 77 77 00 70 ff ff ff ff ff
+ff ff ff f0 77 77 77 77 00 7f 77 0f ff ff ff ff
+ff ff ff ff 07 77 77 00 77 77 f7 0f ff ff ff ff
+ff ff ff ff f0 77 00 07 77 77 00 ff ff ff ff ff
+ff ff ff ff ff 00 ff f0 77 00 70 ff ff ff ff ff
+ff ff ff ff ff ff ff ff 00 ff 07 0f ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff f0 70 ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff f0 70 ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff f8 70 ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff 8f ff ff 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 28 00
+00 00 20 00 00 00 40 00 00 00 01 00 08 00 00 00
+00 00 80 04 00 00 00 00 00 00 00 00 00 00 00 01
+00 00 00 00 00 00 00 00 00 00 ff ff ff 00 80 80
+80 00 c0 c0 c0 00 a4 a0 a0 00 58 58 58 00 00 00
+ff 00 dc c0 b2 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 00 00 00 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 05
+00 03 03 01 00 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 00 00 05
+03 03 03 01 03 00 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 00 00 02 02 05
+03 03 03 01 03 03 00 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 00 00 04 02 02 02 05
+03 06 03 01 03 03 03 00 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 00 04 04 04 02 02 02 05
+03 06 03 01 03 03 03 03 00 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 00 04 04 04 04 02 02 02 05
+03 01 01 03 01 03 03 03 03 00 01 01 01 01 01 01
+01 01 01 01 01 01 01 00 04 04 04 04 02 02 02 03
+03 03 03 03 03 01 03 03 03 03 00 01 01 01 01 01
+01 01 01 01 01 01 01 00 04 04 04 04 02 03 03 03
+03 03 03 03 03 03 01 03 03 03 03 00 01 01 01 01
+01 01 01 01 01 01 01 00 04 04 04 03 03 04 04 03
+03 03 03 03 03 03 03 01 03 03 03 03 00 01 01 01
+01 01 01 01 01 01 01 00 04 03 03 04 04 04 04 04
+03 03 03 03 03 03 03 03 01 03 03 03 03 00 01 01
+01 01 01 01 01 01 01 00 03 04 04 04 04 04 04 04
+04 03 03 03 03 03 03 03 03 01 03 03 03 03 00 01
+01 01 01 01 01 01 01 01 00 04 04 04 04 04 04 04
+04 04 03 03 03 03 03 03 03 03 01 03 03 03 03 00
+01 01 01 01 01 01 01 01 01 00 04 04 04 04 04 04
+04 04 04 03 03 03 03 03 03 03 03 01 03 03 03 03
+00 01 01 01 01 01 01 01 01 01 00 04 04 04 04 04
+04 04 04 04 03 03 03 03 03 03 03 03 01 03 03 03
+00 01 01 01 01 01 01 01 01 01 01 00 04 04 04 04
+04 04 04 04 04 03 03 03 03 03 03 03 03 01 03 03
+00 01 01 01 01 01 01 01 01 01 01 01 00 04 04 04
+04 04 04 04 04 04 03 03 03 03 03 03 03 03 01 03
+00 01 01 01 01 01 01 01 01 01 01 01 01 00 04 04
+04 04 04 04 01 01 03 03 03 03 03 03 03 03 03 01
+00 01 01 01 01 01 01 01 01 01 01 01 01 01 00 04
+04 04 01 01 03 03 03 03 03 03 03 03 03 03 03 03
+00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00
+03 01 03 03 03 03 03 03 03 03 03 03 03 03 00 00
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+00 03 03 03 03 03 03 03 03 03 03 03 00 00 04 00
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 00 03 03 03 03 03 03 03 03 00 00 04 01 04 04
+00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 00 03 03 03 03 03 00 00 04 04 04 04 01 04
+00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 00 03 03 00 00 00 04 04 04 04 04 00 00
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 00 00 01 01 01 00 04 04 00 00 04 00
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 00 00 01 01 00 04
+00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00
+04 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00
+04 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 05
+04 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+05 01 01 01 01 01 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00
+'}
+
+/* mycomputer */
+15	ICON
+{'
+00 00 01 00 02 00 10 10 10 00 00 00 00 00 28 01
+00 00 26 00 00 00 20 20 10 00 00 00 00 00 e8 02
+00 00 4e 01 00 00 28 00 00 00 10 00 00 00 20 00
+00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 00 00
+00 00 00 00 00 00 07 77 77 77 77 77 77 70 07 77
+77 77 77 77 77 70 00 00 00 00 00 00 00 00 f0 00
+00 00 00 00 00 0f f0 77 77 77 77 77 77 0f f0 70
+00 00 00 00 07 0f f0 70 cc cc cc cc 07 0f f0 70
+cc cc cc cc 07 0f f0 70 cc cc cc cc 07 0f f0 70
+cc cc cc cc 07 0f f0 70 cc cc cc cc 07 0f f0 70
+cc cc cc cc 07 0f f0 70 00 00 00 00 07 0f f0 77
+77 77 77 77 77 0f f0 00 00 00 00 00 00 0f 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
+00 00 20 00 00 00 40 00 00 00 01 00 04 00 00 00
+00 00 80 02 00 00 00 00 00 00 00 00 00 00 10 00
+00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80
+00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80
+00 00 c0 c0 c0 00 80 80 80 00 00 00 ff 00 00 ff
+00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff
+00 00 ff ff ff 00 ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff f0 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 0f f0 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
+77 77 77 77 77 0f f0 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 0f ff f0 00 00 00 00 00 00 00 00
+00 00 00 00 0f ff ff f0 77 77 77 77 77 77 77 77
+77 77 77 77 0f ff ff f0 77 77 77 77 77 77 77 77
+77 77 77 77 0f ff ff f0 77 00 00 00 00 00 00 00
+00 00 00 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
+cc cc c0 77 0f ff ff f0 77 00 00 00 00 00 00 00
+00 00 00 77 0f ff ff f0 77 77 77 77 77 77 77 77
+77 77 77 77 0f ff ff f0 77 77 77 77 77 77 77 77
+77 77 77 77 0f ff ff f0 00 00 00 00 00 00 00 00
+00 00 00 00 0f ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00
+'}
+
+/* desktop */
+34	ICON
+{'
+00 00 01 00 02 00 10 10 10 00 00 00 00 00 28 01
+00 00 26 00 00 00 20 20 10 00 00 00 00 00 e8 02
+00 00 4e 01 00 00 28 00 00 00 10 00 00 00 20 00
+00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
+00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
+00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
+00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
+80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
+00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff f0 00
+00 00 00 00 00 00 f0 99 00 aa 00 cc 0b b0 f0 99
+00 aa 00 cc 0b b0 f0 99 00 aa 00 cc 0b b0 f0 99
+00 aa 00 cc 0b b0 f0 99 00 aa 00 cc 0b b0 f0 99
+00 aa 00 cc 0b b0 f0 99 00 aa 00 cc 0b b0 f0 99
+00 00 00 cc 0b b0 f0 99 0f ff f0 cc 0b b0 f0 99
+0f ff f0 cc 00 00 f0 00 0f ff f0 cc 0f ff ff ff
+ff ff f0 cc 0f ff ff ff ff ff f0 00 0f ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
+ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
+00 00 20 00 00 00 40 00 00 00 01 00 04 00 00 00
+00 00 80 02 00 00 00 00 00 00 00 00 00 00 10 00
+00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80
+00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80
+00 00 c0 c0 c0 00 80 80 80 00 00 00 ff 00 00 ff
+00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff
+00 00 ff ff ff 00 ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff f0 00 00 00 00 00 00 00
+00 00 00 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 00 00 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 ff ff ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 ff ff ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
+d0 ff ff ff ff ff ff ff f0 cc c0 00 00 0b b0 0d
+d0 ff ff ff ff ff ff ff f0 cc c0 ff ff 0b b0 0d
+d0 ff ff ff ff ff ff ff f0 cc c0 ff ff 00 00 0d
+d0 ff ff ff ff ff ff ff f0 00 00 ff ff ff ff 0d
+d0 ff ff ff ff ff ff ff ff ff ff ff ff ff ff 0d
+d0 ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00
+00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
+ff ff ff ff ff ff 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00
+'}
+
+/*--------------------- END FIXME ------------------------*/
+
+/*
+ * Everything that does not depend on language,
+ * like textless bitmaps etc, go into the
+ * neutral language. This will prevent them from
+ * being duplicated for each language.
+ */
+#include "shell32_xx.orc"
+
+/*
+ * Everything specific to any language goes
+ * in one of the specific files.
+ * Note that you can and may override resources
+ * which also have a neutral version. This is to
+ * get localized bitmaps for example.
+ */
+#include "shell32_En.orc"
+//#include "shell32_Ca.orc"
+//#include "shell32_Cs.orc"
+//#include "shell32_Da.orc"
+//#include "shell32_De.orc"
+//#include "shell32_Eo.orc"
+//#include "shell32_Es.orc"
+//#include "shell32_Fi.orc"
+//#include "shell32_Fr.orc"
+//#include "shell32_Hu.orc"
+//#include "shell32_It.orc"
+//#include "shell32_Ko.orc"
+//#include "shell32_Nl.orc"
+//#include "shell32_No.orc"
+//#include "shell32_Pl.orc"
+//#include "shell32_Pt.orc"
+//#include "shell32_Ru.orc"
+//#include "shell32_Sv.orc"
+//#include "shell32_Wa.orc"
Index: trunk/src/shell32/shres.rc
===================================================================
--- trunk/src/shell32/shres.rc	(revision 3028)
+++ 	(revision )
@@ -1,1250 +1,0 @@
-/* $Id: shres.rc,v 1.5 2000-01-18 22:27:56 sandervl Exp $ */
-/*
- * Top level resource file for Common Dialogs
- *
- */
-
-#include "winuser.h"
-#include "winnls.h"
-#include "shlobj.h"
-#include "shresdef.h"
-#include "odinrsrc.h"
-
-/*--------------------- FIXME --------------------------
- *
- * These must be seperated into the language files
- * and translated. The language 0,0 is a hack to get it
- * loaded properly for all languages by pretending that
- * they are neutral.
- * The menus are not jet properly implemented.
- * Don't localize it yet. (js)
- */
-
-LANGUAGE 0,0
-
-//SvL: Odin logo bitmap
-5555 BITMAP DISCARDABLE "Odinlogo.bmp"
-
-MENU_001 MENU DISCARDABLE
-BEGIN
-	MENUITEM "Lar&ge Icons",	FCIDM_SHVIEW_BIGICON
-	MENUITEM "S&mall Icons",	FCIDM_SHVIEW_SMALLICON
-	MENUITEM "&List",		FCIDM_SHVIEW_LISTVIEW
-	MENUITEM "&Details",		FCIDM_SHVIEW_REPORTVIEW
-END
-
-MENU_002 MENU DISCARDABLE
-BEGIN
-	POPUP""
-	BEGIN
-	  POPUP "&View"
-	  BEGIN
-	    MENUITEM "Lar&ge Icons",	FCIDM_SHVIEW_BIGICON
-	    MENUITEM "S&mall Icons",	FCIDM_SHVIEW_SMALLICON
-	    MENUITEM "&List",		FCIDM_SHVIEW_LISTVIEW
-	    MENUITEM "&Details",	FCIDM_SHVIEW_REPORTVIEW
-	  END
-	  MENUITEM SEPARATOR
-	  POPUP "Arrange &Icons"
-	  BEGIN
-	    MENUITEM "By &Name",	0x30	/* column 0 */
-	    MENUITEM "By &Type",	0x32	/* column 2 */
-	    MENUITEM "By &Size",	0x31	/* ... */
-	    MENUITEM "By &Date",	0x33
-	    MENUITEM SEPARATOR
-	    MENUITEM "&Auto Arrange",	FCIDM_SHVIEW_AUTOARRANGE
-	  END
-	  MENUITEM "Line up Icons",	FCIDM_SHVIEW_SNAPTOGRID
-	  MENUITEM SEPARATOR
-	  MENUITEM "Paste",		FCIDM_SHVIEW_INSERT
-	  MENUITEM "Paste as Link",	FCIDM_SHVIEW_INSERTLINK
-	  POPUP "New"
-	  BEGIN
-	    MENUITEM "New &Folder",	0x7053
-	    MENUITEM "New &Link",	0x7052
-	    MENUITEM SEPARATOR	
-	  END
-	  MENUITEM "Propertys",		FCIDM_SHVIEW_PROPERTIES
-	END
-END
-
-MENU_SHV_FILE MENU DISCARDABLE
-BEGIN
-	POPUP""
-	BEGIN
-	  MENUITEM "C&ut",		FCIDM_SHVIEW_CUT
-	  MENUITEM "&Copy",	FCIDM_SHVIEW_COPY
-	  MENUITEM SEPARATOR
-	  MENUITEM "&Link",	0x7051
-	  MENUITEM "&Delete",	FCIDM_SHVIEW_DELETE
-	  MENUITEM "&Rename",	0x7050
-	  MENUITEM SEPARATOR
-	  MENUITEM "&Propertys",	FCIDM_SHVIEW_PROPERTIES
-	END
-END
-SHBRSFORFOLDER_MSGBOX DIALOG 15, 40, 128, 152
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Choose a Directory:"
-FONT 8, "Helv"
-{
- DEFPUSHBUTTON "OK", 1, 4, 132, 50, 12
- PUSHBUTTON "Cancel", 2, 58, 132, 50, 12
- CONTROL "Tree1",99,"SysTreeView32",
- 	TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |
-	WS_BORDER | WS_TABSTOP, 
-	4, 4, 120, 120
-}
-
-/*
-	columns in the shellview
-*/
-STRINGTABLE DISCARDABLE
-{
-	IDS_SHV_COLUMN1		"File"
-	IDS_SHV_COLUMN2		"Size"
-	IDS_SHV_COLUMN3		"Type"
-	IDS_SHV_COLUMN4		"Modifyed"
-	IDS_SHV_COLUMN5		"Size"		/* drive view */
-	IDS_SHV_COLUMN6		"Size avaiable"	/* drive view */
-}
-
-/*
-	special folders
-*/
-STRINGTABLE DISCARDABLE
-{
-	IDS_DESKTOP		"Desktop"
-	IDS_MYCOMPUTER		"My Computer"
-}
-
-/*
-	context menus
-*/
-STRINGTABLE DISCARDABLE
-{
-	IDS_VIEW_LARGE		"Lar&ge Icons"
-	IDS_VIEW_SMALL		"S&mall Icons"
-	IDS_VIEW_LIST		"&List"
-	IDS_VIEW_DETAILS	"&Details"
-	IDS_SELECT		"Select"
-	IDS_OPEN		"Open"
-}
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "\0"
-            VALUE "FileVersion", "0.0\0"
-            VALUE "InternalName", "Odin32 - SHELL32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "\0"
-            VALUE "ProductName", "Odin32 - SHELL32\0"
-            VALUE "ProductVersion", "1.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
-
-/* document */
-0	ICON 
-{'
-00 00 01 00 04 00 10 10 10 00 00 00 00 00 28 01
-00 00 46 00 00 00 10 10 00 00 00 00 00 00 68 05
-00 00 6e 01 00 00 20 20 10 00 00 00 00 00 e8 02
-00 00 d6 06 00 00 20 20 00 00 00 00 00 00 a8 08
-00 00 be 09 00 00 28 00 00 00 10 00 00 00 20 00
-00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 77 77
-77 77 77 77 77 77 77 77 77 88 88 88 88 77 77 77
-78 88 88 88 88 87 78 88 87 88 77 77 f8 88 78 88
-88 88 88 77 f8 88 7f 88 88 8f f8 88 f8 88 7f 87
-77 77 f8 77 f8 88 7f 88 88 88 f8 88 f8 88 7f 77
-77 7f f8 87 f8 88 7f 88 88 88 f8 88 f8 88 7f 77
-77 77 f8 77 f8 88 7f 88 88 87 f8 88 f8 88 7f 78
-77 77 f8 ff f8 88 7f 88 88 88 f8 ff ff 87 7f ff
-ff ff f8 77 77 77 77 77 77 77 77 77 77 77 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
-00 00 10 00 00 00 20 00 00 00 01 00 08 00 00 00
-00 00 40 01 00 00 00 00 00 00 00 00 00 00 00 01
-00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
-66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
-00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
-cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
-66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
-00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
-cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
-66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
-00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
-cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
-66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
-00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
-cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
-66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
-00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
-cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
-66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
-00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
-cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
-66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
-00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
-cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
-66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
-00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
-cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
-66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
-00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
-cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
-66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
-00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
-cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
-66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
-00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
-cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
-66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
-00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
-cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
-66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
-00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
-cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
-66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
-00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
-cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
-66 00 cc cc 99 00 cc cc cc 00 cc cc ff 00 cc ff
-00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
-cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
-66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
-00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
-cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
-66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
-00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
-cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
-66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
-00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
-cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac a5 81 81 81 81
-81 81 81 81 ac ac ac ac ac ac ac 81 81 81 81 81
-81 81 81 56 81 ab ac 56 56 56 81 ac 81 81 ac ac
-ac ac d7 56 56 81 ab 81 81 81 81 81 81 81 81 56
-ac ac d7 81 81 81 ac d7 81 81 81 81 81 d7 d7 56
-56 81 d7 81 81 81 ac d7 81 ac ac 88 ac ac d7 56
-ac ac d7 81 81 81 ac d7 56 56 56 56 56 56 d7 56
-56 56 d7 81 81 81 ac d7 ac ac ac ac ac d7 d7 56
-81 ac d7 81 81 81 ac d7 56 56 56 56 81 56 d7 56
-56 56 d7 81 81 81 ac d7 ac ac ac ac ac ac d7 56
-ac ac d7 7a 81 81 ac d7 56 56 81 56 81 a6 d7 56
-7b 81 d7 7a 81 81 ac d7 ac 81 ac ac ac ac d7 56
-d7 d7 d7 81 81 81 ac d7 56 56 81 56 7b 81 d7 56
-d7 ad ad d7 81 a5 ac d7 d7 d7 d7 d7 d7 d7 d7 81
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 28 00 00 00 20 00 00 00 40 00
-00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 77 77
-77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
-77 77 77 78 88 88 88 88 88 88 88 88 77 77 77 77
-77 77 78 88 88 88 88 88 88 88 88 00 77 77 77 77
-77 77 7f ff ff ff ff ff ff ff ff 80 88 87 77 88
-88 88 8f ff ff ff ff ff ff ff ff 80 80 87 77 00
-00 00 88 88 88 88 88 88 88 87 ff 88 f8 87 78 88
-88 88 88 88 88 88 88 00 87 7f ff 88 f8 87 77 ff
-ff ff ff ff ff ff ff 80 87 7f ff 88 f8 87 77 ff
-ff ff ff ff ff ff ff 80 88 87 ff 88 f8 87 77 ff
-88 88 88 88 88 ff ff 80 88 88 ff 88 f8 87 77 ff
-88 77 77 77 77 77 ff 80 77 7f ff 88 f8 87 77 ff
-88 77 77 77 77 77 ff 80 77 7f ff 88 f8 87 77 ff
-88 88 88 88 88 88 ff 80 88 88 ff 88 f8 87 77 ff
-88 88 88 88 88 88 ff 80 88 88 ff 88 f8 87 77 ff
-87 78 77 78 f7 7f ff 80 88 77 ff 88 f8 87 77 ff
-87 78 77 78 f7 7f ff 80 88 77 ff 88 f8 87 77 ff
-88 88 88 88 88 87 ff 80 88 88 ff 88 f8 87 77 ff
-88 88 88 88 88 88 ff 80 88 87 ff 88 f8 87 77 ff
-77 78 77 78 78 77 ff 80 77 87 ff 88 f8 87 77 ff
-77 78 77 78 78 77 ff 80 77 87 ff 88 f8 87 77 ff
-88 88 88 88 78 7f ff 80 88 88 ff 86 f8 87 77 ff
-88 88 88 88 88 87 ff 80 78 7f ff 86 f8 87 77 ff
-77 88 78 77 77 87 ff 80 ff ff ff 86 f8 87 77 ff
-77 88 78 77 77 87 ff 80 ff ff ff 88 f8 87 77 ff
-88 88 88 88 88 88 ff 84 f7 77 77 7f f8 87 77 ff
-88 88 88 88 78 7f ff 80 ff ff ff ff f8 77 77 ff
-ff ff ff ff ff ff ff 88 77 77 77 77 77 77 77 ff
-ff ff ff ff ff ff ff 88 77 77 77 77 77 77 77 77
-77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 77 77 77 77 77 77 77 77 77 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 28 00
-00 00 20 00 00 00 40 00 00 00 01 00 08 00 00 00
-00 00 80 04 00 00 00 00 00 00 00 00 00 00 00 01
-00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
-66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
-00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
-cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
-66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
-00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
-cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
-66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
-00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
-cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
-66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
-00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
-cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
-66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
-00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
-cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
-66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
-00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
-cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
-66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
-00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
-cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
-66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
-00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
-cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
-66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
-00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
-cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
-66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
-00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
-cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
-66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
-00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
-cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
-66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
-00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
-cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
-66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
-00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
-cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
-66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
-00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
-cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
-66 00 dc c0 b2 00 cc cc cc 00 cc cc ff 00 cc ff
-00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
-cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
-66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
-00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
-cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
-66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
-00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
-cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
-66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
-00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
-cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-a5 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56
-56 56 ac ac ac ac ac ac ac ac ac ac ac ac ac 81
-56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56
-2b 2b ac ac ac ac ac ac ac ac ac ac ac ac ac d7
-d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
-81 2b 56 56 81 ac ac ac 81 81 81 81 81 81 81 d7
-d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
-81 2b 56 00 56 ac ac ac 2b 2b 2b 2b 2b 2b 56 81
-81 81 56 56 56 56 57 56 57 56 81 81 56 ac d7 d7
-81 56 d7 56 56 ac ac 81 56 56 56 56 56 56 56 56
-56 56 56 56 56 56 56 56 2b 2b 81 ac ac d7 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
-d7 d7 d7 d7 d7 d7 d7 d7 81 2b 81 ac ac d7 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
-d7 d7 d7 d7 d7 d7 d7 d7 81 2b 56 56 56 ac d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 56 56
-56 56 56 56 d7 d7 d7 d7 81 2b 56 56 56 81 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 81 81 ac ac ac 88
-88 88 ac ac 88 ac d7 d7 81 2b ac ac ac d7 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 81 81 ac ac ac ac
-ac ac ac ac ac ac d7 d7 81 2b ac ac ac d7 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 56 81 56 56 56 56
-56 81 56 81 56 56 d7 d7 81 00 56 56 56 81 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 56 56
-56 56 56 56 56 81 d7 d7 81 00 81 56 56 56 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 81 ac ac 81 ac ac
-ac 81 ad ac ac d7 d7 d7 81 2b 81 81 ac ac d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 81 ac ac 81 ac ac
-ac 81 ad ac ac d7 d7 d7 81 2b 81 81 ac ac d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 56
-56 56 81 56 56 82 d7 d7 81 2b 56 56 56 56 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 56 81 56 56 56 56
-56 81 56 81 56 56 d7 d7 81 00 81 56 56 82 d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 ac ac ac 81 ac ac
-ac 81 ac 81 ac ac d7 d7 81 2b ac ac 81 ac d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 ac ac ac 81 ac ac
-ac 81 ac 81 ac ac d7 d7 81 2b ac ac 81 ac d7 d7
-81 56 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 81
-56 56 ac 56 a6 d7 d7 d7 81 00 56 56 56 81 d7 d7
-81 55 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 56
-56 56 81 56 56 82 d7 d7 81 00 ac 56 a6 d7 d7 d7
-81 55 d7 56 56 ac ac ac d7 d7 ac ac 81 81 ac 81
-ac ac ac ac 81 ac d7 d7 81 2b d7 d7 d7 d7 d7 d7
-81 55 d7 56 56 ac ac ac d7 d7 ac ac 81 81 ac 81
-ac ac ac ac 81 ac d7 d7 81 2b d7 d7 d7 d7 d7 d7
-81 81 d7 56 56 ac ac ac d7 d7 56 56 56 56 56 56
-56 56 56 56 56 81 d7 d7 81 4f d7 ac ac ac ac ac
-ac d7 d7 56 56 ac ac ac d7 d7 56 56 56 56 81 81
-56 56 ac 56 a6 d7 d7 d7 81 2b d7 d7 d7 d7 d7 d7
-d7 d7 d7 56 a5 ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
-d7 d7 d7 d7 d7 d7 d7 d7 81 80 ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac d7 d7 d7 d7 d7 d7 d7 d7
-d7 d7 d7 d7 d7 d7 d7 d7 81 80 ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac
-ac ac ac ac ac ac 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00                              
-'}
-
-/* folder */
-3	ICON 
-{'
-00 00 01 00 04 00 10 10 10 00 00 00 00 00 28 01
-00 00 46 00 00 00 10 10 00 00 00 00 00 00 68 05
-00 00 6e 01 00 00 20 20 10 00 00 00 00 00 e8 02
-00 00 d6 06 00 00 20 20 00 00 00 00 00 00 a8 08
-00 00 be 09 00 00 28 00 00 00 10 00 00 00 20 00
-00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
-ff ff ff 80 08 ff ff ff ff ff 80 80 30 08 ff ff
-ff 80 88 80 30 8f ff ff 80 88 88 80 3f ff ff 80
-88 88 88 80 3f ff 80 87 77 88 88 80 3f ff 87 77
-77 78 88 80 3f ff 87 77 77 77 88 80 3f ff 87 77
-77 77 78 80 3f ff 8f 77 77 77 77 81 3f ff 8f f7
-77 78 10 37 8f ff 8f ff 77 83 87 78 ff ff 8f ff
-78 37 77 88 ff ff 8f 78 37 88 88 8f ff ff 88 37
-88 ff ff ff ff ff f8 88 ff ff ff ff ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
-00 00 10 00 00 00 20 00 00 00 01 00 08 00 00 00
-00 00 40 01 00 00 00 00 00 00 00 00 00 00 00 01
-00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
-66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
-00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
-cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
-66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
-00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
-cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
-66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
-00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
-cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
-66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
-00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
-cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
-66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
-00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
-cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
-66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
-00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
-cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
-66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
-00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
-cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
-66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
-00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
-cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
-66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
-00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
-cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
-66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
-00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
-cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
-66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
-00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
-cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
-66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
-00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
-cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
-66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
-00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
-cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
-66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
-00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
-cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
-66 00 cc cc 99 00 cc cc cc 00 cc cc ff 00 cc ff
-00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
-cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
-66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
-00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
-cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
-66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
-00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
-cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
-66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
-00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
-cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
-56 00 07 56 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 56 2b
-56 2b 32 00 00 81 d7 d7 d7 d7 d7 d7 56 2b 56 81
-81 2b 32 00 56 d7 d7 d7 d7 d7 56 2b 56 81 81 81
-81 2b 32 d7 d7 d7 d7 d7 56 2b 56 81 81 81 81 81
-81 2b 32 d7 d7 d7 81 2b 56 ac ac ac 81 81 81 81
-81 2b 32 d7 d7 d7 56 ac ac ac ac ac ac 81 81 81
-81 2b 32 d7 d7 d7 56 ac ac ac ac ac ac ac 81 81
-81 2b 32 d7 d7 d7 56 ac ac ac ac ac ac ac ac 81
-81 2b 32 d7 d7 d7 56 d7 ac ac ac ac ac ac ac ac
-81 2c 32 d7 d7 d7 56 d7 d7 ac ac ac ac 56 2c 2b
-32 89 56 d7 d7 d7 56 d7 d7 d7 ac ac 56 34 5f 89
-89 56 d7 d7 d7 d7 56 d7 d7 d7 ac 56 32 89 89 89
-5e 56 d7 d7 d7 d7 56 d7 ac 56 32 89 56 56 56 56
-81 d7 d7 d7 d7 d7 56 56 32 89 56 56 d7 d7 d7 d7
-d7 d7 d7 d7 d7 d7 d7 56 56 56 d7 d7 d7 d7 d7 d7
-d7 d7 d7 d7 d7 d7 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 28 00 00 00 20 00 00 00 40 00
-00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
-ff ff ff ff ff ff ff ff ff 00 00 ff ff ff ff ff
-ff ff ff ff ff ff ff ff 00 80 b0 00 ff ff ff ff
-ff ff ff ff ff ff ff 00 88 80 b0 00 00 ff ff ff
-ff ff ff ff ff ff 00 88 77 80 b0 00 00 0f ff ff
-ff ff ff ff ff 00 88 77 77 80 b0 00 00 ff ff ff
-ff ff ff ff 00 88 77 77 77 80 b0 00 ff ff ff ff
-ff ff ff 00 88 77 77 77 77 80 b0 ff ff ff ff ff
-ff ff 00 88 77 77 77 77 77 80 b0 ff ff ff ff ff
-ff 00 88 77 77 77 77 77 77 80 b0 ff ff ff ff ff
-00 88 77 77 77 77 77 77 77 80 b0 ff ff ff ff 00
-88 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 88
-77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 77
-77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 77
-77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 77
-77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 f7
-f7 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 7f
-77 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 f7
-f7 f7 77 77 77 77 77 77 77 80 b0 ff ff ff f0 ff
-7f 77 77 77 77 77 77 77 77 80 b0 ff ff ff f0 f7
-f7 f7 f7 77 77 77 77 77 78 0b b0 ff ff ff f0 ff
-ff 7f 77 77 77 77 80 88 00 bf 0f ff ff ff f0 ff
-f7 f7 f7 f7 77 80 0b 00 bb bf 0f ff ff ff f0 ff
-ff ff 7f 77 78 0b bb bb bf f0 ff ff ff ff f0 ff
-ff f7 f7 77 70 bb bb ff ff f0 ff ff ff ff f0 ff
-ff ff ff f8 00 bf ff ff ff 0f ff ff ff ff f0 ff
-ff ff f8 00 bf ff ff ff f0 0f ff ff ff ff f0 ff
-ff f8 00 bf ff 00 ff f0 0f ff ff ff ff ff f0 ff
-f8 00 bf ff 00 ff 00 0f ff ff ff ff ff ff f0 f8
-00 bf ff 00 ff ff ff ff ff ff ff ff ff ff f0 00
-bf ff 00 ff ff ff ff ff ff ff ff ff ff ff ff f0
-ff 00 ff ff ff ff ff ff ff ff ff ff ff ff ff f0
-00 ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 28 00
-00 00 20 00 00 00 40 00 00 00 01 00 08 00 00 00
-00 00 80 04 00 00 00 00 00 00 00 00 00 00 00 01
-00 00 00 00 00 00 ff ff ff 00 a8 dc ff 00 58 a8
-ff 00 c0 c0 c0 00 a4 a0 a0 00 58 58 58 00 30 30
-30 00 00 00 40 00 00 00 00 00 dc c0 b2 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 08 08 08 08
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 08 08 05 08 02 08
-08 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 08 08 05 05 05 08 02 08
-08 08 08 08 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 08 08 05 05 04 04 05 08 02 08
-08 08 08 08 08 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 08 08 05 05 04 04 04 04 05 08 02 08
-08 08 08 08 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 08 08 05 05 04 04 04 04 04 04 05 08 02 08
-08 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-08 08 05 05 04 04 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 08
-05 05 04 04 04 04 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 00 00 00 00 00 08 08 05 05
-04 04 04 04 04 04 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 00 00 00 08 08 05 05 04 04
-04 03 04 04 04 04 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 00 08 08 05 05 04 04 03 04
-03 04 04 04 04 04 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 08 05 05 04 04 03 03 03 03
-04 03 04 03 04 04 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 08 04 04 03 03 03 03 03 04
-03 04 03 04 04 04 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 08 03 03 03 03 03 03 03 03
-03 03 04 03 04 03 04 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 08 03 03 03 03 03 03 03 03
-03 04 03 04 03 04 04 04 04 04 04 04 05 07 02 08
-00 00 00 00 00 00 00 08 00 03 00 03 03 03 03 03
-03 03 03 03 04 03 04 03 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 08 03 00 03 03 03 03 03 03
-03 03 03 04 03 04 03 04 04 04 04 04 05 08 02 08
-00 00 00 00 00 00 00 08 00 03 00 03 00 03 03 03
-03 03 03 03 03 03 04 03 04 03 04 04 05 08 02 08
-00 00 00 00 00 00 00 08 00 00 03 00 03 03 03 03
-03 03 03 03 03 04 03 04 03 04 03 04 05 08 02 08
-00 00 00 00 00 00 00 08 00 03 00 03 00 03 00 03
-03 03 03 03 03 03 03 03 04 03 04 05 08 02 02 08
-00 00 00 00 00 00 00 08 00 00 00 00 03 00 03 03
-03 03 03 03 03 04 05 08 05 05 08 08 02 01 08 00
-00 00 00 00 00 00 00 08 00 00 00 03 00 03 00 03
-00 03 03 04 05 08 08 02 07 08 02 02 02 01 08 00
-00 00 00 00 00 00 00 08 00 00 00 00 00 00 03 00
-03 03 03 05 08 02 02 02 02 02 02 01 01 08 00 00
-00 00 00 00 00 00 00 08 00 00 00 00 00 03 00 03
-03 04 04 08 02 02 02 02 01 01 01 01 01 08 00 00
-00 00 00 00 00 00 00 08 00 00 00 00 00 00 00 00
-00 05 08 08 02 01 01 01 01 01 01 01 08 00 00 00
-00 00 00 00 00 00 00 08 00 00 00 00 00 00 00 05
-08 08 02 01 01 01 01 01 01 01 01 08 08 00 00 00
-00 00 00 00 00 00 00 08 00 00 00 00 00 05 08 08
-02 01 01 01 08 08 01 01 01 08 08 00 00 00 00 00
-00 00 00 00 00 00 00 08 00 00 00 05 08 08 02 01
-01 01 08 08 00 00 08 08 06 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 08 00 05 08 08 02 01 01 01
-08 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 08 08 08 02 01 01 01 08 08
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 08 01 01 08 08 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 08 08 08 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00                              
-'}
-
-/* drive */
-8	ICON 
-{'
-00 00 01 00 04 00 10 10 10 00 00 00 00 00 28 01
-00 00 46 00 00 00 10 10 00 00 00 00 00 00 68 05
-00 00 6e 01 00 00 20 20 10 00 00 00 00 00 e8 02
-00 00 d6 06 00 00 20 20 00 00 00 00 00 00 a8 08
-00 00 be 09 00 00 28 00 00 00 10 00 00 00 20 00
-00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
-ff ff ff ff ff ff ff ff 78 88 ff ff ff ff ff 86
-07 78 8f ff ff ff f8 88 88 77 88 ff ff ff 88 88
-87 77 78 8f ff ff 88 88 77 77 77 88 ff ff 87 88
-87 77 77 78 8f ff f8 88 88 77 77 77 88 ff ff 88
-88 87 77 77 78 ff ff f8 88 87 77 77 78 ff ff ff
-87 77 77 77 88 ff ff ff f8 77 77 88 88 ff ff ff
-ff 87 80 88 88 ff ff ff ff f8 f8 88 88 ff ff ff
-ff ff ff ff 88 ff ff ff ff ff ff ff 78 ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
-00 00 10 00 00 00 20 00 00 00 01 00 08 00 00 00
-00 00 40 01 00 00 00 00 00 00 00 00 00 00 00 01
-00 00 00 00 00 00 00 00 00 00 00 00 33 00 00 00
-66 00 00 00 99 00 00 00 cc 00 00 00 ff 00 00 33
-00 00 00 33 33 00 00 33 66 00 00 33 99 00 00 33
-cc 00 00 33 ff 00 00 66 00 00 00 66 33 00 00 66
-66 00 00 66 99 00 00 66 cc 00 00 66 ff 00 00 99
-00 00 00 99 33 00 00 99 66 00 00 99 99 00 00 99
-cc 00 00 99 ff 00 00 cc 00 00 00 cc 33 00 00 cc
-66 00 00 cc 99 00 00 cc cc 00 00 cc ff 00 00 ff
-00 00 00 ff 33 00 00 ff 66 00 00 ff 99 00 00 ff
-cc 00 00 ff ff 00 33 00 00 00 33 00 33 00 33 00
-66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
-00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
-cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
-66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
-00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
-cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
-66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
-00 00 33 ff 33 00 33 ff 66 00 33 ff 99 00 33 ff
-cc 00 33 ff ff 00 66 00 00 00 66 00 33 00 66 00
-66 00 66 00 99 00 66 00 cc 00 66 00 ff 00 66 33
-00 00 66 33 33 00 66 33 66 00 66 33 99 00 66 33
-cc 00 66 33 ff 00 66 66 00 00 66 66 33 00 66 66
-66 00 66 66 99 00 66 66 cc 00 66 66 ff 00 66 99
-00 00 66 99 33 00 66 99 66 00 66 99 99 00 66 99
-cc 00 66 99 ff 00 66 cc 00 00 66 cc 33 00 66 cc
-66 00 66 cc 99 00 66 cc cc 00 66 cc ff 00 66 ff
-00 00 66 ff 33 00 66 ff 66 00 66 ff 99 00 66 ff
-cc 00 66 ff ff 00 99 00 00 00 99 00 33 00 99 00
-66 00 99 00 99 00 99 00 cc 00 99 00 ff 00 99 33
-00 00 99 33 33 00 99 33 66 00 99 33 99 00 99 33
-cc 00 99 33 ff 00 99 66 00 00 99 66 33 00 99 66
-66 00 99 66 99 00 99 66 cc 00 99 66 ff 00 99 99
-00 00 99 99 33 00 99 99 66 00 99 99 99 00 99 99
-cc 00 99 99 ff 00 99 cc 00 00 99 cc 33 00 99 cc
-66 00 99 cc 99 00 99 cc cc 00 99 cc ff 00 99 ff
-00 00 99 ff 33 00 99 ff 66 00 99 ff 99 00 99 ff
-cc 00 99 ff ff 00 cc 00 00 00 cc 00 33 00 cc 00
-66 00 cc 00 99 00 cc 00 cc 00 cc 00 ff 00 cc 33
-00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
-cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 cc 66
-66 00 cc 66 99 00 cc 66 cc 00 cc 66 ff 00 cc 99
-00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
-cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
-66 00 cc cc 99 00 cc cc cc 00 cc cc ff 00 cc ff
-00 00 cc ff 33 00 cc ff 66 00 cc ff 99 00 cc ff
-cc 00 cc ff ff 00 ff 00 00 00 ff 00 33 00 ff 00
-66 00 ff 00 99 00 ff 00 cc 00 ff 00 ff 00 ff 33
-00 00 ff 33 33 00 ff 33 66 00 ff 33 99 00 ff 33
-cc 00 ff 33 ff 00 ff 66 00 00 ff 66 33 00 ff 66
-66 00 ff 66 99 00 ff 66 cc 00 ff 66 ff 00 ff 99
-00 00 ff 99 33 00 ff 99 66 00 ff 99 99 00 ff 99
-cc 00 ff 99 ff 00 ff cc 00 00 ff cc 33 00 ff cc
-66 00 ff cc 99 00 ff cc cc 00 ff cc ff 00 ff ff
-00 00 ff ff 33 00 ff ff 66 00 ff ff 99 00 ff ff
-cc 00 ff ff ff 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
-d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 a5 56 56 81 d7 d7
-d7 d7 d7 d7 d7 d7 d7 d7 81 55 2b ac ac 81 81 d7
-d7 d7 d7 d7 d7 d7 d7 56 56 81 56 58 ac ac 81 81
-d7 d7 d7 d7 d7 d7 56 81 81 81 81 ac ac ac ac 81
-81 d7 d7 d7 d7 d7 56 81 81 81 ac ac ac ac ac ac
-81 81 d7 d7 d7 d7 56 ac 81 81 81 ac ac ac ac ac
-ac 81 81 d7 d7 d7 d7 56 81 81 81 81 ac ac ac ac
-ac ac 81 81 d7 d7 d7 d7 56 81 81 81 81 ac ac ac
-ac ac ac 56 d7 d7 d7 d7 d7 56 81 81 81 ac ac ac
-ac ac ac 56 d7 d7 d7 d7 d7 d7 56 ac ac ac ac ac
-ac ac 56 81 d7 d7 d7 d7 d7 d7 d7 56 ac ac ac ac
-56 56 56 81 d7 d7 d7 d7 d7 d7 d7 d7 56 ac 56 2b
-81 81 56 81 d7 d7 d7 d7 d7 d7 d7 d7 d7 56 d7 81
-56 56 56 81 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
-d7 d7 56 56 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7 d7
-d7 d7 a5 56 d7 d7 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 28 00 00 00 20 00 00 00 40 00
-00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff f0 00 ff ff ff ff ff ff ff ff ff ff ff
-ff ff f8 07 7f 0f ff ff ff ff ff ff ff ff ff ff
-ff f0 08 77 7f 70 ff ff ff ff ff ff ff ff ff ff
-f0 08 88 77 7f 77 0f ff ff ff ff ff ff ff ff f0
-07 88 88 79 7f 77 70 ff ff ff ff ff ff ff ff 07
-77 88 88 79 7f 77 77 0f ff ff ff ff ff ff f0 77
-77 88 88 7f f7 f7 77 70 ff ff ff ff ff ff f0 77
-77 88 87 77 77 7f 77 77 0f ff ff ff ff ff f0 77
-77 87 77 77 77 77 f7 77 70 ff ff ff ff ff f0 77
-77 77 77 77 77 77 7f 77 77 0f ff ff ff ff f0 77
-77 77 77 77 77 77 77 f7 77 70 ff ff ff ff f0 77
-77 77 77 77 77 77 77 7f 77 77 0f ff ff ff ff 07
-77 77 77 77 77 77 77 77 f7 77 70 ff ff ff ff f0
-77 77 77 77 77 77 77 77 7f 77 77 0f ff ff ff ff
-07 77 77 77 77 77 77 77 77 f7 77 0f ff ff ff ff
-f0 77 77 77 77 77 77 77 77 7f 77 0f ff ff ff ff
-ff 07 77 77 77 77 77 77 77 77 f7 0f ff ff ff ff
-ff f0 77 77 77 ff 77 77 77 77 7f 0f ff ff ff ff
-ff ff 07 77 ff 77 77 77 77 77 77 0f ff ff ff ff
-ff ff f0 7f 77 77 77 77 77 77 00 ff ff ff ff ff
-ff ff ff 07 77 77 77 77 77 00 70 ff ff ff ff ff
-ff ff ff f0 77 77 77 77 00 7f 77 0f ff ff ff ff
-ff ff ff ff 07 77 77 00 77 77 f7 0f ff ff ff ff
-ff ff ff ff f0 77 00 07 77 77 00 ff ff ff ff ff
-ff ff ff ff ff 00 ff f0 77 00 70 ff ff ff ff ff
-ff ff ff ff ff ff ff ff 00 ff 07 0f ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff f0 70 ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff f0 70 ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff f8 70 ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff 8f ff ff 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 28 00
-00 00 20 00 00 00 40 00 00 00 01 00 08 00 00 00
-00 00 80 04 00 00 00 00 00 00 00 00 00 00 00 01
-00 00 00 00 00 00 00 00 00 00 ff ff ff 00 80 80
-80 00 c0 c0 c0 00 a4 a0 a0 00 58 58 58 00 00 00
-ff 00 dc c0 b2 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 00 00 00 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 05
-00 03 03 01 00 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 00 00 05
-03 03 03 01 03 00 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 00 00 02 02 05
-03 03 03 01 03 03 00 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 00 00 04 02 02 02 05
-03 06 03 01 03 03 03 00 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 00 04 04 04 02 02 02 05
-03 06 03 01 03 03 03 03 00 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 00 04 04 04 04 02 02 02 05
-03 01 01 03 01 03 03 03 03 00 01 01 01 01 01 01
-01 01 01 01 01 01 01 00 04 04 04 04 02 02 02 03
-03 03 03 03 03 01 03 03 03 03 00 01 01 01 01 01
-01 01 01 01 01 01 01 00 04 04 04 04 02 03 03 03
-03 03 03 03 03 03 01 03 03 03 03 00 01 01 01 01
-01 01 01 01 01 01 01 00 04 04 04 03 03 04 04 03
-03 03 03 03 03 03 03 01 03 03 03 03 00 01 01 01
-01 01 01 01 01 01 01 00 04 03 03 04 04 04 04 04
-03 03 03 03 03 03 03 03 01 03 03 03 03 00 01 01
-01 01 01 01 01 01 01 00 03 04 04 04 04 04 04 04
-04 03 03 03 03 03 03 03 03 01 03 03 03 03 00 01
-01 01 01 01 01 01 01 01 00 04 04 04 04 04 04 04
-04 04 03 03 03 03 03 03 03 03 01 03 03 03 03 00
-01 01 01 01 01 01 01 01 01 00 04 04 04 04 04 04
-04 04 04 03 03 03 03 03 03 03 03 01 03 03 03 03
-00 01 01 01 01 01 01 01 01 01 00 04 04 04 04 04
-04 04 04 04 03 03 03 03 03 03 03 03 01 03 03 03
-00 01 01 01 01 01 01 01 01 01 01 00 04 04 04 04
-04 04 04 04 04 03 03 03 03 03 03 03 03 01 03 03
-00 01 01 01 01 01 01 01 01 01 01 01 00 04 04 04
-04 04 04 04 04 04 03 03 03 03 03 03 03 03 01 03
-00 01 01 01 01 01 01 01 01 01 01 01 01 00 04 04
-04 04 04 04 01 01 03 03 03 03 03 03 03 03 03 01
-00 01 01 01 01 01 01 01 01 01 01 01 01 01 00 04
-04 04 01 01 03 03 03 03 03 03 03 03 03 03 03 03
-00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00
-03 01 03 03 03 03 03 03 03 03 03 03 03 03 00 00
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-00 03 03 03 03 03 03 03 03 03 03 03 00 00 04 00
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 00 03 03 03 03 03 03 03 03 00 00 04 01 04 04
-00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 00 03 03 03 03 03 00 00 04 04 04 04 01 04
-00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 00 03 03 00 00 00 04 04 04 04 04 00 00
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 00 00 01 01 01 00 04 04 00 00 04 00
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 00 00 01 01 00 04
-00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00
-04 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 00
-04 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 05
-04 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
-05 01 01 01 01 01 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00                              
-'}
-
-/* mycomputer */ 
-15	ICON
-{'
-00 00 01 00 02 00 10 10 10 00 00 00 00 00 28 01
-00 00 26 00 00 00 20 20 10 00 00 00 00 00 e8 02
-00 00 4e 01 00 00 28 00 00 00 10 00 00 00 20 00
-00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 00 00
-00 00 00 00 00 00 07 77 77 77 77 77 77 70 07 77
-77 77 77 77 77 70 00 00 00 00 00 00 00 00 f0 00
-00 00 00 00 00 0f f0 77 77 77 77 77 77 0f f0 70
-00 00 00 00 07 0f f0 70 cc cc cc cc 07 0f f0 70
-cc cc cc cc 07 0f f0 70 cc cc cc cc 07 0f f0 70
-cc cc cc cc 07 0f f0 70 cc cc cc cc 07 0f f0 70
-cc cc cc cc 07 0f f0 70 00 00 00 00 07 0f f0 77
-77 77 77 77 77 0f f0 00 00 00 00 00 00 0f 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
-00 00 20 00 00 00 40 00 00 00 01 00 04 00 00 00
-00 00 80 02 00 00 00 00 00 00 00 00 00 00 10 00
-00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80
-00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80
-00 00 c0 c0 c0 00 80 80 80 00 00 00 ff 00 00 ff
-00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff
-00 00 ff ff ff 00 ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff f0 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 0f f0 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 0f f0 77 77 77 77 77 77 77 77 77
-77 77 77 77 77 0f f0 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 0f ff f0 00 00 00 00 00 00 00 00
-00 00 00 00 0f ff ff f0 77 77 77 77 77 77 77 77
-77 77 77 77 0f ff ff f0 77 77 77 77 77 77 77 77
-77 77 77 77 0f ff ff f0 77 00 00 00 00 00 00 00
-00 00 00 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 0c cc cc cc cc cc cc
-cc cc c0 77 0f ff ff f0 77 00 00 00 00 00 00 00
-00 00 00 77 0f ff ff f0 77 77 77 77 77 77 77 77
-77 77 77 77 0f ff ff f0 77 77 77 77 77 77 77 77
-77 77 77 77 0f ff ff f0 00 00 00 00 00 00 00 00
-00 00 00 00 0f ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00                              
-'}
-
-/* desktop */
-34	ICON 
-{'
-00 00 01 00 02 00 10 10 10 00 00 00 00 00 28 01
-00 00 26 00 00 00 20 20 10 00 00 00 00 00 e8 02
-00 00 4e 01 00 00 28 00 00 00 10 00 00 00 20 00
-00 00 01 00 04 00 00 00 00 00 c0 00 00 00 00 00
-00 00 00 00 00 00 10 00 00 00 00 00 00 00 00 00
-00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00
-00 00 80 00 80 00 80 80 00 00 c0 c0 c0 00 80 80
-80 00 00 00 ff 00 00 ff 00 00 00 ff ff 00 ff 00
-00 00 ff 00 ff 00 ff ff 00 00 ff ff ff 00 ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff f0 00
-00 00 00 00 00 00 f0 99 00 aa 00 cc 0b b0 f0 99
-00 aa 00 cc 0b b0 f0 99 00 aa 00 cc 0b b0 f0 99
-00 aa 00 cc 0b b0 f0 99 00 aa 00 cc 0b b0 f0 99
-00 aa 00 cc 0b b0 f0 99 00 aa 00 cc 0b b0 f0 99
-00 00 00 cc 0b b0 f0 99 0f ff f0 cc 0b b0 f0 99
-0f ff f0 cc 00 00 f0 00 0f ff f0 cc 0f ff ff ff
-ff ff f0 cc 0f ff ff ff ff ff f0 00 0f ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00
-ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 28 00
-00 00 20 00 00 00 40 00 00 00 01 00 04 00 00 00
-00 00 80 02 00 00 00 00 00 00 00 00 00 00 10 00
-00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80
-00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80
-00 00 c0 c0 c0 00 80 80 80 00 00 00 ff 00 00 ff
-00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff
-00 00 ff ff ff 00 ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff f0 00 00 00 00 00 00 00
-00 00 00 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 c0 c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 0a a0 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 00 00 ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 ff ff ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 ff ff ff ff ff ff ff f0 cc c0 02 20 0b b0 0d
-d0 ff ff ff ff ff ff ff f0 cc c0 00 00 0b b0 0d
-d0 ff ff ff ff ff ff ff f0 cc c0 ff ff 0b b0 0d
-d0 ff ff ff ff ff ff ff f0 cc c0 ff ff 00 00 0d
-d0 ff ff ff ff ff ff ff f0 00 00 ff ff ff ff 0d
-d0 ff ff ff ff ff ff ff ff ff ff ff ff ff ff 0d
-d0 ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00
-00 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff
-ff ff ff ff ff ff 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00                              
-'}
-
-/*--------------------- END FIXME ------------------------*/
-
-/*
- * Everything that does not depend on language,
- * like textless bitmaps etc, go into the
- * neutral language. This will prevent them from
- * being duplicated for each language.
- */
-#include "shell32_xx.rc"
-
-/*
- * Everything specific to any language goes
- * in one of the specific files.
- * Note that you can and may override resources
- * which also have a neutral version. This is to
- * get localized bitmaps for example.
- */
-#include "shell32_En.rc"
-//#include "shell32_Ca.rc"
-//#include "shell32_Cs.rc"
-//#include "shell32_Da.rc"
-//#include "shell32_De.rc"
-//#include "shell32_Eo.rc"
-//#include "shell32_Es.rc"
-//#include "shell32_Fi.rc"
-//#include "shell32_Fr.rc"
-//#include "shell32_Hu.rc"
-//#include "shell32_It.rc"
-//#include "shell32_Ko.rc"
-//#include "shell32_Nl.rc"
-//#include "shell32_No.rc"
-//#include "shell32_Pl.rc"
-//#include "shell32_Pt.rc"
-//#include "shell32_Ru.rc"
-//#include "shell32_Sv.rc"
-//#include "shell32_Wa.rc"
Index: trunk/src/shlwapi/makefile
===================================================================
--- trunk/src/shlwapi/makefile	(revision 3028)
+++ trunk/src/shlwapi/makefile	(revision 3031)
@@ -1,66 +1,74 @@
-# $Id: makefile,v 1.9 2000-02-09 23:47:02 bird Exp $
+# $Id: makefile,v 1.10 2000-03-06 23:39:09 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       shlwapi.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = shlwapirsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\shlwapi.obj \
+$(OBJDIR)\shlwapirsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = shlwapi
 
-OBJS =  shlwapi.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib $(PDWIN32_LIB)/shell32.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/shell32.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/shlwapi/shlwapi.rc
===================================================================
--- trunk/src/shlwapi/shlwapi.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: shlwapi.rc,v 1.1 2000-02-05 02:10:51 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "SHLWAPI System dll\0"
-            VALUE "FileVersion", "4.72.3110.0\0"
-            VALUE "InternalName", "SHLWAPI\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "SHLWAPI.DLL\0"
-            VALUE "ProductName", "Odin32 - SHLWAPI\0"
-            VALUE "ProductVersion", "4.72.3110.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/shlwapi/shlwapirsrc.orc
===================================================================
--- trunk/src/shlwapi/shlwapirsrc.orc	(revision 3031)
+++ trunk/src/shlwapi/shlwapirsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: shlwapirsrc.orc,v 1.1 2000-03-06 23:39:10 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "SHLWAPI System dll\0"
+            VALUE "FileVersion", "4.72.3110.0\0"
+            VALUE "InternalName", "SHLWAPI\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "SHLWAPI.DLL\0"
+            VALUE "ProductName", "Odin32 - SHLWAPI\0"
+            VALUE "ProductVersion", "4.72.3110.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/tapi32/makefile
===================================================================
--- trunk/src/tapi32/makefile	(revision 3028)
+++ trunk/src/tapi32/makefile	(revision 3031)
@@ -1,68 +1,74 @@
-# $Id: makefile,v 1.13 2000-02-10 01:23:30 bird Exp $
+# $Id: makefile,v 1.14 2000-03-06 23:39:10 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       tapi32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = tapi32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\tapi32.obj \
+$(OBJDIR)\tapi32rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = tapi32
 
-OBJS =  tapi32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-          OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
-
Index: trunk/src/tapi32/tapi32.rc
===================================================================
--- trunk/src/tapi32/tapi32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: tapi32.rc,v 1.1 2000-02-05 02:11:22 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "TAPI32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "TAPI32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TAPI32.DLL\0"
-            VALUE "ProductName", "Odin32 - TAPI32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/tapi32/tapi32rsrc.orc
===================================================================
--- trunk/src/tapi32/tapi32rsrc.orc	(revision 3031)
+++ trunk/src/tapi32/tapi32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: tapi32rsrc.orc,v 1.1 2000-03-06 23:39:11 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "TAPI32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "TAPI32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAPI32.DLL\0"
+            VALUE "ProductName", "Odin32 - TAPI32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/twain_32/makefile
===================================================================
--- trunk/src/twain_32/makefile	(revision 3028)
+++ trunk/src/twain_32/makefile	(revision 3031)
@@ -1,69 +1,78 @@
-# $Id: makefile,v 1.4 2000-02-09 23:47:03 bird Exp $
+# $Id: makefile,v 1.5 2000-03-06 23:39:11 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       twain_32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE) -DWIN32
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) -DWIN32
+# Flag overloads and local macros.
+CLEANEXTRAS = twain_32rsrc.asm
+
+CFLAGS = $(CFLAGS) -DWIN32
+CXXFLAGS = $(CXXFLAGS) -DWIN32
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\twain_32.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\twain_32rsrc.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = twain_32
 
-OBJS =   twain_32.obj initterm.obj resource.obj
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-all: $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
-resource.asm: twain_32.rc
-    $(RC) $(RCFLAGS) -o resource.asm twain_32.rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch resource.asm \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        $(TARGET)exp.def
-
-
-
Index: trunk/src/twain_32/twain_32.rc
===================================================================
--- trunk/src/twain_32/twain_32.rc	(revision 3028)
+++ 	(revision )
@@ -1,40 +1,0 @@
-/* $Id: twain_32.rc,v 1.1 2000-01-04 22:19:02 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (TWAIN_32.DLL v1.7)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "Twain 32 Bit Data Source Manager\0"
-            VALUE "FileVersion", "1.6.0.6\0"
-            VALUE "InternalName", "TWAIN_32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "TWAIN_32.DLL\0"
-            VALUE "ProductName", "Odin32 - TWAIN_32\0"
-            VALUE "ProductVersion", "1.6.0.6\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/twain_32/twain_32rsrc.orc
===================================================================
--- trunk/src/twain_32/twain_32rsrc.orc	(revision 3031)
+++ trunk/src/twain_32/twain_32rsrc.orc	(revision 3031)
@@ -0,0 +1,40 @@
+/* $Id: twain_32rsrc.orc,v 1.1 2000-03-06 23:39:12 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (TWAIN_32.DLL v1.7)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "Twain 32 Bit Data Source Manager\0"
+            VALUE "FileVersion", "1.6.0.6\0"
+            VALUE "InternalName", "TWAIN_32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TWAIN_32.DLL\0"
+            VALUE "ProductName", "Odin32 - TWAIN_32\0"
+            VALUE "ProductVersion", "1.6.0.6\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/user32/Makefile
===================================================================
--- trunk/src/user32/Makefile	(revision 3028)
+++ trunk/src/user32/Makefile	(revision 3031)
@@ -1,26 +1,26 @@
-# $Id: Makefile,v 1.67 2000-03-04 23:47:19 sandervl Exp $
+# $Id: Makefile,v 1.68 2000-03-06 23:39:12 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       user32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
 PDWIN32_LIB     = ..\..\lib
-PDWIN32_BIN     = ..\..\bin
+PDWIN32_BIN     = ..\..\$(OBJDIR)
 PDWIN32_TOOLS   = ..\..\tools\bin
 
-#SvL: Remove this when everything has been converted to the new build rules
-NEWBUILD=1
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-RESOURCES= resource
-CFLAGS   = $(CFLAGS)   -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
 
-TARGET = user32
+# Flag overloads and local macros.
+CLEANEXTRAS = user32rsrc.asm
 
+
+# Object files. All objects should be prefixed with $(OBJDIR)!
 OBJS = \
 $(OBJDIR)\user32.obj \
@@ -84,5 +84,4 @@
 $(OBJDIR)\dbglocal.obj \
 $(OBJDIR)\caret.obj \
-$(OBJDIR)\$(RESOURCES).obj \
 $(OBJDIR)\winproc.obj \
 $(OBJDIR)\text.obj \
@@ -91,14 +90,33 @@
 $(OBJDIR)\windlg.obj \
 $(OBJDIR)\win32wdesktop.obj \
-$(OBJDIR)\win32wbasenonclient.obj
+$(OBJDIR)\win32wbasenonclient.obj \
+$(OBJDIR)\user32rsrc.obj
 
-all: $(OBJDIR) $(TARGET).dll $(TARGET).lib
 
-$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
-        $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
-        $(CP) $@ $(PDWIN32_BIN)
+# Target name - name of the dll without extention and path.
+TARGET = user32
 
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
+
+
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
+
+
+# Linker file - creates the parameter file passed on to the linker.
 $(OBJDIR)\$(TARGET).lrf: makefile
-        @echo Creating file <<$(OBJDIR)\$(@B).lrf
+        @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
 $(OBJS)
 $(PDWIN32_LIB)/pmwinx.lib
@@ -113,14 +131,11 @@
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-
-$(RESOURCES).asm: user32.rc
-    $(RC) $(RCFLAGS) -o $(RESOURCES).asm user32.rc
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
+
+# Includes the common rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.post
 
Index: trunk/src/user32/user32.rc
===================================================================
--- trunk/src/user32/user32.rc	(revision 3028)
+++ 	(revision )
@@ -1,935 +1,0 @@
-/* $Id: user32.rc,v 1.10 2000-02-22 17:07:41 cbratschi Exp $ */
-/* converted from WINE */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-/* System Menu */
-
-SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
-{
- MENUITEM "&Restore", 61728
- MENUITEM "&Move", 61456
- MENUITEM "&Size", 61440
- MENUITEM "Mi&nimize", 61472
- MENUITEM "Ma&ximize", 61488
- MENUITEM SEPARATOR
- MENUITEM "&Close\tAlt-F4", 61536
- MENUITEM SEPARATOR
- MENUITEM "&Switch to ...\tCtrl-Esc", 61744
- MENUITEM SEPARATOR
- MENUITEM "&About Odin ...", 61761
- MENUITEM SEPARATOR
- MENUITEM "&Put mark in debug log", 61762
-}
-
-/* Frame */
-
- /* Odin bitmaps */
-
-#define OBM_CONTEXTHELP            32730
-
-OBM_CONTEXTHELP BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 26 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 C2 C2 C2 02 02 02'
-        'FE FE FE 82 82 82 DE DE DE 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
-        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
-        '00 31 24 00 00 01 10 00 00 31 24 00 00 01 10 00'
-        '00 31 24 00 00 00 00 00 00 31 24 00 00 01 10 00'
-        '00 31 24 00 00 01 10 00 00 31 24 00 00 00 11 00'
-        '00 31 24 00 01 10 01 10 00 31 24 00 01 10 01 10'
-        '00 31 24 00 00 11 11 00 00 31 24 44 44 44 44 44'
-        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
-        '22 22 22 22 22 22 22 21'
-}
-
-#define OBM_CONTEXTHELPD           32729
-
-OBM_CONTEXTHELPD BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 26 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 C2 C2 C2 02 02 02'
-        'FE FE FE DE DE DE 82 82 82 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
-        '22 22 13 33 33 33 33 33 33 32 14 00 00 00 11 00'
-        '00 32 14 00 00 00 11 00 00 32 14 00 00 00 00 00'
-        '00 32 14 00 00 00 11 00 00 32 14 00 00 00 11 00'
-        '00 32 14 00 00 00 01 10 00 32 14 00 00 11 00 11'
-        '00 32 14 00 00 11 00 11 00 32 14 00 00 01 11 10'
-        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
-        '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32'
-        '11 11 11 11 11 11 11 12'
-}
-
- /* Windows bitmaps */
-
-#define OBM_CLOSED          32731
-
-OBM_CLOSED BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
-        '22 22 13 33 33 33 33 33 33 32 14 00 00 00 00 00'
-        '00 32 14 00 01 10 00 01 10 32 14 00 00 11 00 11'
-        '00 32 14 00 00 01 11 10 00 32 14 00 00 00 11 00'
-        '00 32 14 00 00 01 11 10 00 32 14 00 00 11 00 11'
-        '00 32 14 00 01 10 00 01 10 32 14 00 00 00 00 00'
-        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
-        '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32'
-        '11 11 11 11 11 11 11 12'
-}
-
-#define OBM_RESTORED        32744
-#define OBM_ZOOMD           32745
-#define OBM_REDUCED         32746
-#define OBM_RESTORE         32747
-#define OBM_ZOOM            32748
-#define OBM_REDUCE          32749
-
-OBM_RESTORED BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
-        '22 22 13 33 33 33 33 33 33 32 14 00 11 11 11 00'
-        '00 32 14 00 10 00 01 00 00 32 14 00 10 00 01 00'
-        '00 32 14 00 10 00 01 11 00 32 14 00 11 11 11 01'
-        '00 32 14 00 11 11 11 01 00 32 14 00 00 10 00 01'
-        '00 32 14 00 00 11 11 11 00 32 14 00 00 11 11 11'
-        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
-        '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32'
-        '11 11 11 11 11 11 11 12'
-}
-
-OBM_ZOOMD BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
-        '22 22 13 33 33 33 33 33 33 32 14 00 11 11 11 11'
-        '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00'
-        '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00'
-        '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00'
-        '10 32 14 00 11 11 11 11 10 32 14 00 11 11 11 11'
-        '10 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
-        '44 32 11 11 11 11 11 11 11 11 44 44 44 44 44 32'
-        '11 11 11 11 11 11 11 11'
-}
-
-OBM_REDUCED BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
-        '22 22 13 33 33 33 33 33 33 32 14 00 01 11 11 10'
-        '00 32 14 00 01 11 11 10 00 32 14 00 00 00 00 00'
-        '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00'
-        '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00'
-        '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00'
-        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
-        '44 32 11 11 11 11 11 11 11 11 44 44 44 44 44 32'
-        '11 11 11 11 11 11 11 11'
-}
-
-OBM_RESTORE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
-        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
-        '00 31 24 01 11 11 10 00 00 31 24 01 00 00 10 00'
-        '00 31 24 01 00 00 10 00 00 31 24 01 00 00 11 10'
-        '00 31 24 01 11 11 10 10 00 31 24 01 11 11 10 10'
-        '00 31 24 00 01 00 00 10 00 31 24 00 01 11 11 10'
-        '00 31 24 00 01 11 11 10 00 31 24 44 44 44 44 44'
-        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
-        '22 22 22 22 22 22 22 21'
-}
-
-OBM_ZOOM BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
-        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
-        '00 31 24 01 11 11 11 11 00 31 24 01 00 00 00 01'
-        '00 31 24 01 00 00 00 01 00 31 24 01 00 00 00 01'
-        '00 31 24 01 00 00 00 01 00 31 24 01 00 00 00 01'
-        '00 31 24 01 00 00 00 01 00 31 24 01 11 11 11 11'
-        '00 31 24 01 11 11 11 11 00 31 24 44 44 44 44 44'
-        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
-        '22 22 22 22 22 22 22 21'
-}
-
-OBM_REDUCE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
-        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
-        '00 31 24 00 11 11 11 00 00 31 24 00 11 11 11 00'
-        '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00'
-        '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00'
-        '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00'
-        '00 31 24 00 00 00 00 00 00 31 24 44 44 44 44 44'
-        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
-        '22 22 22 22 22 22 22 21'
-}
-
-#define OBM_CLOSE           32754
-
-OBM_CLOSE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
-        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
-        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
-        '00 31 24 00 00 00 00 00 00 31 24 00 11 00 00 11'
-        '00 31 24 00 01 10 01 10 00 31 24 00 00 11 11 00'
-        '00 31 24 00 00 01 10 00 00 31 24 00 00 11 11 00'
-        '00 31 24 00 01 10 01 10 00 31 24 00 11 00 00 11'
-        '00 31 24 00 00 00 00 00 00 31 24 44 44 44 44 44'
-        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
-        '22 22 22 22 22 22 22 21'
-}
-
-#define OBM_OLD_RESTORE     32755
-#define OBM_OLD_ZOOM        32756
-#define OBM_OLD_REDUCE      32757
-
-OBM_OLD_RESTORE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 81 F0 00 01 C3 F0 00'
-        '02 E2 30 00 04 72 30 00 08 3A 30 00 10 1E 30 00'
-        '3C 7E 30 00 04 62 30 00 04 62 3C 00 04 7E 3E 00'
-        '04 68 0C 00 04 64 18 00 04 62 30 00 04 61 60 00'
-        '07 C0 80 00 00 00 00 00 00 00 00 00 60 00 07 C0'
-        '80 00 00 00 00 00 00 00 00 00'
-}
-
-OBM_OLD_ZOOM BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 1F 00 00 00 3F 00 00'
-        '00 23 00 00 00 23 00 00 00 23 00 00 00 23 00 00'
-        '00 23 00 00 00 23 00 00 00 23 C0 00 01 E3 E0 00'
-        '00 80 C0 00 00 41 80 00 00 23 00 00 00 16 00 00'
-        '00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 08'
-        '00 00 00 00 00 00 00 00 00 00'
-}
-
-OBM_OLD_REDUCE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 04 00 00 00 0E 00 00 00 17 00 00'
-        '00 23 80 00 00 41 C0 00 00 80 E0 00 01 E3 C0 00'
-        '00 23 00 00 00 23 00 00 00 23 00 00 00 23 00 00'
-        '00 23 00 00 00 23 00 00 00 22 00 00 00 3E 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00'
-}
-
-#define OBM_SIZE            32766
-#define OBM_OLD_CLOSE       32767
-
-OBM_SIZE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 62 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 0D 00 0D 00 01 00 01 00 FF FF FF 00 00 00'
-        '07 00 00 00 07 00 00 00 07 00 00 00 07 00 00 00'
-        '07 00 00 00 FF 00 00 00 FF 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00'
-}
-
-OBM_OLD_CLOSE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D C6 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 32 00 13 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 1F FF FE 00 3F F0 00 00'
-        '3F FF FE 00 7F F0 00 00 20 00 06 00 40 30 00 00'
-        '20 00 06 00 40 30 00 00 3F FF FC 00 7F E0 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00'
-}
-
-/* Button */
-
-#define OBM_BTNCORNERS      32758
-#define OBM_CHECKBOXES      32759
-#define OBM_CHECK           32760
-#define OBM_BTSIZE          32761
-
-OBM_BTNCORNERS BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 56 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 1E 00 0A 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 07 80 00 1E 0F C0 00 21 18 61 E0'
-        '21 18 61 E0 21 18 61 E0 21 18 61 E0 1E 0F C0 00'
-        '00 07 80 00 00 00 00 00 61 E0 1E 0F C0 00 00 07'
-        '80 00 00 00 00 00'
-}
-
-OBM_CHECKBOXES BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 3E 00 00 00 28 00'
-'00 00 38 00 00 00 27 00 00 00 01 00 01 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00'
-'00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 03'
-'FF E0 00 3F FE 00 00 02 AA A0 00 3F FE 00 00 03'
-'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
-'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
-'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
-'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
-'55 60 00 35 56 00 00 02 AA A0 00 3F FE 00 00 03'
-'FF E0 00 3F FE 00 07 00 1C 00 70 01 C0 00 18 C0'
-'63 01 FC 07 F0 00 20 20 80 83 8E 0E 38 00 40 11'
-'1C 46 03 1D DC 00 40 11 3E 46 03 1B EC 00 80 0A'
-'7F 2C 01 B7 F6 00 80 0A 7F 2C 01 B7 F6 00 80 0A'
-'7F 2C 01 B7 F6 00 40 11 3E 46 03 1B EC 00 40 11'
-'1C 46 03 1D DC 00 20 20 80 83 8E 0E 38 00 18 C0'
-'63 01 FC 07 F0 00 07 00 1C 00 70 01 C0 00 FF FB'
-'FF EF FF BF FE 00 80 0B 00 6F FF BF FE 00 80 0A'
-'80 AC 01 B8 0E 00 80 0A 41 2C 01 B4 16 00 80 0A'
-'22 2C 01 B2 26 00 80 0A 14 2C 01 B1 46 00 80 0A'
-'08 2C 01 B0 86 00 80 0A 14 2C 01 B1 46 00 80 0A'
-'22 2C 01 B2 26 00 80 0A 41 2C 01 B4 16 00 80 0A'
-'80 AC 01 B8 0E 00 80 0B 00 6F FF BF FE 00 FF FB'
-'FF EF FF BF FE 00'
-}
-
-OBM_CHECK BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 66 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 0E 00 0E 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
-        '03 80 00 00 02 80 00 00 06 C0 00 00 0C 40 00 00'
-        '00 60 00 00 00 20 00 00 00 30 00 00 00 10 00 00'
-        '00 10 00 00 00 00 00 00 00 00 00 10 00 00 00 10'
-        '00 00 00 00 00 00'
-}
-
-OBM_BTSIZE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
-        'FF FE 00 00 80 02 00 00 80 02 00 00 80 02 00 00'
-        '80 02 00 00 80 02 00 00 FF 82 00 00 80 82 00 00'
-        '80 82 00 00 80 82 00 00 80 82 00 00 80 82 00 00'
-        '80 82 00 00 80 82 00 00 FF FE 00 00 00 00 80 82'
-        '00 00 80 82 00 00 FF FE 00 00'
-}
-
-#define OBM_RADIOCHECK      32732
-
-OBM_RADIOCHECK BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 84 00 00 00 00 00 00 00 3E 00 00 00 28 00'
-        '00 00 0E 00 00 00 0E 00 00 00 01 00 01 00 00 00'
-        '00 00 38 00 00 00 00 00 00 00 00 00 00 00 02 00'
-        '00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 07 80 00 00 0F C0'
-        '00 00 1F E0 00 00 1F E0 00 00 1F E0 00 00 1F E0'
-        '00 00 0F C0 00 00 07 80 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00'
-}
-
-/* Scroll */
-
-#define OBM_LFARROWI        32734
-#define OBM_RGARROWI        32735
-#define OBM_DNARROWI        32736
-#define OBM_UPARROWI        32737
-
-OBM_LFARROWI BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
-'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
-'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
-'00 11 20 00 00 00 23 00 00 00 03 00 00 11 20 00'
-'00 00 23 00 00 00 13 00 00 11 20 00 00 00 23 00'
-'00 01 10 33 30 11 20 00 00 00 23 00 00 11 11 11'
-'30 11 20 00 00 00 23 00 01 11 11 11 30 11 20 00'
-'00 00 23 00 00 11 11 11 00 11 20 00 00 00 23 00'
-'00 01 13 00 00 11 20 00 00 00 23 00 00 00 13 00'
-'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
-'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
-'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
-'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00'
-}
-
-OBM_RGARROWI BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
-'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
-'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
-'00 11 20 00 00 00 23 00 00 00 03 00 00 11 20 00'
-'00 00 23 00 00 00 13 30 00 11 20 00 00 00 23 00'
-'00 33 11 33 00 11 20 00 00 00 23 00 01 11 11 13'
-'30 11 20 00 00 00 23 00 01 11 11 11 00 11 20 00'
-'00 00 23 00 01 11 11 10 00 11 20 00 00 00 23 00'
-'00 00 11 00 00 11 20 00 00 00 23 00 00 00 10 00'
-'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
-'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
-'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
-'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00'
-}
-
-OBM_DNARROWI BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
-'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
-'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
-'00 11 20 00 00 00 23 00 00 00 03 00 00 11 20 00'
-'00 00 23 00 00 00 13 30 00 11 20 00 00 00 23 00'
-'00 01 11 33 00 11 20 00 00 00 23 00 00 11 11 13'
-'30 11 20 00 00 00 23 00 01 11 11 11 00 11 20 00'
-'00 00 23 00 00 01 11 30 00 11 20 00 00 00 23 00'
-'00 01 11 30 00 11 20 00 00 00 23 00 00 01 11 00'
-'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
-'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
-'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
-'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00'
-}
-
-OBM_UPARROWI BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
-'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
-'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
-'00 11 20 00 00 00 23 00 00 00 33 30 00 11 20 00'
-'00 00 23 00 00 01 11 30 00 11 20 00 00 00 23 00'
-'00 01 11 30 00 11 20 00 00 00 23 00 03 31 11 03'
-'30 11 20 00 00 00 23 00 01 11 11 11 00 11 20 00'
-'00 00 23 00 00 11 11 10 00 11 20 00 00 00 23 00'
-'00 01 11 00 00 11 20 00 00 00 23 00 00 00 10 00'
-'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
-'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
-'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
-'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
-'00 00'
-}
-
-#define OBM_LFARROWD        32740
-#define OBM_RGARROWD        32741
-#define OBM_DNARROWD        32742
-#define OBM_UPARROWD        32743
-
-OBM_LFARROWD BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
-'00 00 12 00 00 00 11 00 00 00 10 00 00 00 12 00'
-'00 01 11 11 10 00 10 00 00 00 12 00 00 11 11 11'
-'10 00 10 00 00 00 12 00 00 01 11 11 10 00 10 00'
-'00 00 12 00 00 00 11 00 00 00 10 00 00 00 12 00'
-'00 00 01 00 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
-'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-OBM_RGARROWD BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
-'00 00 12 00 00 00 01 10 00 00 10 00 00 00 12 00'
-'00 11 11 11 00 00 10 00 00 00 12 00 00 11 11 11'
-'10 00 10 00 00 00 12 00 00 11 11 11 00 00 10 00'
-'00 00 12 00 00 00 01 10 00 00 10 00 00 00 12 00'
-'00 00 01 00 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
-'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-OBM_DNARROWD BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
-'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
-'00 01 11 11 00 00 10 00 00 00 12 00 00 11 11 11'
-'10 00 10 00 00 00 12 00 00 00 11 10 00 00 10 00'
-'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
-'00 00 11 10 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
-'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-OBM_UPARROWD BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 11 10 00 00 10 00'
-'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
-'00 00 11 10 00 00 10 00 00 00 12 00 00 11 11 11'
-'10 00 10 00 00 00 12 00 00 01 11 11 00 00 10 00'
-'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
-'00 00 01 00 00 00 10 00 00 00 12 00 00 00 00 00'
-'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
-'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
-'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
-'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-#define OBM_LFARROW         32750
-#define OBM_RGARROW         32751
-#define OBM_DNARROW         32752
-#define OBM_UPARROW         32753
-
-OBM_LFARROW BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
-'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
-'00 01 10 00 00 22 10 00 00 00 13 00 00 11 11 11'
-'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
-'00 00 13 00 00 11 11 11 00 22 10 00 00 00 13 00'
-'00 01 10 00 00 22 10 00 00 00 13 00 00 00 10 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
-'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
-'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-OBM_RGARROW BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
-'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
-'00 00 11 00 00 22 10 00 00 00 13 00 01 11 11 10'
-'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
-'00 00 13 00 01 11 11 10 00 22 10 00 00 00 13 00'
-'00 00 11 00 00 22 10 00 00 00 13 00 00 00 10 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
-'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
-'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-OBM_DNARROW BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
-'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
-'00 01 11 00 00 22 10 00 00 00 13 00 00 11 11 10'
-'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
-'00 00 13 00 00 01 11 00 00 22 10 00 00 00 13 00'
-'00 01 11 00 00 22 10 00 00 00 13 00 00 01 11 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
-'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
-'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-OBM_UPARROW BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
-'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
-'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
-'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
-'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 01 11 00 00 22 10 00 00 00 13 00'
-'00 01 11 00 00 22 10 00 00 00 13 00 00 01 11 00'
-'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
-'00 00 13 00 00 11 11 10 00 22 10 00 00 00 13 00'
-'00 01 11 00 00 22 10 00 00 00 13 00 00 00 10 00'
-'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
-'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
-'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
-'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
-'00 00'
-}
-
-#define OBM_MNARROW         32739
-
-OBM_MNARROW BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 78 00 00 00 00 00 00 00 3E 00 00 00 28 00'
-        '00 00 07 00 00 00 0B 00 00 00 01 00 01 00 00 00'
-        '00 00 2C 00 00 00 00 00 00 00 00 00 00 00 02 00'
-        '00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 00'
-        '00 00 40 00 00 00 60 00 00 00 70 00 00 00 78 00'
-        '00 00 7C 00 00 00 78 00 00 00 70 00 00 00 60 00'
-        '00 00 40 00 00 00 00 00 00 00 00 00 60 00 00 00'
-        '40 00 00 00 00 00 00 00'
-}
-
-#define OBM_OLD_LFARROW     32762
-#define OBM_OLD_RGARROW     32763
-#define OBM_OLD_DNARROW     32764
-#define OBM_OLD_UPARROW     32765
-
-OBM_OLD_LFARROW BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
-        '03 00 00 00 07 00 00 00 0F F0 00 00 1F F0 00 00'
-        '0F F0 00 00 07 00 00 00 03 00 00 00 01 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00'
-}
-
-OBM_OLD_RGARROW BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
-        '01 80 00 00 01 C0 00 00 1F E0 00 00 1F F0 00 00'
-        '1F E0 00 00 01 C0 00 00 01 80 00 00 01 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00'
-}
-
-OBM_OLD_DNARROW BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
-        '03 80 00 00 07 C0 00 00 0F E0 00 00 1F F0 00 00'
-        '03 80 00 00 03 80 00 00 03 80 00 00 03 80 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00'
-}
-
-OBM_OLD_UPARROW BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
-        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 03 80 00 00'
-        '03 80 00 00 03 80 00 00 03 80 00 00 1F F0 00 00'
-        '0F E0 00 00 07 C0 00 00 03 80 00 00 01 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00'
-}
-
-/* Combo */
-
-#define OBM_COMBO           32738
-
-OBM_COMBO BITMAP LOADONCALL DISCARDABLE
-{
-'42 4D 4E 00 00 00 00 00 00 00 56 00 00 00 40 00'
-'00 00 07 00 00 00 09 00 00 00 01 00 01 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-'00 00 FF FF FF 00 00 00 00 00 FE 00 00 00 EE 00'
-'00 00 C6 00 00 00 82 00 00 00 00 00 00 00 C6 00'
-'00 00 C6 00 00 00 C6 00 00 00'
-}
-/* Other */
-
-#define OBM_TRTYPE          32733
-
-OBM_TRTYPE BITMAP LOADONCALL DISCARDABLE
-{
-        '42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
-        '00 00 0E 00 00 00 0E 00 00 00 01 00 04 00 00 00'
-        '00 00 70 00 00 00 00 00 00 00 00 00 00 00 10 00'
-        '00 00 00 00 00 00 00 00 00 00 80 00 00 00 00 80'
-        '00 00 80 80 00 00 00 00 80 00 80 00 80 00 00 80'
-        '80 00 C0 C0 C0 00 80 80 80 00 FF 00 00 00 00 FF'
-        '00 00 FF FF 00 00 00 00 FF 00 FF 00 FF 00 00 FF'
-        'FF 00 FF FF FF 00 FF FF FF FF FF FF FF 00 FF FF'
-        'FF 00 00 00 FF 00 FF FF FF FF 00 FF FF 00 FF FF'
-        'FF FF 00 FF FF 00 F8 88 88 88 00 FF FF 00 FF FF'
-        '88 FF 00 FF FF 00 FF FF 80 FF 00 FF 0F 00 FF FF'
-        '80 FF 00 FF 0F 00 FF FF 80 0F 00 F0 0F 00 F8 FF'
-        '80 00 00 00 0F 00 F8 FF 88 FF 8F FF FF 00 F8 8F'
-        '88 F8 8F FF FF 00 F8 88 88 88 8F FF FF 00 FF FF'
-        'FF FF FF FF FF 00'
-}
-
-/* Edit */
-
-#define EM_UNDO              0x00c7
-#define WM_CUT               0x0300
-#define WM_COPY              0x0301
-#define WM_PASTE             0x0302
-#define WM_CLEAR             0x0303
-#define EM_SETSEL            0x00b1
-
-EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
-{
-        POPUP ""
-        BEGIN
-                MENUITEM "&Undo", EM_UNDO
-                MENUITEM SEPARATOR
-                MENUITEM "Cu&t", WM_CUT
-                MENUITEM "&Copy", WM_COPY
-                MENUITEM "&Paste", WM_PASTE
-                MENUITEM "&Delete", WM_CLEAR
-                MENUITEM SEPARATOR
-                MENUITEM "Select &All", EM_SETSEL
-        END
-}
-
-/* Icons */
-
-#define OIC_SAMPLE          32512
-#define OIC_HAND            32513
-#define OIC_QUES            32514
-#define OIC_BANG            32515
-#define OIC_NOTE            32516
-#define OIC_PORTRAIT        32517
-#define OIC_LANDSCAPE       32518
-#define OIC_ODINICON        32519
-#define OIC_FOLDER          32520
-#define OIC_FOLDER2         32521
-#define OIC_FLOPPY          32522
-#define OIC_CDROM           32523
-#define OIC_HDISK           32524
-#define OIC_NETWORK         32525
-
-/* Cursors */
-
-#define OCR_BUMMER          100
-#define OCR_DRAGOBJECT      101
-
-#define OCR_NORMAL          32512
-
-#if 0
-
-/* CB: test: problems: flickering, PMView export bugs (transparency, hotspot, colors) */
-/* CB: how can we convert those X-icons/cursors? */
-/*     please inform me about any solution: cbratschi@datacomm.ch */
-
-OCR_NORMAL CURSOR LOADONCALL DISCARDABLE
-{
-        '00 00 02 00 01 00 20 20 02 00 01 00 01 00 30 01'
-        '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
-        '00 00 01 00 01 00 00 00 00 00 00 02 00 00 00 00'
-        '00 00 00 00 00 00 02 00 00 00 00 00 00 00 00 00'
-        '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
-        '00 00 00 00 00 00 00 00 00 00 00 C0 00 00 00 C0'
-        '00 00 01 80 00 00 01 80 00 00 03 00 00 00 43 00'
-        '00 00 66 00 00 00 76 00 00 00 7E 00 00 00 7F C0'
-        '00 00 7F 80 00 00 7F 00 00 00 7E 00 00 00 7C 00'
-        '00 00 78 00 00 00 70 00 00 00 60 00 00 00 40 00'
-        '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF'
-        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
-        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
-        'FF FF FF FF FF FF FF FF FF FF FF 3F FF FF FF 3F'
-        'FF FF FE 7F FF FF FE 7F FF FF FC FF FF FF BC FF'
-        'FF FF 99 FF FF FF 89 FF FF FF 81 FF FF FF 80 3F'
-        'FF FF 80 7F FF FF 80 FF FF FF 81 FF FF FF 83 FF'
-        'FF FF 87 FF FF FF 8F FF FF FF 9F FF FF FF BF FF'
-        'FF FF FF FF FF FF'
-}
-
-#endif
-
-#define OCR_IBEAM           32513
-#define OCR_WAIT            32514
-#define OCR_CROSS           32515
-#define OCR_UP              32516
-#define OCR_SIZE            32640
-#define OCR_ICON            32641
-#define OCR_SIZENWSE        32642
-#define OCR_SIZENESW        32643
-#define OCR_SIZEWE          32644
-#define OCR_SIZENS          32645
-#define OCR_SIZEALL         32646
-#define OCR_ICOCUR          32647
-#define OCR_NO              32648
-#define OCR_APPSTARTING     32650
-#define OCR_HELP            32651  /* only defined in Odin */
-
-
-MSGBOX DIALOG 100, 80, 216, 168
-STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-BEGIN
-        ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
-        LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
-        PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&Cancel", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&Abort", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&Retry", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&Ignore", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&Yes", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-        PUSHBUTTON "&No", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3 user32.dll)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "USER32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "USER32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "USER32.DLL\0"
-            VALUE "ProductName", "Odin32 - USER32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/user32/user32rsrc.orc
===================================================================
--- trunk/src/user32/user32rsrc.orc	(revision 3031)
+++ trunk/src/user32/user32rsrc.orc	(revision 3031)
@@ -0,0 +1,935 @@
+/* $Id: user32rsrc.orc,v 1.1 2000-03-06 23:39:14 bird Exp $ */
+/* converted from WINE */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+/* System Menu */
+
+SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE
+{
+ MENUITEM "&Restore", 61728
+ MENUITEM "&Move", 61456
+ MENUITEM "&Size", 61440
+ MENUITEM "Mi&nimize", 61472
+ MENUITEM "Ma&ximize", 61488
+ MENUITEM SEPARATOR
+ MENUITEM "&Close\tAlt-F4", 61536
+ MENUITEM SEPARATOR
+ MENUITEM "&Switch to ...\tCtrl-Esc", 61744
+ MENUITEM SEPARATOR
+ MENUITEM "&About Odin ...", 61761
+ MENUITEM SEPARATOR
+ MENUITEM "&Put mark in debug log", 61762
+}
+
+/* Frame */
+
+ /* Odin bitmaps */
+
+#define OBM_CONTEXTHELP            32730
+
+OBM_CONTEXTHELP BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 26 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 C2 C2 C2 02 02 02'
+        'FE FE FE 82 82 82 DE DE DE 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
+        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
+        '00 31 24 00 00 01 10 00 00 31 24 00 00 01 10 00'
+        '00 31 24 00 00 00 00 00 00 31 24 00 00 01 10 00'
+        '00 31 24 00 00 01 10 00 00 31 24 00 00 00 11 00'
+        '00 31 24 00 01 10 01 10 00 31 24 00 01 10 01 10'
+        '00 31 24 00 00 11 11 00 00 31 24 44 44 44 44 44'
+        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
+        '22 22 22 22 22 22 22 21'
+}
+
+#define OBM_CONTEXTHELPD           32729
+
+OBM_CONTEXTHELPD BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 26 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 C2 C2 C2 02 02 02'
+        'FE FE FE DE DE DE 82 82 82 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
+        '22 22 13 33 33 33 33 33 33 32 14 00 00 00 11 00'
+        '00 32 14 00 00 00 11 00 00 32 14 00 00 00 00 00'
+        '00 32 14 00 00 00 11 00 00 32 14 00 00 00 11 00'
+        '00 32 14 00 00 00 01 10 00 32 14 00 00 11 00 11'
+        '00 32 14 00 00 11 00 11 00 32 14 00 00 01 11 10'
+        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
+        '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32'
+        '11 11 11 11 11 11 11 12'
+}
+
+ /* Windows bitmaps */
+
+#define OBM_CLOSED          32731
+
+OBM_CLOSED BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
+        '22 22 13 33 33 33 33 33 33 32 14 00 00 00 00 00'
+        '00 32 14 00 01 10 00 01 10 32 14 00 00 11 00 11'
+        '00 32 14 00 00 01 11 10 00 32 14 00 00 00 11 00'
+        '00 32 14 00 00 01 11 10 00 32 14 00 00 11 00 11'
+        '00 32 14 00 01 10 00 01 10 32 14 00 00 00 00 00'
+        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
+        '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32'
+        '11 11 11 11 11 11 11 12'
+}
+
+#define OBM_RESTORED        32744
+#define OBM_ZOOMD           32745
+#define OBM_REDUCED         32746
+#define OBM_RESTORE         32747
+#define OBM_ZOOM            32748
+#define OBM_REDUCE          32749
+
+OBM_RESTORED BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
+        '22 22 13 33 33 33 33 33 33 32 14 00 11 11 11 00'
+        '00 32 14 00 10 00 01 00 00 32 14 00 10 00 01 00'
+        '00 32 14 00 10 00 01 11 00 32 14 00 11 11 11 01'
+        '00 32 14 00 11 11 11 01 00 32 14 00 00 10 00 01'
+        '00 32 14 00 00 11 11 11 00 32 14 00 00 11 11 11'
+        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
+        '44 32 11 11 11 11 11 11 11 12 44 44 44 44 44 32'
+        '11 11 11 11 11 11 11 12'
+}
+
+OBM_ZOOMD BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
+        '22 22 13 33 33 33 33 33 33 32 14 00 11 11 11 11'
+        '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00'
+        '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00'
+        '10 32 14 00 10 00 00 00 10 32 14 00 10 00 00 00'
+        '10 32 14 00 11 11 11 11 10 32 14 00 11 11 11 11'
+        '10 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
+        '44 32 11 11 11 11 11 11 11 11 44 44 44 44 44 32'
+        '11 11 11 11 11 11 11 11'
+}
+
+OBM_REDUCED BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF D8 D8 D8 7F 7F 7F 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 22 22 22 22 22 22'
+        '22 22 13 33 33 33 33 33 33 32 14 00 01 11 11 10'
+        '00 32 14 00 01 11 11 10 00 32 14 00 00 00 00 00'
+        '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00'
+        '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00'
+        '00 32 14 00 00 00 00 00 00 32 14 00 00 00 00 00'
+        '00 32 14 00 00 00 00 00 00 32 14 44 44 44 44 44'
+        '44 32 11 11 11 11 11 11 11 11 44 44 44 44 44 32'
+        '11 11 11 11 11 11 11 11'
+}
+
+OBM_RESTORE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
+        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
+        '00 31 24 01 11 11 10 00 00 31 24 01 00 00 10 00'
+        '00 31 24 01 00 00 10 00 00 31 24 01 00 00 11 10'
+        '00 31 24 01 11 11 10 10 00 31 24 01 11 11 10 10'
+        '00 31 24 00 01 00 00 10 00 31 24 00 01 11 11 10'
+        '00 31 24 00 01 11 11 10 00 31 24 44 44 44 44 44'
+        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
+        '22 22 22 22 22 22 22 21'
+}
+
+OBM_ZOOM BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
+        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
+        '00 31 24 01 11 11 11 11 00 31 24 01 00 00 00 01'
+        '00 31 24 01 00 00 00 01 00 31 24 01 00 00 00 01'
+        '00 31 24 01 00 00 00 01 00 31 24 01 00 00 00 01'
+        '00 31 24 01 00 00 00 01 00 31 24 01 11 11 11 11'
+        '00 31 24 01 11 11 11 11 00 31 24 44 44 44 44 44'
+        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
+        '22 22 22 22 22 22 22 21'
+}
+
+OBM_REDUCE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
+        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
+        '00 31 24 00 11 11 11 00 00 31 24 00 11 11 11 00'
+        '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00'
+        '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00'
+        '00 31 24 00 00 00 00 00 00 31 24 00 00 00 00 00'
+        '00 31 24 00 00 00 00 00 00 31 24 44 44 44 44 44'
+        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
+        '22 22 22 22 22 22 22 21'
+}
+
+#define OBM_CLOSE           32754
+
+OBM_CLOSE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C8 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 10 00 0E 00 01 00 04 00 BF BF BF 00 00 00'
+        'FF FF FF 7F 7F 7F D8 D8 D8 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 11 11 11 11 11 11'
+        '11 11 23 33 33 33 33 33 33 31 24 00 00 00 00 00'
+        '00 31 24 00 00 00 00 00 00 31 24 00 11 00 00 11'
+        '00 31 24 00 01 10 01 10 00 31 24 00 00 11 11 00'
+        '00 31 24 00 00 01 10 00 00 31 24 00 00 11 11 00'
+        '00 31 24 00 01 10 01 10 00 31 24 00 11 00 00 11'
+        '00 31 24 00 00 00 00 00 00 31 24 44 44 44 44 44'
+        '44 31 22 22 22 22 22 22 22 21 44 44 44 44 44 31'
+        '22 22 22 22 22 22 22 21'
+}
+
+#define OBM_OLD_RESTORE     32755
+#define OBM_OLD_ZOOM        32756
+#define OBM_OLD_REDUCE      32757
+
+OBM_OLD_RESTORE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 81 F0 00 01 C3 F0 00'
+        '02 E2 30 00 04 72 30 00 08 3A 30 00 10 1E 30 00'
+        '3C 7E 30 00 04 62 30 00 04 62 3C 00 04 7E 3E 00'
+        '04 68 0C 00 04 64 18 00 04 62 30 00 04 61 60 00'
+        '07 C0 80 00 00 00 00 00 00 00 00 00 60 00 07 C0'
+        '80 00 00 00 00 00 00 00 00 00'
+}
+
+OBM_OLD_ZOOM BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 1F 00 00 00 3F 00 00'
+        '00 23 00 00 00 23 00 00 00 23 00 00 00 23 00 00'
+        '00 23 00 00 00 23 00 00 00 23 C0 00 01 E3 E0 00'
+        '00 80 C0 00 00 41 80 00 00 23 00 00 00 16 00 00'
+        '00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 08'
+        '00 00 00 00 00 00 00 00 00 00'
+}
+
+OBM_OLD_REDUCE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 7A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 19 00 13 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 04 00 00 00 0E 00 00 00 17 00 00'
+        '00 23 80 00 00 41 C0 00 00 80 E0 00 01 E3 C0 00'
+        '00 23 00 00 00 23 00 00 00 23 00 00 00 23 00 00'
+        '00 23 00 00 00 23 00 00 00 22 00 00 00 3E 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00'
+}
+
+#define OBM_SIZE            32766
+#define OBM_OLD_CLOSE       32767
+
+OBM_SIZE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 62 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 0D 00 0D 00 01 00 01 00 FF FF FF 00 00 00'
+        '07 00 00 00 07 00 00 00 07 00 00 00 07 00 00 00'
+        '07 00 00 00 FF 00 00 00 FF 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00'
+}
+
+OBM_OLD_CLOSE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D C6 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 32 00 13 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 1F FF FE 00 3F F0 00 00'
+        '3F FF FE 00 7F F0 00 00 20 00 06 00 40 30 00 00'
+        '20 00 06 00 40 30 00 00 3F FF FC 00 7F E0 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00'
+}
+
+/* Button */
+
+#define OBM_BTNCORNERS      32758
+#define OBM_CHECKBOXES      32759
+#define OBM_CHECK           32760
+#define OBM_BTSIZE          32761
+
+OBM_BTNCORNERS BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 56 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 1E 00 0A 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 07 80 00 1E 0F C0 00 21 18 61 E0'
+        '21 18 61 E0 21 18 61 E0 21 18 61 E0 1E 0F C0 00'
+        '00 07 80 00 00 00 00 00 61 E0 1E 0F C0 00 00 07'
+        '80 00 00 00 00 00'
+}
+
+OBM_CHECKBOXES BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+'00 00 38 00 00 00 27 00 00 00 01 00 01 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00'
+'00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 03'
+'FF E0 00 3F FE 00 00 02 AA A0 00 3F FE 00 00 03'
+'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
+'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
+'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
+'55 60 00 35 56 00 00 02 AA A0 00 3A AE 00 00 03'
+'55 60 00 35 56 00 00 02 AA A0 00 3F FE 00 00 03'
+'FF E0 00 3F FE 00 07 00 1C 00 70 01 C0 00 18 C0'
+'63 01 FC 07 F0 00 20 20 80 83 8E 0E 38 00 40 11'
+'1C 46 03 1D DC 00 40 11 3E 46 03 1B EC 00 80 0A'
+'7F 2C 01 B7 F6 00 80 0A 7F 2C 01 B7 F6 00 80 0A'
+'7F 2C 01 B7 F6 00 40 11 3E 46 03 1B EC 00 40 11'
+'1C 46 03 1D DC 00 20 20 80 83 8E 0E 38 00 18 C0'
+'63 01 FC 07 F0 00 07 00 1C 00 70 01 C0 00 FF FB'
+'FF EF FF BF FE 00 80 0B 00 6F FF BF FE 00 80 0A'
+'80 AC 01 B8 0E 00 80 0A 41 2C 01 B4 16 00 80 0A'
+'22 2C 01 B2 26 00 80 0A 14 2C 01 B1 46 00 80 0A'
+'08 2C 01 B0 86 00 80 0A 14 2C 01 B1 46 00 80 0A'
+'22 2C 01 B2 26 00 80 0A 41 2C 01 B4 16 00 80 0A'
+'80 AC 01 B8 0E 00 80 0B 00 6F FF BF FE 00 FF FB'
+'FF EF FF BF FE 00'
+}
+
+OBM_CHECK BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 66 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 0E 00 0E 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
+        '03 80 00 00 02 80 00 00 06 C0 00 00 0C 40 00 00'
+        '00 60 00 00 00 20 00 00 00 30 00 00 00 10 00 00'
+        '00 10 00 00 00 00 00 00 00 00 00 10 00 00 00 10'
+        '00 00 00 00 00 00'
+}
+
+OBM_BTSIZE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
+        'FF FE 00 00 80 02 00 00 80 02 00 00 80 02 00 00'
+        '80 02 00 00 80 02 00 00 FF 82 00 00 80 82 00 00'
+        '80 82 00 00 80 82 00 00 80 82 00 00 80 82 00 00'
+        '80 82 00 00 80 82 00 00 FF FE 00 00 00 00 80 82'
+        '00 00 80 82 00 00 FF FE 00 00'
+}
+
+#define OBM_RADIOCHECK      32732
+
+OBM_RADIOCHECK BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 84 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+        '00 00 0E 00 00 00 0E 00 00 00 01 00 01 00 00 00'
+        '00 00 38 00 00 00 00 00 00 00 00 00 00 00 02 00'
+        '00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 07 80 00 00 0F C0'
+        '00 00 1F E0 00 00 1F E0 00 00 1F E0 00 00 1F E0'
+        '00 00 0F C0 00 00 07 80 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00'
+}
+
+/* Scroll */
+
+#define OBM_LFARROWI        32734
+#define OBM_RGARROWI        32735
+#define OBM_DNARROWI        32736
+#define OBM_UPARROWI        32737
+
+OBM_LFARROWI BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
+'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
+'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
+'00 11 20 00 00 00 23 00 00 00 03 00 00 11 20 00'
+'00 00 23 00 00 00 13 00 00 11 20 00 00 00 23 00'
+'00 01 10 33 30 11 20 00 00 00 23 00 00 11 11 11'
+'30 11 20 00 00 00 23 00 01 11 11 11 30 11 20 00'
+'00 00 23 00 00 11 11 11 00 11 20 00 00 00 23 00'
+'00 01 13 00 00 11 20 00 00 00 23 00 00 00 13 00'
+'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
+'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
+'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
+'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00'
+}
+
+OBM_RGARROWI BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
+'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
+'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
+'00 11 20 00 00 00 23 00 00 00 03 00 00 11 20 00'
+'00 00 23 00 00 00 13 30 00 11 20 00 00 00 23 00'
+'00 33 11 33 00 11 20 00 00 00 23 00 01 11 11 13'
+'30 11 20 00 00 00 23 00 01 11 11 11 00 11 20 00'
+'00 00 23 00 01 11 11 10 00 11 20 00 00 00 23 00'
+'00 00 11 00 00 11 20 00 00 00 23 00 00 00 10 00'
+'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
+'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
+'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
+'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00'
+}
+
+OBM_DNARROWI BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
+'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
+'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
+'00 11 20 00 00 00 23 00 00 00 03 00 00 11 20 00'
+'00 00 23 00 00 00 13 30 00 11 20 00 00 00 23 00'
+'00 01 11 33 00 11 20 00 00 00 23 00 00 11 11 13'
+'30 11 20 00 00 00 23 00 01 11 11 11 00 11 20 00'
+'00 00 23 00 00 01 11 30 00 11 20 00 00 00 23 00'
+'00 01 11 30 00 11 20 00 00 00 23 00 00 01 11 00'
+'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
+'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
+'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
+'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00'
+}
+
+OBM_UPARROWI BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 7F 7F 7F 00 00 00'
+'00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00 21 11 11 11 11 11 11 11 20 00 00 00 23 11'
+'11 11 11 11 11 11 20 00 00 00 23 00 00 00 00 00'
+'00 11 20 00 00 00 23 00 00 00 33 30 00 11 20 00'
+'00 00 23 00 00 01 11 30 00 11 20 00 00 00 23 00'
+'00 01 11 30 00 11 20 00 00 00 23 00 03 31 11 03'
+'30 11 20 00 00 00 23 00 01 11 11 11 00 11 20 00'
+'00 00 23 00 00 11 11 10 00 11 20 00 00 00 23 00'
+'00 01 11 00 00 11 20 00 00 00 23 00 00 00 10 00'
+'00 11 20 00 00 00 23 00 00 00 00 00 00 11 20 00'
+'00 00 23 00 00 00 00 00 00 11 20 00 00 00 23 00'
+'00 00 00 00 00 11 20 00 00 00 23 33 33 33 33 33'
+'33 31 20 00 00 00 22 22 22 22 22 22 22 22 20 00'
+'00 00'
+}
+
+#define OBM_LFARROWD        32740
+#define OBM_RGARROWD        32741
+#define OBM_DNARROWD        32742
+#define OBM_UPARROWD        32743
+
+OBM_LFARROWD BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
+'00 00 12 00 00 00 11 00 00 00 10 00 00 00 12 00'
+'00 01 11 11 10 00 10 00 00 00 12 00 00 11 11 11'
+'10 00 10 00 00 00 12 00 00 01 11 11 10 00 10 00'
+'00 00 12 00 00 00 11 00 00 00 10 00 00 00 12 00'
+'00 00 01 00 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
+'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+OBM_RGARROWD BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
+'00 00 12 00 00 00 01 10 00 00 10 00 00 00 12 00'
+'00 11 11 11 00 00 10 00 00 00 12 00 00 11 11 11'
+'10 00 10 00 00 00 12 00 00 11 11 11 00 00 10 00'
+'00 00 12 00 00 00 01 10 00 00 10 00 00 00 12 00'
+'00 00 01 00 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
+'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+OBM_DNARROWD BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 01 00 00 00 10 00'
+'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
+'00 01 11 11 00 00 10 00 00 00 12 00 00 11 11 11'
+'10 00 10 00 00 00 12 00 00 00 11 10 00 00 10 00'
+'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
+'00 00 11 10 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
+'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+OBM_UPARROWD BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 11 10 00 00 10 00'
+'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
+'00 00 11 10 00 00 10 00 00 00 12 00 00 11 11 11'
+'10 00 10 00 00 00 12 00 00 01 11 11 00 00 10 00'
+'00 00 12 00 00 00 11 10 00 00 10 00 00 00 12 00'
+'00 00 01 00 00 00 10 00 00 00 12 00 00 00 00 00'
+'00 00 10 00 00 00 12 00 00 00 00 00 00 00 10 00'
+'00 00 12 00 00 00 00 00 00 00 10 00 00 00 12 00'
+'00 00 00 00 00 00 10 00 00 00 12 22 22 22 22 22'
+'22 22 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+#define OBM_LFARROW         32750
+#define OBM_RGARROW         32751
+#define OBM_DNARROW         32752
+#define OBM_UPARROW         32753
+
+OBM_LFARROW BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
+'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
+'00 01 10 00 00 22 10 00 00 00 13 00 00 11 11 11'
+'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
+'00 00 13 00 00 11 11 11 00 22 10 00 00 00 13 00'
+'00 01 10 00 00 22 10 00 00 00 13 00 00 00 10 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
+'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
+'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+OBM_RGARROW BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
+'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
+'00 00 11 00 00 22 10 00 00 00 13 00 01 11 11 10'
+'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
+'00 00 13 00 01 11 11 10 00 22 10 00 00 00 13 00'
+'00 00 11 00 00 22 10 00 00 00 13 00 00 00 10 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
+'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
+'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+OBM_DNARROW BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
+'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 00 10 00 00 22 10 00 00 00 13 00'
+'00 01 11 00 00 22 10 00 00 00 13 00 00 11 11 10'
+'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
+'00 00 13 00 00 01 11 00 00 22 10 00 00 00 13 00'
+'00 01 11 00 00 22 10 00 00 00 13 00 00 01 11 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
+'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
+'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+OBM_UPARROW BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 36 00 00 00 00 00 00 00 76 00 00 00 28 00'
+'00 00 11 00 00 00 11 00 00 00 01 00 04 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00'
+'00 00 00 00 00 00 BF BF BF 00 00 00 00 00 7F 7F'
+'7F 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00 12 22 22 22 22 22 22 22 10 00 00 00 13 22'
+'22 22 22 22 22 22 10 00 00 00 13 00 00 00 00 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 01 11 00 00 22 10 00 00 00 13 00'
+'00 01 11 00 00 22 10 00 00 00 13 00 00 01 11 00'
+'00 22 10 00 00 00 13 00 01 11 11 11 00 22 10 00'
+'00 00 13 00 00 11 11 10 00 22 10 00 00 00 13 00'
+'00 01 11 00 00 22 10 00 00 00 13 00 00 00 10 00'
+'00 22 10 00 00 00 13 00 00 00 00 00 00 22 10 00'
+'00 00 13 00 00 00 00 00 00 22 10 00 00 00 13 00'
+'00 00 00 00 00 22 10 00 00 00 13 33 33 33 33 33'
+'33 32 10 00 00 00 11 11 11 11 11 11 11 11 10 00'
+'00 00'
+}
+
+#define OBM_MNARROW         32739
+
+OBM_MNARROW BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 78 00 00 00 00 00 00 00 3E 00 00 00 28 00'
+        '00 00 07 00 00 00 0B 00 00 00 01 00 01 00 00 00'
+        '00 00 2C 00 00 00 00 00 00 00 00 00 00 00 02 00'
+        '00 00 00 00 00 00 FF FF FF 00 00 00 00 00 00 00'
+        '00 00 40 00 00 00 60 00 00 00 70 00 00 00 78 00'
+        '00 00 7C 00 00 00 78 00 00 00 70 00 00 00 60 00'
+        '00 00 40 00 00 00 00 00 00 00 00 00 60 00 00 00'
+        '40 00 00 00 00 00 00 00'
+}
+
+#define OBM_OLD_LFARROW     32762
+#define OBM_OLD_RGARROW     32763
+#define OBM_OLD_DNARROW     32764
+#define OBM_OLD_UPARROW     32765
+
+OBM_OLD_LFARROW BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
+        '03 00 00 00 07 00 00 00 0F F0 00 00 1F F0 00 00'
+        '0F F0 00 00 07 00 00 00 03 00 00 00 01 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00'
+}
+
+OBM_OLD_RGARROW BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
+        '01 80 00 00 01 C0 00 00 1F E0 00 00 1F F0 00 00'
+        '1F E0 00 00 01 C0 00 00 01 80 00 00 01 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00'
+}
+
+OBM_OLD_DNARROW BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00'
+        '03 80 00 00 07 C0 00 00 0F E0 00 00 1F F0 00 00'
+        '03 80 00 00 03 80 00 00 03 80 00 00 03 80 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00'
+}
+
+OBM_OLD_UPARROW BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D 6A 00 00 00 00 00 00 00 1A 00 00 00 0C 00'
+        '00 00 0F 00 0F 00 01 00 01 00 FF FF FF 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 03 80 00 00'
+        '03 80 00 00 03 80 00 00 03 80 00 00 1F F0 00 00'
+        '0F E0 00 00 07 C0 00 00 03 80 00 00 01 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00'
+}
+
+/* Combo */
+
+#define OBM_COMBO           32738
+
+OBM_COMBO BITMAP LOADONCALL DISCARDABLE
+{
+'42 4D 4E 00 00 00 00 00 00 00 56 00 00 00 40 00'
+'00 00 07 00 00 00 09 00 00 00 01 00 01 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 02 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+'00 00 FF FF FF 00 00 00 00 00 FE 00 00 00 EE 00'
+'00 00 C6 00 00 00 82 00 00 00 00 00 00 00 C6 00'
+'00 00 C6 00 00 00 C6 00 00 00'
+}
+/* Other */
+
+#define OBM_TRTYPE          32733
+
+OBM_TRTYPE BITMAP LOADONCALL DISCARDABLE
+{
+        '42 4D E6 00 00 00 00 00 00 00 76 00 00 00 28 00'
+        '00 00 0E 00 00 00 0E 00 00 00 01 00 04 00 00 00'
+        '00 00 70 00 00 00 00 00 00 00 00 00 00 00 10 00'
+        '00 00 00 00 00 00 00 00 00 00 80 00 00 00 00 80'
+        '00 00 80 80 00 00 00 00 80 00 80 00 80 00 00 80'
+        '80 00 C0 C0 C0 00 80 80 80 00 FF 00 00 00 00 FF'
+        '00 00 FF FF 00 00 00 00 FF 00 FF 00 FF 00 00 FF'
+        'FF 00 FF FF FF 00 FF FF FF FF FF FF FF 00 FF FF'
+        'FF 00 00 00 FF 00 FF FF FF FF 00 FF FF 00 FF FF'
+        'FF FF 00 FF FF 00 F8 88 88 88 00 FF FF 00 FF FF'
+        '88 FF 00 FF FF 00 FF FF 80 FF 00 FF 0F 00 FF FF'
+        '80 FF 00 FF 0F 00 FF FF 80 0F 00 F0 0F 00 F8 FF'
+        '80 00 00 00 0F 00 F8 FF 88 FF 8F FF FF 00 F8 8F'
+        '88 F8 8F FF FF 00 F8 88 88 88 8F FF FF 00 FF FF'
+        'FF FF FF FF FF 00'
+}
+
+/* Edit */
+
+#define EM_UNDO              0x00c7
+#define WM_CUT               0x0300
+#define WM_COPY              0x0301
+#define WM_PASTE             0x0302
+#define WM_CLEAR             0x0303
+#define EM_SETSEL            0x00b1
+
+EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE
+{
+        POPUP ""
+        BEGIN
+                MENUITEM "&Undo", EM_UNDO
+                MENUITEM SEPARATOR
+                MENUITEM "Cu&t", WM_CUT
+                MENUITEM "&Copy", WM_COPY
+                MENUITEM "&Paste", WM_PASTE
+                MENUITEM "&Delete", WM_CLEAR
+                MENUITEM SEPARATOR
+                MENUITEM "Select &All", EM_SETSEL
+        END
+}
+
+/* Icons */
+
+#define OIC_SAMPLE          32512
+#define OIC_HAND            32513
+#define OIC_QUES            32514
+#define OIC_BANG            32515
+#define OIC_NOTE            32516
+#define OIC_PORTRAIT        32517
+#define OIC_LANDSCAPE       32518
+#define OIC_ODINICON        32519
+#define OIC_FOLDER          32520
+#define OIC_FOLDER2         32521
+#define OIC_FLOPPY          32522
+#define OIC_CDROM           32523
+#define OIC_HDISK           32524
+#define OIC_NETWORK         32525
+
+/* Cursors */
+
+#define OCR_BUMMER          100
+#define OCR_DRAGOBJECT      101
+
+#define OCR_NORMAL          32512
+
+#if 0
+
+/* CB: test: problems: flickering, PMView export bugs (transparency, hotspot, colors) */
+/* CB: how can we convert those X-icons/cursors? */
+/*     please inform me about any solution: cbratschi@datacomm.ch */
+
+OCR_NORMAL CURSOR LOADONCALL DISCARDABLE
+{
+        '00 00 02 00 01 00 20 20 02 00 01 00 01 00 30 01'
+        '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
+        '00 00 01 00 01 00 00 00 00 00 00 02 00 00 00 00'
+        '00 00 00 00 00 00 02 00 00 00 00 00 00 00 00 00'
+        '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+        '00 00 00 00 00 00 00 00 00 00 00 C0 00 00 00 C0'
+        '00 00 01 80 00 00 01 80 00 00 03 00 00 00 43 00'
+        '00 00 66 00 00 00 76 00 00 00 7E 00 00 00 7F C0'
+        '00 00 7F 80 00 00 7F 00 00 00 7E 00 00 00 7C 00'
+        '00 00 78 00 00 00 70 00 00 00 60 00 00 00 40 00'
+        '00 00 00 00 00 00 FF FF FF FF FF FF FF FF FF FF'
+        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+        'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF'
+        'FF FF FF FF FF FF FF FF FF FF FF 3F FF FF FF 3F'
+        'FF FF FE 7F FF FF FE 7F FF FF FC FF FF FF BC FF'
+        'FF FF 99 FF FF FF 89 FF FF FF 81 FF FF FF 80 3F'
+        'FF FF 80 7F FF FF 80 FF FF FF 81 FF FF FF 83 FF'
+        'FF FF 87 FF FF FF 8F FF FF FF 9F FF FF FF BF FF'
+        'FF FF FF FF FF FF'
+}
+
+#endif
+
+#define OCR_IBEAM           32513
+#define OCR_WAIT            32514
+#define OCR_CROSS           32515
+#define OCR_UP              32516
+#define OCR_SIZE            32640
+#define OCR_ICON            32641
+#define OCR_SIZENWSE        32642
+#define OCR_SIZENESW        32643
+#define OCR_SIZEWE          32644
+#define OCR_SIZENS          32645
+#define OCR_SIZEALL         32646
+#define OCR_ICOCUR          32647
+#define OCR_NO              32648
+#define OCR_APPSTARTING     32650
+#define OCR_HELP            32651  /* only defined in Odin */
+
+
+MSGBOX DIALOG 100, 80, 216, 168
+STYLE DS_SYSMODAL | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+BEGIN
+        ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE
+        LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP
+        PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Cancel", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Abort", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Retry", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Ignore", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&Yes", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+        PUSHBUTTON "&No", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3 user32.dll)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "USER32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "USER32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "USER32.DLL\0"
+            VALUE "ProductName", "Odin32 - USER32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/version/makefile
===================================================================
--- trunk/src/version/makefile	(revision 3028)
+++ trunk/src/version/makefile	(revision 3031)
@@ -1,69 +1,78 @@
-# $Id: makefile,v 1.12 2000-02-09 23:47:04 bird Exp $
+# $Id: makefile,v 1.13 2000-03-06 23:39:14 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       version.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = versionrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\version.obj \
+$(OBJDIR)\install.obj \
+$(OBJDIR)\info.obj \
+$(OBJDIR)\versionrsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = version
 
-OBJS =  version.obj resource.obj install.obj info.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def $(TARGET)exp.def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-          $(PDWIN32_LIB)/crtdll.lib \
-          $(PDWIN32_LIB)/lz32.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    -4 $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+$(PDWIN32_LIB)/crtdll.lib
+$(PDWIN32_LIB)/lz32.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/version/version.rc
===================================================================
--- trunk/src/version/version.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: version.rc,v 1.1 2000-02-05 02:13:02 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "VERSION System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "VERSION\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "VERSION.DLL\0"
-            VALUE "ProductName", "Odin32 - VERSION\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/version/versionrsrc.orc
===================================================================
--- trunk/src/version/versionrsrc.orc	(revision 3031)
+++ trunk/src/version/versionrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: versionrsrc.orc,v 1.1 2000-03-06 23:39:15 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "VERSION System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "VERSION\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "VERSION.DLL\0"
+            VALUE "ProductName", "Odin32 - VERSION\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/wing32/makefile
===================================================================
--- trunk/src/wing32/makefile	(revision 3028)
+++ trunk/src/wing32/makefile	(revision 3031)
@@ -1,67 +1,76 @@
-# $Id: makefile,v 1.6 2000-02-09 23:47:04 bird Exp $
+# $Id: makefile,v 1.7 2000-03-06 23:39:15 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 # wing32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
-ASFLAGS = -Sc -Sv:ALP
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE);
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE);
-
-TARGET = wing32
-
-OBJS =   initterm.obj wing32.obj resource.obj
-
-LIBS =  $(PDWIN32_LIB)\user32.lib $(PDWIN32_LIB)\gdi32.lib $(PDWIN32_LIB)\kernel32.lib $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
+# Flag overloads and local macros.
+CLEANEXTRAS = lz32rsrc.asm
+ASFLAGS     = -Sc -Sv:ALP
 
 
-all: $(TARGET).dll $(TARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\wing32.obj \
+$(OBJDIR)\wing32rsrc.obj
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def $(LIBS)
-    $(CP) $@ $(PDWIN32_BIN)
+# Target name - name of the dll without extention and path.
+TARGET  = wing32
 
 
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
+
+# Lib rule - build importlibrary (and evt. other libs)
 lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
 
-$(TARGET).lib: $(TARGET)exp.Def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)\$@
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/gdi32.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/wing32/wing32.rc
===================================================================
--- trunk/src/wing32/wing32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: wing32.rc,v 1.1 2000-02-05 02:13:34 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "WING32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "WING32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "WING32.DLL\0"
-            VALUE "ProductName", "Odin32 - WING32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/wing32/wing32rsrc.orc
===================================================================
--- trunk/src/wing32/wing32rsrc.orc	(revision 3031)
+++ trunk/src/wing32/wing32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: wing32rsrc.orc,v 1.1 2000-03-06 23:39:16 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "WING32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "WING32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "WING32.DLL\0"
+            VALUE "ProductName", "Odin32 - WING32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/wininet/makefile
===================================================================
--- trunk/src/wininet/makefile	(revision 3028)
+++ trunk/src/wininet/makefile	(revision 3031)
@@ -1,66 +1,76 @@
-# $Id: makefile,v 1.6 2000-02-10 01:24:34 bird Exp $
+# $Id: makefile,v 1.7 2000-03-06 23:39:16 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       mpr.dll makefile
+#       wininet.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = mprrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\wininet.obj \
+$(OBJDIR)\ftp.obj \
+$(OBJDIR)\utility.obj \
+$(OBJDIR)\internet.obj \
+$(OBJDIR)\wininetrsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = wininet
 
-OBJS =  wininet.obj resource.obj ftp.obj utility.obj internet.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-          $(PDWIN32_LIB)/wsock32.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
-
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib \
+$(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
+$(PDWIN32_LIB)/wsock32.lib
+OS2386.LIB $(RTLLIB_O)
+$(TARGET).def
+<<keep
+
+
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *exp.def *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/wininet/wininet.rc
===================================================================
--- trunk/src/wininet/wininet.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: wininet.rc,v 1.1 2000-02-05 02:14:10 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "WININET System dll\0"
-            VALUE "FileVersion", "4.72.3110.0\0"
-            VALUE "InternalName", "WININET\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "WININET.DLL\0"
-            VALUE "ProductName", "Odin32 - WININET\0"
-            VALUE "ProductVersion", "4.72.3110.0\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/wininet/wininetrsrc.orc
===================================================================
--- trunk/src/wininet/wininetrsrc.orc	(revision 3031)
+++ trunk/src/wininet/wininetrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: wininetrsrc.orc,v 1.1 2000-03-06 23:39:16 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "WININET System dll\0"
+            VALUE "FileVersion", "4.72.3110.0\0"
+            VALUE "InternalName", "WININET\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "WININET.DLL\0"
+            VALUE "ProductName", "Odin32 - WININET\0"
+            VALUE "ProductVersion", "4.72.3110.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/winmm/makefile
===================================================================
--- trunk/src/winmm/makefile	(revision 3028)
+++ trunk/src/winmm/makefile	(revision 3031)
@@ -1,3 +1,3 @@
-# $Id: makefile,v 1.16 2000-02-17 14:09:30 sandervl Exp $
+# $Id: makefile,v 1.17 2000-03-06 23:39:17 bird Exp $
 
 #
@@ -7,66 +7,87 @@
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = winmmrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\os2timer.obj \
+$(OBJDIR)\waveout.obj \
+$(OBJDIR)\dwaveout.obj \
+$(OBJDIR)\time.obj \
+$(OBJDIR)\wavein.obj \
+$(OBJDIR)\auxiliary.obj \
+$(OBJDIR)\auxos2.obj \
+$(OBJDIR)\mixer.obj \
+$(OBJDIR)\midi.obj \
+$(OBJDIR)\irtmidi.obj \
+$(OBJDIR)\midistrm.obj \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\mci.obj \
+$(OBJDIR)\joy.obj \
+$(OBJDIR)\mmio.obj \
+$(OBJDIR)\driver.obj \
+$(OBJDIR)\playsound.obj \
+$(OBJDIR)\joyos2.obj \
+$(OBJDIR)\winmmrsrc.obj \
+$(OBJDIR)\dbglocal.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = winmm
 
-OBJS =  os2timer.obj waveout.obj dwaveout.obj time.obj \
-        wavein.obj auxiliary.obj auxos2.obj mixer.obj \
-        midi.obj irtmidi.obj midistrm.obj initterm.obj mci.obj joy.obj \
-        mmio.obj driver.obj playsound.obj joyos2.obj resource.obj dbglocal.obj
+
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-all: $(TARGET).dll $(TARGET).lib
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/pmwinx.lib mmpm2.lib  \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-          OS2386.LIB \
-          $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/pmwinx.lib
+mmpm2.lib
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
-
-
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
Index: trunk/src/winmm/winmm.rc
===================================================================
--- trunk/src/winmm/winmm.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: winmm.rc,v 1.1 2000-02-05 02:16:21 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "MSVFW32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "MSVFW32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "MSVFW32.DLL\0"
-            VALUE "ProductName", "Odin32 - MSVFW32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/winmm/winmmrsrc.orc
===================================================================
--- trunk/src/winmm/winmmrsrc.orc	(revision 3031)
+++ trunk/src/winmm/winmmrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: winmmrsrc.orc,v 1.1 2000-03-06 23:39:17 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "MSVFW32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "MSVFW32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "MSVFW32.DLL\0"
+            VALUE "ProductName", "Odin32 - MSVFW32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/winspool/makefile
===================================================================
--- trunk/src/winspool/makefile	(revision 3028)
+++ trunk/src/winspool/makefile	(revision 3031)
@@ -1,66 +1,75 @@
-# $Id: makefile,v 1.12 2000-02-09 23:47:05 bird Exp $
+# $Id: makefile,v 1.13 2000-03-06 23:39:18 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       winspool.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = winspoolrsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\winspool.obj \
+$(OBJDIR)\winspoolrsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = winspool
 
-OBJS =  winspool.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib $(PDWIN32_LIB)/pmwinx.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-          OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/pmwinx.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
Index: trunk/src/winspool/winspool.rc
===================================================================
--- trunk/src/winspool/winspool.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: winspool.rc,v 1.1 2000-02-05 02:17:11 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "WINSPOOL System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "WINSPOOL\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "WINSPOOL.DRV\0"
-            VALUE "ProductName", "Odin32 - WINSPOOL\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/winspool/winspoolrsrc.orc
===================================================================
--- trunk/src/winspool/winspoolrsrc.orc	(revision 3031)
+++ trunk/src/winspool/winspoolrsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: winspoolrsrc.orc,v 1.1 2000-03-06 23:39:18 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "WINSPOOL System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "WINSPOOL\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "WINSPOOL.DRV\0"
+            VALUE "ProductName", "Odin32 - WINSPOOL\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/wnaspi32/makefile
===================================================================
--- trunk/src/wnaspi32/makefile	(revision 3028)
+++ trunk/src/wnaspi32/makefile	(revision 3031)
@@ -1,69 +1,75 @@
-# $Id: makefile,v 1.7 2000-02-09 23:47:06 bird Exp $
+# $Id: makefile,v 1.8 2000-03-06 23:39:18 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
-#       avifil32.dll makefile
+#       wnaspi32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = wnaspi32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\odinaspi.obj \
+$(OBJDIR)\winaspi32.obj \
+$(OBJDIR)\wnaspi32rsrc.obj \
+$(PDWIN32_LIB)\dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = wnaspi32
 
-OBJS =  odinaspi.obj winaspi32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O) \
-          $(PDWIN32_LIB)/advapi32.lib
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+$(PDWIN32_LIB)/advapi32.lib
+$(TARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
-
-
-
Index: trunk/src/wnaspi32/wnaspi32.rc
===================================================================
--- trunk/src/wnaspi32/wnaspi32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: wnaspi32.rc,v 1.1 2000-02-05 02:17:42 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "WNASPI32 System dll\0"
-            VALUE "FileVersion", "4.57\0"
-            VALUE "InternalName", "WNASPI32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "WNASPI32.DLL\0"
-            VALUE "ProductName", "Odin32 - WNASPI32\0"
-            VALUE "ProductVersion", "4.57\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/wnaspi32/wnaspi32rsrc.orc
===================================================================
--- trunk/src/wnaspi32/wnaspi32rsrc.orc	(revision 3031)
+++ trunk/src/wnaspi32/wnaspi32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: wnaspi32rsrc.orc,v 1.1 2000-03-06 23:39:18 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "WNASPI32 System dll\0"
+            VALUE "FileVersion", "4.57\0"
+            VALUE "InternalName", "WNASPI32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "WNASPI32.DLL\0"
+            VALUE "ProductName", "Odin32 - WNASPI32\0"
+            VALUE "ProductVersion", "4.57\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/wnetap32/makefile
===================================================================
--- trunk/src/wnetap32/makefile	(revision 3028)
+++ trunk/src/wnetap32/makefile	(revision 3031)
@@ -1,68 +1,74 @@
-# $Id: makefile,v 1.10 2000-02-09 23:40:56 bird Exp $
+# $Id: makefile,v 1.11 2000-03-06 23:39:19 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       wnetap32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
 
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE)
+# Flag overloads and local macros.
+CLEANEXTRAS = netapi32rsrc.asm
 
 
-TARGET = wnetap32
-ORGTARGET = netapi32
-
-OBJS =  wnetap32.obj resource.obj $(PDWIN32_LIB)/dllentry.obj
-
-all: $(TARGET).dll $(ORGTARGET).lib
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\wnetap32.obj \
+$(OBJDIR)\netapi32rsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
 
 
-$(TARGET).dll: $(OBJS) $(ORGTARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(ORGTARGET).def \
-          $(PDWIN32_LIB)/kernel32.lib \
-          $(PDWIN32_LIB)/user32.lib $(PDWIN32_LIB)/odincrt.lib \
-          OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Target and original target names - names of the dll without extention and path
+TARGET      = wnetap32
+ORGTARGET   = netapi32
 
 
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
+
+
+# Lib rule - build importlibrary (and evt. other libs)
 lib: $(ORGTARGET).lib $(PDWIN32_LIB)\$(ORGTARGET).lib
 
-$(PDWIN32_LIB)\$(ORGTARGET).lib: $(ORGTARGET).lib
-    $(CP) $** $@
 
-$(ORGTARGET).lib: $(ORGTARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $**
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(ORGTARGET)exp.def: $(ORGTARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(ORGTARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(ORGTARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(ORGTARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(PDWIN32_LIB)/kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB $(RTLLIB_O)
+$(ORGTARGET).def
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-        $(RM) *.obj *.lib *.dll *~ *.map *.pch \
-            $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-            resource.asm $(ORGTARGET)exp.def
-
Index: trunk/src/wnetap32/netapi32.rc
===================================================================
--- trunk/src/wnetap32/netapi32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: netapi32.rc,v 1.1 2000-02-05 02:19:04 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "NETAPI32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "NETAPI32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "NETAPI32.DLL\0"
-            VALUE "ProductName", "Odin32 - NETAPI32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/wnetap32/netapi32rsrc.orc
===================================================================
--- trunk/src/wnetap32/netapi32rsrc.orc	(revision 3031)
+++ trunk/src/wnetap32/netapi32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: netapi32rsrc.orc,v 1.1 2000-03-06 23:39:19 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "NETAPI32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "NETAPI32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "NETAPI32.DLL\0"
+            VALUE "ProductName", "Odin32 - NETAPI32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
Index: trunk/src/wsock32/makefile
===================================================================
--- trunk/src/wsock32/makefile	(revision 3028)
+++ trunk/src/wsock32/makefile	(revision 3031)
@@ -1,66 +1,77 @@
-# $Id: makefile,v 1.19 2000-03-04 19:55:39 sandervl Exp $
+# $Id: makefile,v 1.20 2000-03-06 23:39:20 bird Exp $
 
 #
-# PD-Win32 API
+# Odin32 API
 #
 #       wsock32.dll makefile
 #
 
+# Directory macros.
 PDWIN32_INCLUDE = ..\..\include
-PDWIN32_LIB = ..\..\lib
-PDWIN32_BIN = ..\..\bin
-PDWIN32_TOOLS = ..\..\tools\bin
+PDWIN32_LIB     = ..\..\lib
+PDWIN32_BIN     = ..\..\$(OBJDIR)
+PDWIN32_TOOLS   = ..\..\tools\bin
 
+
+# Compiler, tools, and interference rules.
 !include $(PDWIN32_INCLUDE)/pdwin32.mk
 
 
-CFLAGS = $(CFLAGS) -I$(PDWIN32_INCLUDE)
-CXXFLAGS = $(CXXFLAGS) -I$(PDWIN32_INCLUDE) 
+# Flag overloads and local macros.
+CLEANEXTRAS = wsock32rsrc.asm
 
 
+# Object files. All objects should be prefixed with $(OBJDIR)!
+OBJS = \
+$(OBJDIR)\wsock32.obj \
+$(OBJDIR)\unknown.obj \
+$(OBJDIR)\relaywin.obj \
+$(OBJDIR)\wsock32rsrc.obj \
+$(PDWIN32_LIB)/dllentry.obj
+
+
+# Target name - name of the dll without extention and path.
 TARGET = wsock32
 
-OBJS =  wsock32.obj resource.obj unknown.obj relaywin.obj $(PDWIN32_LIB)/dllentry.obj
 
-all: $(TARGET).dll $(TARGET).lib
+# All rule - build objs, target dll, copies dll to bin and makes libs.
+all:    $(OBJDIR) \
+        $(OBJDIR)\$(TARGET).dll \
+        $(PDWIN32_BIN)\$(TARGET).dll \
+        lib
 
 
-$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Fm -Fe$@ $(OBJS) $(TARGET).def \
-          pmwsock.lib $(PDWIN32_LIB)\kernel32.lib \
-          $(PDWIN32_LIB)\user32.lib  \
-          $(PDWIN32_LIB)/odincrt.lib OS2386.LIB $(RTLLIB_O)
-    $(CP) $@ $(PDWIN32_BIN)
+# Lib rule - build importlibrary (and evt. other libs)
+lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
 
 
-lib: $(TARGET).lib $(PDWIN32_LIB)\$(TARGET).lib
-
-$(PDWIN32_LIB)\$(TARGET).lib: $(TARGET).lib
-    $(CP) $** $@
-
-$(TARGET).lib: $(TARGET)exp.def
-    $(IMPLIB) $(IMPLIBFLAGS) $@ $(TARGET)exp.def
-    $(CP) $@ $(PDWIN32_LIB)
-
-$(TARGET)exp.def: $(TARGET).def
-    $(IMPDEF) $** $@
+# Dll rule - builds the target dll.
+$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
+    $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
 
 
-resource.asm: $(TARGET).rc
-    $(RC) $(RCFLAGS) -o resource.asm $(TARGET).rc
+# Linker file - creates the parameter file passed on to the linker.
+$(OBJDIR)\$(TARGET).lrf: makefile
+    @echo Creating file <<$@
+/OUT:$(OBJDIR)\$(TARGET).dll
+/MAP:$(OBJDIR)\$(TARGET).map
+$(OBJS)
+$(TARGET).def
+pmwsock.lib
+$(PDWIN32_LIB)\kernel32.lib
+$(PDWIN32_LIB)/user32.lib
+$(PDWIN32_LIB)/odincrt.lib
+OS2386.LIB
+$(RTLLIB_O)
+<<keep
 
 
+# Dep rule - makes depenencies for C, C++ and Asm files.
 dep:
     $(DEPEND) -I$(PDWIN32_INCLUDE);$(PDWIN32_INCLUDE)\win \
         *.c *.cpp *.h *.asm *.inc $(PDWIN32_INCLUDE)\*.h
 
-!ifndef NODEP
-!include .depend
-!endif
 
+# Includes the common rules.
+!include $(PDWIN32_INCLUDE)/pdwin32.post
 
-clean:
-    $(RM) *.obj *.lib *.dll *~ *.map *.pch \
-        $(PDWIN32_BIN)\$(TARGET).dll $(PDWIN32_LIB)\$(TARGET).lib \
-        resource.asm $(TARGET)exp.def
-
Index: trunk/src/wsock32/wsock32.rc
===================================================================
--- trunk/src/wsock32/wsock32.rc	(revision 3028)
+++ 	(revision )
@@ -1,41 +1,0 @@
-/* $Id: wsock32.rc,v 1.1 2000-02-05 02:19:44 sandervl Exp $ */
-
-#include "winuser.h"
-#include "odinrsrc.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version (based on NT 4 SP3)
-//
-
-1 VERSIONINFO
- FILEVERSION ODIN_FILEVERSION
- PRODUCTVERSION ODIN_PRODUCTVERSION
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0xaL
- FILEOS 0x10001L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904E4"
-        BEGIN
-            VALUE "Comments", "Odin32 System Dll\0"
-            VALUE "CompanyName", "Odin Team\0"
-            VALUE "FileDescription", "WSOCK32 System dll\0"
-            VALUE "FileVersion", "4.00\0"
-            VALUE "InternalName", "WSOCK32\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "WSOCK32.DLL\0"
-            VALUE "ProductName", "Odin32 - WSOCK32\0"
-            VALUE "ProductVersion", "4.00\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-	VALUE "Translation", 0x409, 0x04E4
-    END
-END
Index: trunk/src/wsock32/wsock32rsrc.orc
===================================================================
--- trunk/src/wsock32/wsock32rsrc.orc	(revision 3031)
+++ trunk/src/wsock32/wsock32rsrc.orc	(revision 3031)
@@ -0,0 +1,41 @@
+/* $Id: wsock32rsrc.orc,v 1.1 2000-03-06 23:39:20 bird Exp $ */
+
+#include "winuser.h"
+#include "odinrsrc.h"
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version (based on NT 4 SP3)
+//
+
+1 VERSIONINFO
+ FILEVERSION ODIN_FILEVERSION
+ PRODUCTVERSION ODIN_PRODUCTVERSION
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+            VALUE "Comments", "Odin32 System Dll\0"
+            VALUE "CompanyName", "Odin Team\0"
+            VALUE "FileDescription", "WSOCK32 System dll\0"
+            VALUE "FileVersion", "4.00\0"
+            VALUE "InternalName", "WSOCK32\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2000\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "WSOCK32.DLL\0"
+            VALUE "ProductName", "Odin32 - WSOCK32\0"
+            VALUE "ProductVersion", "4.00\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+	VALUE "Translation", 0x409, 0x04E4
+    END
+END
