fix for sf bug 1448153: Widgets sample hangs on Japanese radio label

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index f7362610be2025208932dcd8f27bd1f920f8025d..1ae716df6f19488b4b25d14fc1120bf98d3b2c28 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.h
+// Name:        wx/gtk/choice.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -66,19 +66,19 @@ public:
     void Clear();
 
     int GetSelection() const;
-#if wxABI_VERSION >= 20602
     int GetCurrentSelection() const { return GetSelection(); }
-#endif
     void SetSelection( int n );
 
-    virtual int GetCount() const;
-    int FindString( const wxString& string ) const;
+    virtual size_t GetCount() const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
+    virtual bool IsOwnGtkWindow( GdkWindow *window );
+
 protected:
     wxList m_clientList;    // contains the client data for the items
 
@@ -93,19 +93,17 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
-    virtual bool IsOwnGtkWindow( GdkWindow *window );
-
 private:
     // common part of Create() and DoAppend()
-    int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
+    int GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item);
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
     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: