X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16edee16a7c3d346b9eab1672a4c696cb0cf6e24..5d605a6995d8f1a647934e30089468cc598c951d:/include/wx/gtk/choice.h

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 70fea3819b..28a5efdcc0 100644
--- 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$
@@ -10,10 +10,6 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "choice.h"
-#endif
-
 class WXDLLIMPEXP_BASE wxSortedArrayString;
 class WXDLLIMPEXP_BASE wxArrayString;
 
@@ -21,7 +17,7 @@ class WXDLLIMPEXP_BASE wxArrayString;
 // wxChoice
 //-----------------------------------------------------------------------------
 
-class wxChoice : public wxChoiceBase
+class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase
 {
 public:
     wxChoice();
@@ -70,16 +66,19 @@ public:
     void Clear();
 
     int GetSelection() const;
+    int GetCurrentSelection() const { return GetSelection(); }
     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 );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
+    virtual bool IsOwnGtkWindow( GdkWindow *window );
+
 protected:
     wxList m_clientList;    // contains the client data for the items
 
@@ -94,8 +93,6 @@ 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);
@@ -104,10 +101,12 @@ private:
     // allocate it if it's needed (hence using pointer)
     wxSortedArrayString *m_strings;
 
-    // this circumvents a GTK+ 2.0 bug so that the selection is 
-    // invalidated properly 
+public:
+    // this circumvents a GTK+ 2.0 bug so that the selection is
+    // invalidated properly
     int m_selection_hack;
-    
+
+private:
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };