OnEnter/OnDragOver API update (compiles, links, somewhat runs under wxGTK)

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 6631f12bcc12d8a20cdc2d0c2b9b16e6bc9dacea..b7dd865d98a4151ca9086c2c0a37b275f81248d8 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -53,8 +53,7 @@ public:
     wxString GetString( int n ) const;
 
     // implementation
     wxString GetString( int n ) const;
 
     // implementation

-    wxList   m_clientDataList;
-    wxList   m_clientObjectList;
+    wxList   m_clientList;

 
     void DisableEvents();
     void EnableEvents();
 
     void DisableEvents();
     void EnableEvents();


@@ -69,6 +68,16 @@ protected:
     virtual void DoSetClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetClientObject( int n ) const;
 
     virtual void DoSetClientObject( int n, wxClientData* clientData );
     virtual wxClientData* DoGetClientObject( int n ) const;
 

+    // the above virtuals hide these virtuals in wxChoiceBase
+    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()); };
+

 private:
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };