1. slightly changed how wxControlContainer is used

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 129321d3a4901c0443ea3dbd5dbf621058aa39b3..8e2b81b6b1ddfa763a4bddaa916b9adf6f0dbde8 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -86,6 +86,7 @@ public:
     int GetSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
+    int GetCount() const { return Number(); }
     int Number() const;
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );
@@ -121,6 +122,9 @@ public:
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
  
+protected:
+    virtual wxSize DoGetBestSize() const;
+
 private: 
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()