X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d801d09f9fffbc330c31a0c5cb8707673376b01..f0f03f324281e2a2eb137f532295dc2bcaa120d3:/src/msw/control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index d4ae78000a..1fac8d1ed2 100644
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -59,15 +59,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 // wxControl implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// wxControl ctor/dtor
-// ----------------------------------------------------------------------------
-
-wxControl::~wxControl()
-{
-    m_isBeingDeleted = true;
-}
-
 // ----------------------------------------------------------------------------
 // control window creation
 // ----------------------------------------------------------------------------
@@ -144,25 +135,37 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                         label.wx_str(),     // the window name
                         style,              // the window style
                         x, y, w, h,         // the window position and size
-                        GetHwndOf(GetParent()),  // parent
-                        (HMENU)GetId(),     // child id
+                        GetHwndOf(GetParent()),         // parent
+                        (HMENU)wxUIntToPtr(GetId()),    // child id
                         wxGetInstance(),    // app instance
                         NULL                // creation parameters
                        );
 
     if ( !m_hWnd )
     {
-#ifdef __WXDEBUG__
         wxLogLastError(wxString::Format
                        (
-                        _T("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
+                        wxT("CreateWindowEx(\"%s\", flags=%08lx, ex=%08lx)"),
                         classname, style, exstyle
                        ));
-#endif // __WXDEBUG__
 
         return false;
     }
 
+#if !wxUSE_UNICODE
+    // Text labels starting with the character 0xff (which is a valid character
+    // in many code pages) don't appear correctly as CreateWindowEx() has some
+    // special treatment for this case, apparently the strings starting with -1
+    // are not really strings but something called "ordinals". There is no
+    // documentation about it but the fact is that the label gets mangled or
+    // not displayed at all if we don't do this, see #9572.
+    //
+    // Notice that 0xffff is not a valid Unicode character so the problem
+    // doesn't arise in Unicode build.
+    if ( !label.empty() && label[0] == -1 )
+        ::SetWindowText(GetHwnd(), label.wx_str());
+#endif // !wxUSE_UNICODE
+
     // saving the label in m_labelOrig to return it verbatim
     // later in GetLabel()
     m_labelOrig = label;
@@ -240,6 +243,9 @@ WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const
 
 wxSize wxControl::DoGetBestSize() const
 {
+    if (m_windowSizer)
+       return wxControlBase::DoGetBestSize();
+       
     return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT);
 }
 
@@ -392,10 +398,9 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
         ::SetBkColor(hdc, wxColourToRGB(colBg));
 
         // draw children with the same colour as the parent
-        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID);
-
+        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg,
+                                                           wxBRUSHSTYLE_SOLID);
         hbr = (WXHBRUSH)brush->GetResourceHandle();
-
     }
 
     // if we use custom background, we should set foreground ourselves too