Some compile warnings removed; file selector prototypes put in each filedlg.h;

[wxWidgets.git] / include / wx / object.h

diff --git a/include/wx/object.h b/include/wx/object.h
index ca3ade770ab82e32a00c012a8e43eaabb1ccd322..b914b190dc62031c0d9abc305f9e2cfb074a2889 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -23,11 +23,14 @@ class WXDLLEXPORT wxObject;
 
 #if wxUSE_DYNAMIC_CLASSES
 
 
 #if wxUSE_DYNAMIC_CLASSES
 

-#ifdef __GNUWIN32__
+// #ifdef __GNUWIN32__

 #ifdef GetClassName
 #undef GetClassName
 #endif
 #ifdef GetClassName
 #undef GetClassName
 #endif

+#ifdef GetClassInfo
+#undef GetClassInfo

 #endif
 #endif

+// #endif

 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;
 
 class WXDLLEXPORT wxClassInfo;
 class WXDLLEXPORT wxInputStream;


@@ -98,7 +101,7 @@ public:
 
 WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 
 
 WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

 WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 
 WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 


@@ -219,7 +222,7 @@ class WXDLLEXPORT wxObject
   virtual void Dump(ostream& str);
 #endif
 
   virtual void Dump(ostream& str);
 #endif
 

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif


@@ -235,7 +238,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData*      m_refData;
 
 protected:
   wxObjectRefData*      m_refData;

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

   wxObject_Serialize*   m_serialObj;
 #endif
 };
   wxObject_Serialize*   m_serialObj;
 #endif
 };