Fixed wxCheckBox on wxGTK (SetLabel called before widget creation),

[wxWidgets.git] / src / msw / ownerdrw.cpp

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 50d45ce9219eab296aede97100b01987aca54617..a1dd82145f2a79bf695fe6ac9425cd005a6cdba7 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -35,7 +35,7 @@
 
 // ctor
 // ----
-wxOwnerDrawn::wxOwnerDrawn(const wxTString& str, 
+wxOwnerDrawn::wxOwnerDrawn(const wxString& str, 
                            bool bCheckable, bool bMenuItem)
             : m_strName(str)
 {
@@ -46,18 +46,18 @@ wxOwnerDrawn::wxOwnerDrawn(const wxTString& str,
 }
 
 #if defined(__WXMSW__) && defined(__WIN32__)
-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
 #else   // # what is the reasonable default?
-  uint wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
+  size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
 #endif
 
-uint wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
+size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth;
 
 // drawing
 // -------
 
 // get size of the item
-bool wxOwnerDrawn::OnMeasureItem(uint *pwidth, uint *pheight)
+bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
 {
   wxMemoryDC dc;
   dc.SetFont(GetFont());