fix VC 7.x release build problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
636773ddad
commit
e1720942b0
@ -144,6 +144,7 @@ wxMSW:
|
|||||||
Proper XP theme support is planned for 2.6
|
Proper XP theme support is planned for 2.6
|
||||||
- disable wxNB_RIGHT, wxNB_LEFT, wxNB_BOTTOM notebook styles
|
- disable wxNB_RIGHT, wxNB_LEFT, wxNB_BOTTOM notebook styles
|
||||||
if the version of CommCtl doesn't support it (XP)
|
if the version of CommCtl doesn't support it (XP)
|
||||||
|
- fixed release mode build with VC 7.x (Martin Ecker)
|
||||||
|
|
||||||
wxMotif:
|
wxMotif:
|
||||||
|
|
||||||
|
@ -43,11 +43,22 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif // __WXDEBUG__ || wxUSE_DEBUG_CONTEXT
|
#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,
|
wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
|
||||||
(int) sizeof(wxObject),
|
(int) sizeof(wxObject),
|
||||||
(wxObjectConstructorFn) 0 );
|
(wxObjectConstructorFn) 0 );
|
||||||
|
|
||||||
|
// restore optimizations
|
||||||
|
#if defined _MSC_VER && _MSC_VER >= 1300
|
||||||
|
#pragma optimize("", on)
|
||||||
|
#endif
|
||||||
|
|
||||||
wxClassInfo* wxClassInfo::sm_first = NULL;
|
wxClassInfo* wxClassInfo::sm_first = NULL;
|
||||||
wxHashTable* wxClassInfo::sm_classTable = NULL;
|
wxHashTable* wxClassInfo::sm_classTable = NULL;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user