Added RTL functions missing from WinCE to wxchar.h/cpp

[wxWidgets.git] / src / common / object.cpp

diff --git a/src/common/object.cpp b/src/common/object.cpp
index cb965e7c45fcf009d4c1a550d9d8da570ccb27c9..f0ca00964c7a5ddef01f7896205f46e45c88d76d 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -22,7 +22,8 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/hash.h"
+    #include "wx/hash.h"
+    #include "wx/object.h"

 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>


@@ -43,11 +44,22 @@
     #endif
 #endif // __WXDEBUG__ || wxUSE_DEBUG_CONTEXT
 
     #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 __VISUALC__ && __VISUALC__ >= 1300
+    #pragma optimize("", off)
+#endif

 
 wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
                                         (int) sizeof(wxObject),
                                         (wxObjectConstructorFn) 0 );
 
 
 wxClassInfo wxObject::sm_classwxObject( wxT("wxObject"), 0, 0,
                                         (int) sizeof(wxObject),
                                         (wxObjectConstructorFn) 0 );
 

+// restore optimizations
+#if defined __VISUALC__ && __VISUALC__ >= 1300
+    #pragma optimize("", on)
+#endif
+

 wxClassInfo* wxClassInfo::sm_first = NULL;
 wxHashTable* wxClassInfo::sm_classTable = NULL;
 
 wxClassInfo* wxClassInfo::sm_first = NULL;
 wxHashTable* wxClassInfo::sm_classTable = NULL;
 


@@ -188,13 +200,17 @@ inline wxClassInfo *wxClassInfo::GetBaseByName(const wxChar *name)
 
     wxClassInfo *classInfo = (wxClassInfo *)sm_classTable->Get(name);
 
 
     wxClassInfo *classInfo = (wxClassInfo *)sm_classTable->Get(name);
 

-    // this must be fixed, other things risk work wrongly later if you get this
-    wxASSERT_MSG( classInfo,
-                  wxString::Format
-                  (
-                    _T("base class '%s' is unknown to wxWindows RTTI"),
-                    name
-                  ) );
+#ifdef __WXDEBUG__
+    // this must be fixed, other things will work wrongly later if you get this
+    if ( !classInfo )
+    {
+        wxFAIL_MSG( wxString::Format
+                    (
+                        _T("base class '%s' is unknown to wxWindows RTTI"),
+                        name
+                    ) );
+    }
+#endif // __WXDEBUG__

 
     return classInfo;
 }
 
     return classInfo;
 }