X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c75d8baf987c83e231c981d07b5a9217d711361..1ddb6d28576c3ab21f80d8a3815fcccb1545961c:/include/wx/gtk/combobox.h

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 9cb4f9f185..438dc7c3ad 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -11,15 +11,23 @@
 #ifndef _WX_GTK_COMBOBOX_H_
 #define _WX_GTK_COMBOBOX_H_
 
+#include "wx/choice.h"
+
+typedef struct _GtkEntry GtkEntry;
+
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxComboBox : public wxControl,
-                                    public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
+                                    public wxTextEntry
 {
 public:
-    wxComboBox() { m_strings = NULL; }
+    wxComboBox()
+        : wxChoice(), wxTextEntry()
+    {
+        Init();
+    }
     wxComboBox(wxWindow *parent,
                wxWindowID id,
                const wxString& value = wxEmptyString,
@@ -29,7 +37,9 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr)
+        : wxChoice(), wxTextEntry()
     {
+        Init();
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
 
@@ -41,12 +51,12 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxComboBoxNameStr)
+        : wxChoice(), wxTextEntry()
     {
+        Init();
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
-    virtual ~wxComboBox();
-
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
@@ -64,37 +74,29 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
 
-    // From wxItemContainerImmutable:
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString &text);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual void SetSelection(int n);
-    virtual int GetSelection() const;
+    // Set/GetSelection() from wxTextEntry and wxChoice
 
-    // from wxTextEntry: we need to override them to avoid virtual function
-    // hiding
+    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
     virtual void SetSelection(long from, long to)
-    {
-        wxTextEntry::SetSelection(from, to);
-    }
+                               { wxTextEntry::SetSelection(from, to); }
 
+    virtual int GetSelection() const { return wxChoice::GetSelection(); }
     virtual void GetSelection(long *from, long *to) const
-    {
-        return wxTextEntry::GetSelection(from, to);
-    }
+                               { return wxTextEntry::GetSelection(from, to); }
 
     virtual wxString GetStringSelection() const
     {
         return wxItemContainer::GetStringSelection();
     }
 
-    // From wxComboBoxBase:
-    virtual int GetCurrentSelection() const;
+    virtual void Clear()
+    {
+        wxTextEntry::Clear();
+        wxItemContainer::Clear();
+    }
 
-    virtual void SetFocus();
+    bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
 
-    void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
 
     // Standard event handling
@@ -114,42 +116,30 @@ public:
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
-    bool           m_ignoreNextUpdate:1;
-    wxArrayPtrVoid m_clientData;
-    int            m_prevSelection;
-
-    void DisableEvents();
-    void EnableEvents();
+    virtual void DisableEvents();
+    virtual void EnableEvents();
     GtkWidget* GetConnectWidget();
 
-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
-
 protected:
     // From wxWindowGTK:
-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
-    // From wxItemContainer:
-    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 void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-
-    // From wxControl:
-    virtual wxSize DoGetBestSize() const;
-
     // Widgets that use the style->base colour for the BG colour should
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
+    // Override in derived classes to create combo box widgets with
+    // custom list stores.
+    virtual void GTKCreateComboBoxWidget();
+
+    // return the GtkEntry part of the combobox
+    GtkEntry *GetEntry() const { return m_entry; }
+
+    GtkEntry*   m_entry;
+
 private:
     // From wxTextEntry:
     virtual const wxWindow *GetEditableWindow() const { return this; }
@@ -162,9 +152,7 @@ private:
             DisableEvents();
     }
 
-    // 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;
+    void Init();
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()