X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b4da62701dbe8ccfbe447ce8d1bc77fcb40e9e5..51623cc53f350935337e57930eaaf1afe9a48c3b:/include/wx/choice.h?ds=sidebyside diff --git a/include/wx/choice.h b/include/wx/choice.h index 3127b083a5..369dbb517a 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -26,13 +26,13 @@ // global data // ---------------------------------------------------------------------------- -extern WXDLLEXPORT_DATA(const char) 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() { } @@ -58,8 +58,15 @@ public: // 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); }; // ---------------------------------------------------------------------------- @@ -79,13 +86,11 @@ private: #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(__WXPALMOS__) - #include "wx/palmos/choice.h" #endif #endif // wxUSE_CHOICE