Allow using wxGraphicsContext with MinGW if gdiplus.h is available.

[wxWidgets.git] / include / wx / gtk / combobox.h

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 430a3c0fa8df173d4114180dcadb237526babed5..7901e540f50a66c86bbabafda7307f8dd3a8da8f 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -23,7 +23,11 @@ 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,
@@ -33,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);
     }
 
@@ -45,7 +51,9 @@ 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);
     }
 
@@ -80,6 +88,8 @@ public:
     {
         return wxItemContainer::GetStringSelection();
     }
+    virtual void Popup();
+    virtual void Dismiss();
 
     virtual void Clear()
     {
@@ -123,12 +133,18 @@ protected:
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }
 
-    // return the GtkEntry part of the combobox
-    GtkEntry *GetEntry() const;
+    // Override in derived classes to create combo box widgets with
+    // custom list stores.
+    virtual void GTKCreateComboBoxWidget();
+
+    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)
     {
@@ -138,6 +154,8 @@ private:
             DisableEvents();
     }
 
+    void Init();
+
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()
 };