X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e78c1d7855d1fefcdbff0e093e21e5cf101ca604..49a63afbad7646668df343d29edd88458bc7e0a9:/include/wx/gtk/combobox.h?ds=sidebyside

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 438dc7c3ad..02ae7e481a 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -88,6 +88,8 @@ public:
     {
         return wxItemContainer::GetStringSelection();
     }
+    virtual void Popup();
+    virtual void Dismiss();
 
     virtual void Clear()
     {
@@ -95,10 +97,14 @@ public:
         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 +122,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,22 +141,16 @@ protected:
     // custom list stores.
     virtual void GTKCreateComboBoxWidget();
 
-    // return the GtkEntry part of the combobox
-    GtkEntry *GetEntry() const { return m_entry; }
+    virtual GtkEntry *GetEntry() const
+        { return m_entry; }
 
     GtkEntry*   m_entry;
 
 private:
     // From wxTextEntry:
-    virtual const wxWindow *GetEditableWindow() const { return this; }
+    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();