X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5e27805de786dbb3976782ba2a3365c27256031..f618020a15f1647a83aaeab1fe315f90497a9876:/include/wx/gtk1/choice.h

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 2dc5110aeb..279e80d7fb 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -4,93 +4,80 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHOICEH__
 #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
+// wxChoice
 //-----------------------------------------------------------------------------
 
-class wxChoice;
+class wxChoice : public wxChoiceBase
+{
+public:
+    wxChoice();
+    wxChoice( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (const wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr )
+    {
+        m_strings = (wxSortedArrayString *)NULL;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+    ~wxChoice();
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
 
-extern const char *wxChoiceNameStr;
+    // implement base class pure virtuals
+    void Delete(int n);
+    void Clear();
 
-//-----------------------------------------------------------------------------
-// wxChoice
-//-----------------------------------------------------------------------------
+    int GetSelection() const;
+    void SetSelection( int n );
 
-class wxChoice: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    virtual int GetCount() const;
+    int FindString( const wxString& string ) const;
+    wxString GetString( int n ) const;
+    void SetString( int n, const wxString& string );
 
-public:
+protected:
+    wxList m_clientList;    // contains the client data for the items
+
+    void ApplyWidgetStyle();
+    virtual int DoAppend(const wxString& item);
+
+    virtual void DoSetItemClientData( int n, void* clientData );
+    virtual void* DoGetItemClientData( int n ) const;
+    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
+    virtual wxClientData* DoGetItemClientObject( int n ) const;
 
-  wxChoice();
-  inline wxChoice( wxWindow *parent, wxWindowID id,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   int n = 0, const wxString choices[] = (const wxString *) NULL,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxChoiceNameStr )
-  {
-      Create(parent, id, pos, size, n, choices, style, validator, name);
-  }
-  ~wxChoice();
-  bool Create( wxWindow *parent, wxWindowID id,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               int n = 0, const wxString choices[] = (wxString *) NULL,
-               long style = 0,
-               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 Clear();
-  void Delete(int n);
-  
-  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;
-
-  void AppendCommon( const wxString &item );
-  void ApplyWidgetStyle();
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    // common part of Create() and DoAppend()
+    size_t GtkAppendHelper(GtkWidget *menu, const wxString& item);
+
+    // this array is only used for controls with wxCB_SORT style, so only
+    // allocate it if it's needed (hence using pointer)
+    wxSortedArrayString *m_strings;
+
+    DECLARE_DYNAMIC_CLASS(wxChoice)
 };
 
+
 #endif // __GTKCHOICEH__