X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e96ec686d8f244bbd617c14aa0c62ff9ca0c2970..b5b0a35d6b648aead1aa353dfe9c03775496981f:/src/msw/control.cpp?ds=sidebyside diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 8a8bbee16d..73a8f2511a 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/control.cpp +// Name: src/msw/control.cpp // Purpose: wxControl class // Author: Julian Smart // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "control.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,6 +26,8 @@ #if wxUSE_CONTROLS +#include "wx/control.h" + #ifndef WX_PRECOMP #include "wx/event.h" #include "wx/app.h" @@ -38,18 +36,19 @@ #include "wx/settings.h" #endif -#include "wx/control.h" +#if wxUSE_LISTCTRL + #include "wx/listctrl.h" +#endif // wxUSE_LISTCTRL -#if wxUSE_NOTEBOOK - #include "wx/notebook.h" -#endif // wxUSE_NOTEBOOK +#if wxUSE_TREECTRL + #include "wx/treectrl.h" +#endif // wxUSE_TREECTRL #include "wx/msw/private.h" #include "wx/msw/uxtheme.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +// include "properly" +#include "wx/msw/wrapcctl.h" // ---------------------------------------------------------------------------- // wxWin macros @@ -126,11 +125,15 @@ bool wxControl::MSWCreateControl(const wxChar *classname, style |= WS_VISIBLE; } - // choose the position for the control + // choose the position for the control: we have a problem with default size + // here as we can't calculate the best size before the control exists + // (DoGetBestSize() may need to use m_hWnd), so just choose the minimal + // possible but non 0 size because 0 window width/height result in problems + // elsewhere int x = pos.x == wxDefaultCoord ? 0 : pos.x, y = pos.y == wxDefaultCoord ? 0 : pos.y, - w = size.x == wxDefaultCoord ? 0 : size.x, - h = size.y == wxDefaultCoord ? 0 : size.y; + w = size.x == wxDefaultCoord ? 1 : size.x, + h = size.y == wxDefaultCoord ? 1 : size.y; // ... and adjust it to account for a possible parent frames toolbar AdjustForParentClientOrigin(x, y); @@ -150,27 +153,49 @@ bool wxControl::MSWCreateControl(const wxChar *classname, if ( !m_hWnd ) { - wxLogDebug(wxT("Failed to create a control of class '%s'"), classname); - wxFAIL_MSG(_T("something is very wrong, CreateWindowEx failed")); +#ifdef __WXDEBUG__ + wxFAIL_MSG(wxString::Format + ( + _T("CreateWindowEx(\"%s\", flags=%08x, ex=%08x) failed"), + classname, (unsigned int)style, (unsigned int)exstyle + )); +#endif // __WXDEBUG__ return false; } -#if wxUSE_CTL3D - if ( want3D ) - { - Ctl3dSubclassCtl(GetHwnd()); - m_useCtl3D = true; - } -#endif // wxUSE_CTL3D - // install wxWidgets window proc for this window SubclassWin(m_hWnd); // set up fonts and colours InheritAttributes(); - if (!m_hasFont) - SetFont(GetDefaultAttributes().font); + if ( !m_hasFont ) + { +#if wxUSE_LISTCTRL || wxUSE_TREECTRL + // if we set a font for {list,tree}ctrls and the font size is changed in + // the display properties then the font size for these controls doesn't + // automatically adjust when they receive WM_SETTINGCHANGE + if ( wxDynamicCastThis(wxListCtrl) || wxDynamicCastThis(wxTreeCtrl) ) + { + // not sure if we need to explicitly set the font here for Win95/NT4 + // but we definitely can't do it for any newer version + // see wxGetCCDefaultFont() in src/msw/settings.cpp for explanation + // of why this test works + + // TODO: test Win95/NT4 to see if this is needed or breaks the + // font resizing as it does on newer versions + wxFont font = GetDefaultAttributes().font; + if ( font == wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) ) + { + SetFont(font); + } + } + else +#endif // wxUSE_LISTCTRL || wxUSE_TREECTRL + { + SetFont(GetDefaultAttributes().font); + } + } // set the size now if no initial size specified SetInitialBestSize(size); @@ -187,7 +212,11 @@ wxBorder wxControl::GetDefaultBorder() const // we want to automatically give controls a sunken style (confusingly, // it may not really mean sunken at all as we map it to WS_EX_CLIENTEDGE // which is not sunken at all under Windows XP -- rather, just the default) +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) + return wxBORDER_SIMPLE; +#else return wxBORDER_SUNKEN; +#endif } WXDWORD wxControl::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -211,15 +240,15 @@ wxSize wxControl::DoGetBestSize() const // In wxMSW it was only wxSpinCtrl derived from wxSpinButton but in // WinCE of Smartphones this happens also for native wxTextCtrl, // wxChoice and others. -wxSize wxControl::GetBestSpinerSize(const bool is_vertical) const +wxSize wxControl::GetBestSpinnerSize(const bool is_vertical) const { // take size according to layout wxSize bestSize( #if defined(__SMARTPHONE__) && defined(__WXWINCE__) 0,GetCharHeight() #else - GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL), - GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL) + ::GetSystemMetrics(is_vertical ? SM_CXVSCROLL : SM_CXHSCROLL), + ::GetSystemMetrics(is_vertical ? SM_CYVSCROLL : SM_CYHSCROLL) #endif ); @@ -277,7 +306,6 @@ bool wxControl::ProcessCommand(wxCommandEvent& event) return GetEventHandler()->ProcessEvent(event); } -#ifdef __WIN95__ bool wxControl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) @@ -325,63 +353,65 @@ bool wxControl::MSWOnNotify(int idCtrl, return GetEventHandler()->ProcessEvent(event); } -#endif // Win95 -WXHBRUSH wxControl::MSWControlColorSolid(WXHDC pDC, wxColour colBg) +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() ) + { + hbr = MSWGetBgBrush(pDC, hWnd); + // 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 + // non default background brush in this case + if ( !hbr && m_hasFgCol ) + colBg = GetBackgroundColour(); + } + + // use the background colour override if a valid colour is given if ( colBg.Ok() ) { ::SetBkColor(hdc, wxColourToRGB(colBg)); + // draw children with the same colour as the parent wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID); - return (WXHBRUSH)brush->GetResourceHandle(); + hbr = (WXHBRUSH)brush->GetResourceHandle(); + + // if we use custom background, we should set foreground ourselves too + if ( !m_hasFgCol ) + { + ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT)); + } + //else: already set above } - return 0; + return hbr; } -WXHBRUSH wxControl::MSWControlColor(WXHDC pDC) +WXHBRUSH wxControl::MSWControlColor(WXHDC pDC, WXHWND hWnd) { - WXHBRUSH hbr = MSWControlColorSolid(pDC, m_hasBgCol ? m_backgroundColour - : wxNullColour); - if ( hbr ) - return hbr; - - ::SetBkMode((HDC)pDC, TRANSPARENT); + wxColour colBg; -#if wxUSE_UXTHEME && wxUSE_NOTEBOOK - if ( wxUxThemeEngine::GetIfActive() ) - { - for ( wxWindow *win = this; win; win = win->GetParent() ) - { - wxNotebook *nbook = wxDynamicCast(win, wxNotebook); - if ( nbook ) - { - // return value may be NULL but it is ok: if the first parent - // notebook doesn't use themes, then we don't have to process - // this message at all, so let default processing take place - return nbook->GetThemeBackgroundBrush(pDC, this); - } - } - } -#endif // wxUSE_UXTHEME + if ( HasTransparentBackground() ) + ::SetBkMode((HDC)pDC, TRANSPARENT); + else // if the control is opaque it shouldn't use the parents background + colBg = GetBackgroundColour(); - // let the control deal with background itself - return 0; + return DoMSWControlColor(pDC, colBg, hWnd); } WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC) { - return MSWControlColorSolid - ( - pDC, - wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE) - ); + return DoMSWControlColor(pDC, + wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), + GetHWND()); } // ---------------------------------------------------------------------------