X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0c133e13b36a923c65f94499554e432bc3a0daa..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/choice.h?ds=sidebyside

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 6f3c75563c..369dbb517a 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -58,6 +58,13 @@ 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:
     wxDECLARE_NO_COPY_CLASS(wxChoiceBase);
 };
@@ -84,8 +91,6 @@ private:
     #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