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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 70fea3819b..f7362610be 100644
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -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,6 +66,9 @@ public:
     void Clear();
 
     int GetSelection() const;
+#if wxABI_VERSION >= 20602
+    int GetCurrentSelection() const { return GetSelection(); }
+#endif
     void SetSelection( int n );
 
     virtual int GetCount() const;
@@ -104,10 +103,12 @@ private:
     // 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 
     int m_selection_hack;
-    
+
+private:
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };