Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 68980bf6b1755a961ef9f1d56b34404ae6c8ca1b..059c12c36a463a697d2fef40c8ccb86dd37cb0e1 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -27,7 +27,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
     DECLARE_DYNAMIC_CLASS(wxComboBox)
         
 public:
-    inline wxComboBox() {}
+    wxComboBox() {}
     ~wxComboBox();
     
     inline wxComboBox(wxWindow *parent, wxWindowID id,
@@ -39,7 +39,8 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr)
     {
-        Create(parent, id, value, pos, size, n, choices, style, validator, name);
+        Create(parent, id, value, pos, size, n, choices,
+               style, validator, name);
     }
     
     bool Create(wxWindow *parent, wxWindowID id,
@@ -51,17 +52,14 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxComboBoxNameStr);
     
-    // List functions
-    virtual void Append(const wxString& item);
+    // implementation of wxControlWithItems
+    virtual int DoAppend(const wxString& item);
     virtual void Delete(int n);
     virtual void Clear();
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
     virtual int FindString(const wxString& s) const;
     virtual wxString GetString(int n) const ;
-    virtual wxString GetStringSelection() const ;
-    virtual bool SetStringSelection(const wxString& sel);
-    virtual inline int Number() const { return m_noStrings; }
     
     // Text field functions
     virtual wxString GetValue() const ;
@@ -86,7 +84,8 @@ public:
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_mainWidget; }
     WXWidget GetMainWidget() const { return m_mainWidget; }
-    
+
+    virtual wxSize DoGetBestSize() const;
 protected:
     virtual void DoSetSize(int x, int y,
         int width, int height,