Turned wxIcon inline constructors to real constructors

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 178af1fb350df4da19bdc802777de233edc0438c..f2c06af43b7b683c2f8b3b512b5f73099e36b10f 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __OBJECTH__
-#define __OBJECTH__
+#ifndef _WX_OBJECTH__
+#define _WX_OBJECTH__
 
 #ifdef __GNUG__
 #pragma interface "object.h"
@@ -135,7 +135,7 @@ wxObject* WXDLLEXPORT_CTORFN wxConstructorFor##name(void) \
 
 #endif
 
-#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::class##name)
+#define IS_KIND_OF(obj, className) obj->IsKindOf(&className::class##className)
 
 // Unfortunately Borland seems to need this include.
 #ifdef __BORLANDC__
@@ -179,8 +179,8 @@ class WXDLLEXPORT wxObject
 #endif
 
 #ifdef USE_STORABLE_CLASSES
-  virtual void StoreObject( wxObjectOutputStream &WXUNUSED(stream) ) {};
-  virtual void LoadObject( wxObjectInputStream &WXUNUSED(stream) ) {};
+  virtual void StoreObject( wxObjectOutputStream &stream );
+  virtual void LoadObject( wxObjectInputStream &stream );
 #endif
 
   // make a 'clone' of the object
@@ -221,6 +221,6 @@ private:
 #endif
 
 #endif
-    // __OBJECTH__
+    // _WX_OBJECTH__