fixed virtual function hiding for LoadBitmap()

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 6c73810879f814a175d720fb0584692b08966317..0ec684d85efc053abecc80b208a56d6006778f92 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -26,20 +26,20 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxComboBox;
+class WXDLLIMPEXP_CORE wxComboBox;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-extern const wxChar* wxComboBoxNameStr;
-extern const wxChar* wxEmptyString;
+extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
+extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;

 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

-class wxComboBox : public wxControl, public wxComboBoxBase
+class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase

 {
 public:
     inline wxComboBox() {}
 {
 public:
     inline wxComboBox() {}


@@ -90,12 +90,14 @@ public:
 
     virtual int FindString( const wxString &item ) const;
     int GetSelection() const;
 
     virtual int FindString( const wxString &item ) const;
     int GetSelection() const;

+#if wxABI_VERSION >= 20602
+    int GetCurrentSelection() const;
+#endif

     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
     int GetCount() const;
     int Number() const { return GetCount(); }
     void SetSelection( int n );
     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;
     void SetString(int n, const wxString &text);
 
     wxString GetValue() const;