don't define WINVER as 0x0400 in configure, it's defined in the headers as 0x0600...

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 1273258fadd7d100d2482c12b22cf2beabd2530d..73d7eb06d643bfa905c7f2cac34956795b6a51aa 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.h
+// Name:        wx/gtk1/combobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
-extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
@@ -61,7 +61,7 @@ public:
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
-    ~wxComboBox();
+    virtual ~wxComboBox();
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
@@ -81,19 +81,16 @@ public:
            const wxString& name = wxComboBoxNameStr);
 
     void Clear();
-    void Delete( int n );
+    void Delete(unsigned int n);
 
-    virtual int FindString( const wxString &item ) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;
     int GetSelection() const;
-#if wxABI_VERSION >= 20602
     int GetCurrentSelection() const;
-#endif
-    wxString GetString( int n ) const;
+    virtual wxString GetString(unsigned int n) const;
     wxString GetStringSelection() const;
-    int GetCount() const;
-    int Number() const { return GetCount(); }
-    void SetSelection( int n );
-    void SetString(int n, const wxString &text);
+    virtual unsigned int GetCount() const;
+    virtual void SetSelection(int n);
+    virtual void SetString(unsigned int n, const wxString &text);
 
     wxString GetValue() const;
     void SetValue(const wxString& value);
@@ -163,12 +160,12 @@ public:
 
 protected:
     virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);
+    virtual int DoInsert(const wxString& item, unsigned int pos);
 
-    virtual void DoSetItemClientData( int n, void* clientData );
-    virtual void* DoGetItemClientData( int n ) const;
-    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetItemClientObject( int n ) const;
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
 
     virtual wxSize DoGetBestSize() const;