Make _() and friends safe to call from any thread.

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

diff --git a/include/wx/choice.h b/include/wx/choice.h
index 164aac07a57849ca7f796389ea5d16a0861926e8..3a848f9f3c0cc2b62d6f879fa78e3c94779331d2 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -26,13 +25,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() { }
@@ -58,8 +57,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,7 +85,7 @@ 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__)