X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29006414014249ec3eb86e9c13da7f06b2741e3a..413baa20a1d96d2e886bffc0b06ff97f6d8c472b:/include/wx/gtk/choice.h?ds=inline

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 0a7eeca3d8..a00f825872 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -10,35 +10,19 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #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 char *wxChoiceNameStr;
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+class WXDLLIMPEXP_BASE wxArrayString;
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
-class wxChoice : public wxControl
+class wxChoice : public wxChoiceBase
 {
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
 public:
     wxChoice();
     wxChoice( wxWindow *parent, wxWindowID id,
@@ -49,8 +33,22 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr )
     {
+        m_strings = (wxSortedArrayString *)NULL;
+
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
+    wxChoice( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr )
+    {
+        m_strings = (wxSortedArrayString *)NULL;
+
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
     ~wxChoice();
     bool Create( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
@@ -59,36 +57,61 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            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();
+    // implement base class pure virtuals
     void Delete(int n);
+    void Clear();
 
-    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 );
+    int GetSelection() const;
     void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
 
-    // implementation
+    virtual int GetCount() const;
+    int FindString( const wxString& string ) const;
+    wxString GetString( int n ) const;
+    void SetString( int n, const wxString& string );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+protected:
+    wxList m_clientList;    // contains the client data for the items
 
-    wxList   m_clientDataList;
-    wxList   m_clientObjectList;
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, int pos);
 
-    void AppendCommon( const wxString &item );
-    void ApplyWidgetStyle();
+    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;
+
+    virtual wxSize DoGetBestSize() const;
+
+    virtual bool IsOwnGtkWindow( GdkWindow *window );
+
+private:
+    // common part of Create() and DoAppend()
+    int GtkAddHelper(GtkWidget *menu, int pos, 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;
+
+public:
+    // this circumvents a GTK+ 2.0 bug so that the selection is 
+    // invalidated properly 
+    int m_selection_hack;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxChoice)
 };
 
+
 #endif // __GTKCHOICEH__