Removed #pragmas in utils.cpp, corrected USE_(WX)DEBUG_CONTEXT,

added wx200gtk.zip creation in zipdist.bat.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index c766a13731204a52970bca374439ed1000e14a1c..74237fe03d7d78fdbed1e0e8c909f4afc91b13d1 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -14,9 +14,9 @@ cd %1
 echo Zipping...
 zip32 -@ %2\wx200gen.zip < %1\distrib\msw\generic.rsp
 zip32 -@ %2\wx200msw.zip < %1\distrib\msw\msw.rsp
+zip32 -@ %2\wx200gtk.zip < %1\distrib\msw\gtk.rsp
 zip32 -@ %2\wx200doc.zip < %1\distrib\msw\docsrc.rsp
 
-rem zip32 -@ %2\wx200ps.zip < %1\distrib\msw\wx_ps.rsp
 zip32 -@ %2\wx200hlp.zip < %1\distrib\msw\wx_hlp.rsp
 zip32 -@ %2\wx200htm.zip < %1\distrib\msw\wx_html.rsp
 zip32 -@ %2\wx200pdf.zip < %1\distrib\msw\wx_pdf.rsp

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 1bc59b30582535e1eb6d0fdc49a4b4cbffca763d..b0ab9a02df72507a52d2a000572280112aaf7fe0 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -23,7 +23,7 @@
   info, or to be a straight call to the new operator.
 */
 
-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_WXDEBUG_CONTEXT
+#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
 
 #include <stddef.h>
 

diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h
index c0e10007297bbc4255af90d5fe50a26c208c703d..634b36658ff3fd2bcdb49dba076404aa5038d06b 100644 (file)
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -119,7 +119,7 @@
                                   // wxObject::delete *IF* WXDEBUG is also defined.
                                   // WARNING: this code may not work with all architectures, especially
                                   // if alignment is an issue.
-#define USE_WXDEBUG_CONTEXT       1
+#define USE_DEBUG_CONTEXT       1
                                   // If 1, enables wxDebugContext, for
                                   // writing error messages to file, etc. 
                                   // If WXDEBUG is not defined, will still use

diff --git a/include/wx/object.h b/include/wx/object.h
index 3d502ef930c014016f8579d8921218538b8651a0..8da110ce980ad5448735c5efa2125c5b8297b9a6 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -218,7 +218,7 @@ class WXDLLEXPORT wxObject
 
 #endif
 
-#if WXDEBUG || USE_WXDEBUG_CONTEXT
+#if WXDEBUG || USE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 #endif
 

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 9ce007ee4d80af38b278208fc44e6aaf93e7d3ab..aaf70540330c73012c6ad1135ad49003af44e206 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -10,8 +10,9 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
-#pragma implementation
-#pragma implementation "utils.h"
+// Note: this is done in utilscmn.cpp now.
+// #pragma implementation
+// #pragma implementation "utils.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak
index 05c19284cfe0bfec71cb1df8a96e4e09c914de53..83bc3116e66d612da6c7a460bb620d468b349474 100644 (file)
--- a/src/ntwxwin.mak
+++ b/src/ntwxwin.mak
@@ -141,9 +141,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1
 # If you don't include wxprec.h, use CPPFLAGS2
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__ /DWXDEBUG=1
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy