Use CmdDown in mouse events instead of ControlDown so Mac users can

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index ea08445c753215d5aca0bb996c5fbedd2cab96ea..63f3267936f9e4457b97f472635b1efdd5559cff 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

 #include "wx/defs.h"
 
 #if wxUSE_CHOICE
 #include "wx/defs.h"
 
 #if wxUSE_CHOICE


@@ -30,7 +26,7 @@
 // global data
 // ----------------------------------------------------------------------------
 
 // global data
 // ----------------------------------------------------------------------------
 

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

 
 // ----------------------------------------------------------------------------
 // wxChoice allows to select one of a non-modifiable list of strings
 
 // ----------------------------------------------------------------------------
 // wxChoice allows to select one of a non-modifiable list of strings


@@ -68,8 +64,10 @@ private:
     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/choice.h"
     #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/choice.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/choice.h"
     #include "wx/gtk/choice.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/choice.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/choice.h"
 #elif defined(__WXCOCOA__)