X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63f7d5022e786be61c0226314dac98739f49a426..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/gtk/combobox.h?ds=sidebyside

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index d715d1dae8..72ac945b93 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -56,6 +56,7 @@ public:
         Init();
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
+    ~wxComboBox();
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& value = wxEmptyString,
@@ -89,16 +90,25 @@ public:
         return wxItemContainer::GetStringSelection();
     }
 
+    virtual void SetString(unsigned int n, const wxString& string);
+
+    virtual void Popup();
+    virtual void Dismiss();
+
     virtual void Clear()
     {
         wxTextEntry::Clear();
         wxItemContainer::Clear();
     }
 
-    bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
+    // See wxComboBoxBase discussion of IsEmpty().
+    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
 
     void OnChar( wxKeyEvent &event );
 
+    virtual void SetValue(const wxString& value);
+
     // Standard event handling
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
@@ -116,8 +126,8 @@ public:
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
-    virtual void DisableEvents();
-    virtual void EnableEvents();
+    virtual void GTKDisableEvents();
+    virtual void GTKEnableEvents();
     GtkWidget* GetConnectWidget();
 
     static wxVisualAttributes
@@ -135,8 +145,10 @@ protected:
     // custom list stores.
     virtual void GTKCreateComboBoxWidget();
 
-    // return the GtkEntry part of the combobox
-    GtkEntry *GetEntry() const { return m_entry; }
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+
+    virtual GtkEntry *GetEntry() const
+        { return m_entry; }
 
     GtkEntry*   m_entry;
 
@@ -144,13 +156,7 @@ private:
     // From wxTextEntry:
     virtual wxWindow *GetEditableWindow() { return this; }
     virtual GtkEditable *GetEditable() const;
-    virtual void EnableTextChangedEvents(bool enable)
-    {
-        if ( enable )
-            EnableEvents();
-        else
-            DisableEvents();
-    }
+    virtual void EnableTextChangedEvents(bool enable);
 
     void Init();