handle actions of the columns popup menu in wxHeaderCtrl itself (but the derived...

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 164aac07a57849ca7f796389ea5d16a0861926e8..18d31d2c12c59926b6b0342e582f3adf3f04ddf8 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -26,13 +26,13 @@
 // global data
 // ----------------------------------------------------------------------------
 
 // global data
 // ----------------------------------------------------------------------------
 

-extern WXDLLEXPORT_DATA(const wxChar) wxChoiceNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) 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
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxChoiceBase : public wxControlWithItems
+class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems

 {
 public:
     wxChoiceBase() { }
 {
 public:
     wxChoiceBase() { }


@@ -79,11 +79,13 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)

-    #include "wx/mac/choice.h"
+    #include "wx/osx/choice.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)
     #include "wx/os2/choice.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/choice.h"

 #endif
 
 #endif // wxUSE_CHOICE
 #endif
 
 #endif // wxUSE_CHOICE