X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..9623be70d0a0ded38b06684b8c7cb01382a82155:/include/wx/gtk1/choice.h

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 40cecba786..139b8811e2 100644
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -1,79 +1,112 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.h
+// Name:        wx/gtk1/choice.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
-#ifdef __GNUG__
-#pragma interface
-#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_FWD_BASE wxSortedArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
-class wxChoice: public wxControl
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
 {
-  DECLARE_DYNAMIC_CLASS(wxChoice)
-
-  public:
-
-    wxChoice(void);
-    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 )
+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 )
     {
-      Create(parent, id, pos, size, n, choices, style, validator, name);
+        m_strings = 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 = NULL;
+
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+    virtual ~wxChoice();
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
     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 Clear(void);
-    void Delete(int n);
-    int FindString( const wxString &string ) const;
-    int GetColumns(void) const;
-    int GetSelection(void);
-    wxString GetString( int n ) const;
-    wxString GetStringSelection(void) const;
-    int Number(void) const;
-    void SetColumns( int n = 1 );
-    void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
-    
-    void SetFont( const wxFont &font );
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );
+
+    // implement base class pure virtuals
+    void DoDeleteOneItem(unsigned int n);
+    void DoClear();
+
+    int GetSelection() const;
+    virtual void SetSelection(int n);
+
+    virtual unsigned int GetCount() const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& string);
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+protected:
+    wxList m_clientList;    // contains the client data for the items
+
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+
+    virtual wxSize DoGetBestSize() const;
+
+    virtual bool IsOwnGtkWindow( GdkWindow *window );
+
+private:
+    // DoInsertItems() helper
+    int GtkAddHelper(GtkWidget *menu, unsigned 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__