Fixes/makefiles for building data view control on Windows

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 1273258fadd7d100d2482c12b22cf2beabd2530d..a3a3d2a178cc675d76d4f3671188ebf4ef995949 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
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97


@@ -27,7 +27,7 @@ class WXDLLIMPEXP_CORE wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];

 extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------


@@ -83,15 +83,12 @@ public:
     void Clear();
     void Delete( int n );
 
     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 GetSelection() const;

-#if wxABI_VERSION >= 20602

     int GetCurrentSelection() const;
     int GetCurrentSelection() const;

-#endif

     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;

-    int GetCount() const;
-    int Number() const { return GetCount(); }
+    virtual size_t GetCount() const;

     void SetSelection( int n );
     void SetString(int n, const wxString &text);
 
     void SetSelection( int n );
     void SetString(int n, const wxString &text);