fix unused parameter warning

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index a00f8258723c5d10e932ccb0c10f721de613fb8d..5b0526a275934749668a4025be8b9649bbfb9aea 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.h
+// Name:        wx/gtk/choice.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,10 +10,6 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choice.h"
-#endif
-

 class WXDLLIMPEXP_BASE wxSortedArrayString;
 class WXDLLIMPEXP_BASE wxArrayString;
 
 class WXDLLIMPEXP_BASE wxSortedArrayString;
 class WXDLLIMPEXP_BASE wxArrayString;
 


@@ -21,7 +17,7 @@ class WXDLLIMPEXP_BASE wxArrayString;
 // wxChoice
 //-----------------------------------------------------------------------------
 
 // wxChoice
 //-----------------------------------------------------------------------------
 

-class wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase

 {
 public:
     wxChoice();
 {
 public:
     wxChoice();


@@ -70,10 +66,11 @@ public:
     void Clear();
 
     int GetSelection() const;
     void Clear();
 
     int GetSelection() const;

+    int GetCurrentSelection() const { return GetSelection(); }

     void SetSelection( int n );
 
     virtual int GetCount() const;
     void SetSelection( int n );
 
     virtual int GetCount() const;

-    int FindString( const wxString& string ) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;

     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 


@@ -105,8 +102,8 @@ private:
     wxSortedArrayString *m_strings;
 
 public:
     wxSortedArrayString *m_strings;
 
 public:

-    // this circumvents a GTK+ 2.0 bug so that the selection is 
-    // invalidated properly 
+    // this circumvents a GTK+ 2.0 bug so that the selection is
+    // invalidated properly

     int m_selection_hack;
 
 private:
     int m_selection_hack;
 
 private: