some compilation fixes atttempts for solaris

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 9940c9f69fdbf938aa2f34e9d74a4b917d5f3ccd..c87d9345c46e3ceb6a5af8d1d37548af5e21e82e 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma interface "choicebase.h"
+    #pragma interface "choiccmn.h"

 #endif
 
 #include "wx/control.h"     // the base class
 #endif
 
 #include "wx/control.h"     // the base class


@@ -104,6 +104,11 @@ private:
 
     // the type of the client data for the items
     wxClientDataType m_clientDataItemsType;
 
     // the type of the client data for the items
     wxClientDataType m_clientDataItemsType;

+    // the above pure virtuals hide these virtuals in wxWindowBase
+    virtual void DoSetClientData(void* clientData ) { wxWindowBase::DoSetClientData(clientData); };
+    virtual void* DoGetClientData() const { return(wxWindowBase::DoGetClientData()); };
+    virtual void DoSetClientObject( wxClientData* clientData ) { wxWindowBase::DoSetClientObject(clientData); };
+    virtual wxClientData* DoGetClientObject() const { return(wxWindowBase::DoGetClientObject()); };

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -120,6 +125,8 @@ private:
     #include "wx/qt/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
     #include "wx/qt/choice.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"

+#elif defined(__WXPM__)
+    #include "wx/os2/choice.h"

 #elif defined(__WXSTUBS__)
     #include "wx/stubs/choice.h"
 #endif
 #elif defined(__WXSTUBS__)
     #include "wx/stubs/choice.h"
 #endif