Fixed OS/2 compilation problems.

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 8ea419a4be1c59bacb69009101ec879433c417d1..d0eb3167f39d64421d6d80f8a7e990a151a3af58 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -122,12 +122,17 @@ public:
     static wxClassInfo      *sm_first;
     wxClassInfo             *m_next;
 
     static wxClassInfo      *sm_first;
     wxClassInfo             *m_next;
 

+    // FIXME: this should be private (currently used directly by way too
+    //        many clients)

     static wxHashTable      *sm_classTable;
     static wxHashTable      *sm_classTable;

+
+private:
+    // InitializeClasses() helper
+    static wxClassInfo *GetBaseByName(const wxChar *name);

 };
 
 WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
 
 };
 
 WXDLLEXPORT wxObject *wxCreateDynamicObject(const wxChar *name);
 

-

 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Dynamic class macros
 // ----------------------------------------------------------------------------


@@ -407,7 +412,7 @@ protected:
     virtual wxObjectRefData *CreateRefData() const;
 
     // create a new m_refData initialized with the given one
     virtual wxObjectRefData *CreateRefData() const;
 
     // create a new m_refData initialized with the given one

-    virtual wxObjectRefData *CloneRefData(wxObjectRefData *data) const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 
     wxObjectRefData *m_refData;
 };
 
     wxObjectRefData *m_refData;
 };