set minimum bcc32 version to turbo explorer

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

diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index 3397f4f33d5170d4e9c16ed535e182b58dfa0dd1..d63326ba22d4c65464fedf0f9659691b5bc5b3cb 100644 (file)
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/motif/combobox.h

 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:


@@ -21,7 +21,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice
 
 public:
     wxComboBox() { m_inSetSelection = false; }
 
 public:
     wxComboBox() { m_inSetSelection = false; }

-    ~wxComboBox();
+    virtual ~wxComboBox();

 
     inline wxComboBox(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,
 
     inline wxComboBox(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,


@@ -70,15 +70,16 @@ public:
         const wxString& name = wxComboBoxNameStr);
 
     // implementation of wxControlWithItems
         const wxString& name = wxComboBoxNameStr);
 
     // implementation of wxControlWithItems

-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);
-    virtual void Delete(int n);
-    virtual void Clear();
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();

     virtual int GetSelection() const ;
     virtual void SetSelection(int n);
     virtual int GetSelection() const ;
     virtual void SetSelection(int n);

-    virtual int FindString(const wxString& s) const;
-    virtual wxString GetString(int n) const ;
-    virtual void SetString(int n, const wxString& s);
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual wxString GetString(unsigned int n) const ;
+    virtual void SetString(unsigned int n, const wxString& s);

 
     // Text field functions
     virtual wxString GetValue() const ;
 
     // Text field functions
     virtual wxString GetValue() const ;