listctrl generic is used outside of osx-carbon

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index a594dba58e15868eb60ae1036d4eda29d5958480..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() { }


@@ -40,6 +40,13 @@ public:
 
     // all generic methods are in wxControlWithItems
 
 
     // all generic methods are in wxControlWithItems
 

+    // get the current selection: this can only be different from the normal
+    // selection if the popup items list is currently opened and the user
+    // selected some item in it but didn't close the list yet; otherwise (and
+    // currently always on platforms other than MSW) this is the same as
+    // GetSelection()
+    virtual int GetCurrentSelection() const { return GetSelection(); }
+

     // set/get the number of columns in the control (as they're not supported on
     // most platforms, they do nothing by default)
     virtual void SetColumns(int WXUNUSED(n) = 1 ) { }
     // set/get the number of columns in the control (as they're not supported on
     // most platforms, they do nothing by default)
     virtual void SetColumns(int WXUNUSED(n) = 1 ) { }


@@ -48,6 +55,9 @@ public:
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 
     // emulate selecting the item event.GetInt()
     void Command(wxCommandEvent& event);
 

+    // override wxItemContainer::IsSorted
+    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
+

 private:
     DECLARE_NO_COPY_CLASS(wxChoiceBase)
 };
 private:
     DECLARE_NO_COPY_CLASS(wxChoiceBase)
 };


@@ -64,17 +74,20 @@ 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__)
 #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
 

-#endif
-    // _WX_CHOICE_H_BASE_
+#endif // _WX_CHOICE_H_BASE_