removed GTKConvertMnemonics() which is not used in GTK1 (which doesn't support mnemonics)

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 1273258fadd7d100d2482c12b22cf2beabd2530d..4f551834ed58ee9415b301b28cd7a4dd4a634152 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.h
+// Name:        wx/gtk/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;
 
 //-----------------------------------------------------------------------------
@@ -83,11 +83,9 @@ public:
     void Clear();
     void Delete( 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;
     wxString GetStringSelection() const;
     int GetCount() const;