X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..43f4e852a1b2ac37c3db6a2b87315192ac549191:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index dbefd0d91f..6fe928cc57 100644 --- 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 - 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 @@ -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 ) - ::SetWindowText(GetHwnd(), label.wx_str()); + ::SetWindowText(GetHwnd(), label.t_str()); #endif // !wxUSE_UNICODE // saving the label in m_labelOrig to return it verbatim @@ -303,18 +303,6 @@ wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return attrs; } -// another version for the "composite", i.e. non simple controls -/* static */ wxVisualAttributes -wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(variant)) -{ - wxVisualAttributes attrs; - attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); - attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); - - return attrs; -} - // ---------------------------------------------------------------------------- // message handling // ---------------------------------------------------------------------------- @@ -375,15 +363,28 @@ bool wxControl::MSWOnNotify(int idCtrl, WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) { HDC hdc = (HDC)pDC; - if ( m_hasFgCol ) - { - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); - } WXHBRUSH hbr = 0; - if ( !colBg.Ok() ) + if ( !colBg.IsOk() ) { - hbr = MSWGetBgBrush(pDC, hWnd); + 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 @@ -392,37 +393,47 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) colBg = GetBackgroundColour(); } - // use the background colour override if a valid colour is given - if ( colBg.Ok() ) + // 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.IsOk() ) { - ::SetBkColor(hdc, wxColourToRGB(colBg)); - - // draw children with the same colour as the parent - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, - wxBRUSHSTYLE_SOLID); + wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg); hbr = (WXHBRUSH)brush->GetResourceHandle(); } - // if we use custom background, we should set foreground ourselves too - if ( hbr && !m_hasFgCol ) + // always set the foreground colour if we changed the background, whether + // m_hasFgCol is true or not: if it true, we must do it, of course, but + // even if it isn't, we must set the default foreground explicitly as by + // default just the simple black is used + if ( hbr ) + { + ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + } + + // finally also set the background colour for text drawing: without this, + // the text in an edit control is drawn using the default background even + // if we return a valid brush + if ( colBg.IsOk() || m_hasBgCol ) { - ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT)); + if ( !colBg.IsOk() ) + colBg = GetBackgroundColour(); + + ::SetBkColor(hdc, wxColourToRGB(colBg)); } - //else: already set above return hbr; } WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd) { - wxColour colBg; - if ( HasTransparentBackground() ) ::SetBkMode((HDC)pDC, TRANSPARENT); - else // if the control is opaque it shouldn't use the parents background - colBg = GetBackgroundColour(); - return DoMSWControlColor(pDC, colBg, hWnd); + // don't pass any background colour to DoMSWControlColor(), our own + // background colour will be used by it only if it is set, otherwise the + // defaults will be used + return DoMSWControlColor(pDC, wxColour(), hWnd); } WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC) @@ -458,7 +469,7 @@ int wxControlWithItems::MSWInsertOrAppendItem(unsigned 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)"));