No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 13b7b24c5548a4db71c6e6f6bded36128bd620bc..585318f4b3d3f2ea7768aae47fb3cbc692054708 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -27,14 +26,15 @@ class WXDLLIMPEXP_FWD_CORE wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 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 +92,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 +154,6 @@ public:
     bool IsOwnGtkWindow( GdkWindow *window );
     void DoApplyWidgetStyle(GtkRcStyle *style);
 
-    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
@@ -169,6 +167,10 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
+    // 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
     // override this and return true.
     virtual bool UseGTKStyleBase() const { return true; }