1. more wxMotif fixes

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 54da088afdf34cc9380d8fc4290fc825585d8b05..7cdfa9a577e53b2dfae672addec2453189c4be10 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr;
 
 // Choice item
 class WXDLLEXPORT wxChoice: public wxControl
@@ -73,9 +73,10 @@ public:
 protected:
     int     m_noStrings;
 
+    virtual wxSize DoGetBestSize();
     virtual void DoSetSize(int x, int y,
-            int width, int height,
-            int sizeFlags = wxSIZE_AUTO);
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 };
 
 #endif