Don't create multiple parent-less top level frames in layout sample.

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 079d0f56d0f1e8909e23fb88ef369e1689beff8e..77d2502cac2a836a5c73ffbb03eb00f8fb3f668f 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -34,7 +34,8 @@ extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox :
+    public wxWindowWithItems<wxControl, wxComboBoxBase>
 {
 public:
     inline wxComboBox() {}
@@ -92,7 +93,7 @@ public:
     virtual void SetSelection(int n);
     virtual void SetString(unsigned int n, const wxString &text);
 
-    wxString GetValue() const;
+    wxString GetValue() const { return DoGetValue(); }
     void SetValue(const wxString& value);
     void WriteText(const wxString& value);
 
@@ -154,8 +155,6 @@ public:
     bool IsOwnGtkWindow( GdkWindow *window );
     void DoApplyWidgetStyle(GtkRcStyle *style);
 
-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
@@ -169,7 +168,8 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    // implement wxTextEntry pure virtual method
+    // implement wxTextEntry pure virtual methods
+    virtual wxString DoGetValue() const;
     virtual wxWindow *GetEditableWindow() { return this; }
 
     // Widgets that use the style->base colour for the BG colour should