X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..be19c556083cc197be55acbd05db76ec6dc2e0c4:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index a5fdf70f11..6f3c75563c 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -5,7 +5,7 @@ // Modified by: // Created: 26.07.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -16,9 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma interface "choicebase.h" -#endif +#include "wx/defs.h" #if wxUSE_CHOICE @@ -28,32 +26,40 @@ // global data // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; +extern WXDLLIMPEXP_DATA_CORE(const char) wxChoiceNameStr[]; // ---------------------------------------------------------------------------- // wxChoice allows to select one of a non-modifiable list of strings // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoiceBase : public wxControlWithItems +class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems { public: - // all generic methods are in wxControlWithItems + wxChoiceBase() { } virtual ~wxChoiceBase(); - // single selection logic - virtual void SetSelection(int n) = 0; - virtual bool SetStringSelection(const wxString& s); + // all generic methods are in wxControlWithItems - // don't override this - virtual void Select(int n) { SetSelection(n); } + // 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 supporte on + // 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 ) { } virtual int GetColumns() const { return 1 ; } // emulate selecting the item event.GetInt() void Command(wxCommandEvent& event); + + // override wxItemContainer::IsSorted + virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } + +private: + wxDECLARE_NO_COPY_CLASS(wxChoiceBase); }; // ---------------------------------------------------------------------------- @@ -62,21 +68,26 @@ public: #if defined(__WXUNIVERSAL__) #include "wx/univ/choice.h" +#elif defined(__SMARTPHONE__) && defined(__WXWINCE__) + #include "wx/msw/wince/choicece.h" #elif defined(__WXMSW__) #include "wx/msw/choice.h" #elif defined(__WXMOTIF__) #include "wx/motif/choice.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/choice.h" +#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(__WXSTUBS__) - #include "wx/stubs/choice.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/choice.h" #endif #endif // wxUSE_CHOICE -#endif - // _WX_CHOICE_H_BASE_ +#endif // _WX_CHOICE_H_BASE_