Remove sm_cocoaDelegate singleton. We need per-instance data anyway so we

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 6c73810879f814a175d720fb0584692b08966317..5f33b99a53c334fe9caab37cbb23e019b72ec5f1 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.h
+// Name:        wx/gtk/combobox.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
@@ -8,14 +8,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "combobox.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_COMBOBOX
@@ -26,20 +21,20 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxComboBox;
+class WXDLLIMPEXP_CORE wxComboBox;
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
-extern const wxChar* wxComboBoxNameStr;
-extern const wxChar* wxEmptyString;
+extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
+extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-class wxComboBox : public wxControl, public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
 {
 public:
     inline wxComboBox() {}
@@ -88,14 +83,14 @@ 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;
+    int GetCurrentSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
     int GetCount() const;
     int Number() const { return GetCount(); }
     void SetSelection( int n );
-    void Select( int n ) { return SetSelection( n ); }
     void SetString(int n, const wxString &text);
 
     wxString GetValue() const;