X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/738f9e5a12b8bb3936cc10347be98390602d3660..c9057ae1c565cc4ae6c2cf84dd19d65a64ee2b7b:/include/wx/gtk1/choice.h

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 7b95f490da..b7dd865d98 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -11,32 +11,14 @@
 #define __GTKCHOICEH__
 
 #ifdef __GNUG__
-#pragma interface
+    #pragma interface "choice.h"
 #endif
 
-#include "wx/defs.h"
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxChoice;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar *wxChoiceNameStr;
-
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
-class wxChoice : public wxControl
+class wxChoice : public wxChoiceBase
 {
 public:
     wxChoice();
@@ -59,43 +41,43 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 
-    void Append( const wxString &item );
-    void Append( const wxString &item, void* clientData );
-    void Append( const wxString &item, wxClientData* clientData );
-
-    void SetClientData( int n, void* clientData );
-    void* GetClientData( int n );
-    void SetClientObject( int n, wxClientData* clientData );
-    wxClientData* GetClientObject( int n );
-
-    void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
-    wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
-    void SetClientData( void *data )            { wxControl::SetClientData( data ); }
-    void *GetClientData() const                 { return wxControl::GetClientData(); }
-    
-    void Clear();
+    // implement base class pure virtuals
     void Delete(int n);
+    void Clear();
 
+    int GetSelection() const;
+    void SetSelection( int n );
+
+    virtual int GetCount() const;
     int FindString( const wxString &string ) const;
-    int GetColumns() const;
-    int GetSelection();
     wxString GetString( int n ) const;
-    wxString GetStringSelection() const;
-    int Number() const;
-    void SetColumns( int n = 1 );
-    void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
 
     // implementation
-
-    wxList   m_clientDataList;
-    wxList   m_clientObjectList;
+    wxList   m_clientList;
 
     void DisableEvents();
     void EnableEvents();
     void AppendCommon( const wxString &item );
     void ApplyWidgetStyle();
     
+protected:
+    virtual int DoAppend(const wxString& item);
+
+    virtual void DoSetClientData( int n, void* clientData );
+    virtual void* DoGetClientData( 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)
 };