X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/64fa6f167ebb404e5441eddcee5bbd0808466d7a..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/choice.h diff --git a/include/wx/choice.h b/include/wx/choice.h index 12bf96c6e0..369dbb517a 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -16,9 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "choicebase.h" -#endif +#include "wx/defs.h" #if wxUSE_CHOICE @@ -28,13 +26,13 @@ // 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 // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxChoiceBase : public wxControlWithItems +class WXDLLIMPEXP_CORE wxChoiceBase : public wxControlWithItems { public: wxChoiceBase() { } @@ -42,11 +40,12 @@ public: // all generic methods are in wxControlWithItems - // single selection logic - virtual void SetSelection(int n) = 0; - - // 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 supported on // most platforms, they do nothing by default) @@ -56,8 +55,18 @@ public: // emulate selecting the item event.GetInt() void Command(wxCommandEvent& event); + // override wxItemContainer::IsSorted + virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } + +protected: + // The generic implementation doesn't determine the height correctly and + // doesn't account for the width of the arrow but does take into account + // the string widths, so the derived classes should override it and set the + // height and add the arrow width to the size returned by this version. + virtual wxSize DoGetBestSize() const; + private: - DECLARE_NO_COPY_CLASS(wxChoiceBase) + wxDECLARE_NO_COPY_CLASS(wxChoiceBase); }; // ---------------------------------------------------------------------------- @@ -72,10 +81,12 @@ private: #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__) @@ -84,5 +95,4 @@ private: #endif // wxUSE_CHOICE -#endif - // _WX_CHOICE_H_BASE_ +#endif // _WX_CHOICE_H_BASE_