fix VC 7.x release build problems

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 9d7652b90f5cfc124a79a5a50d3cf65e6891e04d..5e940dec5246644e0ca8ccd5e118d6ed964b94c4 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -128,7 +128,7 @@ wxMSW:
   (for MinGW and Cygwin)
 - When using DLL, wxLocalFSHandler was not being exported - added
   WXEXPORTDLL
-- A wxEvtHandler object was not removed from wxPendingEvents on deletion. 
+- A wxEvtHandler object was not removed from wxPendingEvents on deletion.
   wxPendingEventsLocker was being deleted in App before all wxEvtHandler
   objects have been destroyed resulting in stale handler/lock
   ptrs; fixed
@@ -144,6 +144,7 @@ wxMSW:
   Proper XP theme support is planned for 2.6
 - disable wxNB_RIGHT, wxNB_LEFT, wxNB_BOTTOM notebook styles
   if the version of CommCtl doesn't support it (XP)
+- fixed release mode build with VC 7.x (Martin Ecker)
 
 wxMotif:
 

diff --git a/src/common/object.cpp b/src/common/object.cpp
index b3c4367ad750a2b95a815fca3b355cf5d2b874a7..bbe780c07e0a8fa425fd8f02cd57173e5d67d071 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -43,11 +43,22 @@
     #endif
 #endif // __WXDEBUG__ || wxUSE_DEBUG_CONTEXT
 
+// we must disable optimizations for VC.NET because otherwise its too eager
+// linker discards wxClassInfo objects in release build thus breaking many,
+// many things
+#if defined _MSC_VER && _MSC_VER >= 1300
+    #pragma optimize("", off)
+#endif
 
 wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
                                         (int) sizeof(wxObject),
                                         (wxObjectConstructorFn) 0 );
 
+// restore optimizations
+#if defined _MSC_VER && _MSC_VER >= 1300
+    #pragma optimize("", on)
+#endif
+
 wxClassInfo* wxClassInfo::sm_first = NULL;
 wxHashTable* wxClassInfo::sm_classTable = NULL;