X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3013b6f46099b8cf0d2f9f656e883e4606ca833d..8870c26ecb03e87065fdb3617b8c47ca3c923a53:/include/wx/object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index ca3ade770a..b914b190dc 100644
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -23,11 +23,14 @@ class WXDLLEXPORT wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
-#ifdef __GNUWIN32__
+// #ifdef __GNUWIN32__
 #ifdef GetClassName
 #undef GetClassName
 #endif
+#ifdef GetClassInfo
+#undef GetClassInfo
 #endif
+// #endif
 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;
@@ -98,7 +101,7 @@ public:
 
 WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
 WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 
@@ -219,7 +222,7 @@ class WXDLLEXPORT wxObject
   virtual void Dump(ostream& str);
 #endif
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
@@ -235,7 +238,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData*      m_refData;
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   wxObject_Serialize*   m_serialObj;
 #endif
 };