simplify code to return from the end of the function

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 1cc9dce77e25cf1e66285c1b3372e0cc582b0612..6fe928cc5772aa3ae4e935eb04851e90c73f8a41 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -132,7 +132,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
                        (
                         exstyle,            // extended style
                         classname,          // the kind of control to create
                        (
                         exstyle,            // extended style
                         classname,          // the kind of control to create

-                        label.wx_str(),     // the window name
+                        label.t_str(),      // the window name

                         style,              // the window style
                         x, y, w, h,         // the window position and size
                         GetHwndOf(GetParent()),         // parent
                         style,              // the window style
                         x, y, w, h,         // the window position and size
                         GetHwndOf(GetParent()),         // parent


@@ -163,7 +163,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname,
     // Notice that 0xffff is not a valid Unicode character so the problem
     // doesn't arise in Unicode build.
     if ( !label.empty() && label[0] == -1 )
     // 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());
+        ::SetWindowText(GetHwnd(), label.t_str());

 #endif // !wxUSE_UNICODE
 
     // saving the label in m_labelOrig to return it verbatim
 #endif // !wxUSE_UNICODE
 
     // saving the label in m_labelOrig to return it verbatim


@@ -365,10 +365,26 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
     HDC hdc = (HDC)pDC;
 
     WXHBRUSH hbr = 0;
     HDC hdc = (HDC)pDC;
 
     WXHBRUSH hbr = 0;

-    if ( !colBg.Ok() )
+    if ( !colBg.IsOk() )

     {
     {

-        if ( wxWindow *win = wxFindWinFromHandle(hWnd) )
-            hbr = MSWGetBgBrush(pDC, win);
+        wxWindow *win = wxFindWinFromHandle( hWnd );
+        if ( !win )
+        {
+            // If this HWND doesn't correspond to a wxWindow, it still might be
+            // one of its children for which we need to set the background
+            // brush, e.g. this is the case for the EDIT control that is part
+            // of wxComboBox. Check for this by asking the parent if it has it:
+            HWND parent = ::GetParent(hWnd);
+            if ( parent )
+            {
+                wxWindow *winParent = wxFindWinFromHandle( parent );
+                if( winParent && winParent->ContainsHWND( hWnd ) )
+                    win = winParent;
+             }
+        }
+
+        if ( win )
+            hbr = win->MSWGetBgBrush(pDC);

 
         // if the control doesn't have any bg colour, foreground colour will be
         // ignored as the return value would be 0 -- so forcefully give it a
 
         // if the control doesn't have any bg colour, foreground colour will be
         // ignored as the return value would be 0 -- so forcefully give it a


@@ -380,7 +396,7 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
     // use the background colour override if a valid colour is given: this is
     // used when the control is disabled to grey it out and also if colBg was
     // set just above
     // use the background colour override if a valid colour is given: this is
     // used when the control is disabled to grey it out and also if colBg was
     // set just above

-    if ( colBg.Ok() )
+    if ( colBg.IsOk() )

     {
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg);
         hbr = (WXHBRUSH)brush->GetResourceHandle();
     {
         wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg);
         hbr = (WXHBRUSH)brush->GetResourceHandle();


@@ -453,7 +469,7 @@ int wxControlWithItems::MSWInsertOrAppendItem(unsigned pos,
                                               unsigned wm)
 {
     LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,
                                               unsigned wm)
 {
     LRESULT n = SendMessage((HWND)MSWGetItemsHWND(), wm, pos,

-                            (LPARAM)item.wx_str());
+                            wxMSW_CONV_LPARAM(item));

     if ( n == CB_ERR || n == CB_ERRSPACE )
     {
         wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));
     if ( n == CB_ERR || n == CB_ERRSPACE )
     {
         wxLogLastError(wxT("SendMessage(XX_ADD/INSERTSTRING)"));