Changeset 754 for trunk/include

Timestamp:

Aug 31, 1999, 4:39:16 PM (26 years ago)

Author:

sandervl

Message:

added /dbgpack to makefile + header for menu resource class

Location:

trunk/include

Files:

• pdwin32.vac3.dbg (modified) (2 diffs)
• pdwin32.vac36.dbg (modified) (2 diffs)
• winres.h (modified) (5 diffs)
• winresmenu.h (added)

trunk/include/pdwin32.vac3.dbg

@@ -1 @@
-# $Id: pdwin32.vac3.dbg,v 1.9 1999-08-29 14:57:51 sandervl Exp $
+# $Id: pdwin32.vac3.dbg,v 1.10 1999-08-31 14:39:16 sandervl Exp $
 # ODIN / win32os2 Project
 #
@@ -27 +27 @@
 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__ -DDEBUG
 ASFLAGS          = -Sc -Sv:ALP +Od
-LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD"
-LDFLAGS_ODINCRT  = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe"
+LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /dbgpack"
+LDFLAGS_ODINCRT  = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /dbgpack"
 IMPLIBFLAGS = /nologo
 

trunk/include/pdwin32.vac36.dbg

@@ -1 @@
-# $Id: pdwin32.vac36.dbg,v 1.2 1999-08-29 14:57:51 sandervl Exp $
+# $Id: pdwin32.vac36.dbg,v 1.3 1999-08-31 14:39:16 sandervl Exp $
 # ODIN / win32os2 Project
 #
@@ -26 +26 @@
 CXXFLAGS_ODINCRT = -Q  -Si -Ti -Tm+ -Ge- -Ss+ -W3 -Gm+ /Gn- -I$(PDWIN32_INCLUDE)\Win -D__WIN32OS2__ -D__WINE__ -DDEBUG
 ASFLAGS          = -Sc -Sv:ALP
-LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD"
-LDFLAGS_ODINCRT  = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe"
+LDFLAGS          = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /NOD /dbgpack"
+LDFLAGS_ODINCRT  = -Q  -Si -Ti -Ge- -Ss+ -W3 -Gm+ /B"/noe /dbgpack"
 IMPLIBFLAGS = /nologo
 

trunk/include/winres.h

@@ -1 @@
-/* $Id: winres.h,v 1.6 1999-08-19 19:51:18 sandervl Exp $ */
+/* $Id: winres.h,v 1.7 1999-08-31 14:39:16 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
 //Use to distinguish between converted OS/2 resources in an image (pe2lx'ed) or
 //resources that are loaded from the original win32 image (pe loader)
-#define RSRC_PELOADER   0
-#define RSRC_PE2LX      1
+#define RSRC_PELOADER        0
+#define RSRC_PE2LX           1
+#define RSRC_CUSTOMNODATA    2  //resources created in runtime without data (i.e. CreateMenu)
+#define RSRC_CUSTOMINDIRECT  3  //resources indirectly created in runtime (i.e. CreateMenuIndirect)
 
 class Win32Resource
@@ -24 +26 @@
 public:
                    // Constructors and destructors
+                   Win32Resource(); //custum resource (i.e. created by app in runtime)
                    Win32Resource(Win32Image *module, HRSRC hRes, ULONG id, ULONG type);
                    Win32Resource(Win32Image *module, ULONG id, ULONG type,
@@ -41 +44 @@
 protected:
 
-private:
              PVOID convertOS2Bitmap(void *bmpdata);
 
@@ -64 +66 @@
   Win32Resource*   next;               // Next Resource in module
 
+private:
     friend    class Win32Image;
 };