Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 9cd08994441861a9a9535e35bb0fbb7ac5e40285..c87d9345c46e3ceb6a5af8d1d37548af5e21e82e 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -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()); };

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