X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3180bc0e63fc0feea1fcdb756752b700c27b9773..3f4a2351e4c677c88c18ea812b609477adee7380:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index cd973ac89e..9817456107 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,7 +26,10 @@ #if wxUSE_CONTROLS +#include "wx/control.h" + #ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" #include "wx/event.h" #include "wx/app.h" #include "wx/dcclient.h" @@ -38,13 +37,16 @@ #include "wx/settings.h" #endif -#include "wx/control.h" +#if wxUSE_LISTCTRL + #include "wx/listctrl.h" +#endif // wxUSE_LISTCTRL -#include "wx/msw/private.h" +#if wxUSE_TREECTRL + #include "wx/treectrl.h" +#endif // wxUSE_TREECTRL -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +#include "wx/msw/private.h" +#include "wx/msw/uxtheme.h" // ---------------------------------------------------------------------------- // wxWin macros @@ -52,10 +54,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) -BEGIN_EVENT_TABLE(wxControl, wxWindow) - EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) -END_EVENT_TABLE() - // ============================================================================ // wxControl implementation // ============================================================================ @@ -125,11 +123,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); @@ -149,27 +151,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); @@ -186,7 +210,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 @@ -210,15 +238,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( -#ifdef defined(__SMARTPHONE__) && defined(__WXWINCE__) +#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 ); @@ -276,7 +304,6 @@ bool wxControl::ProcessCommand(wxCommandEvent& event) return GetEventHandler()->ProcessEvent(event); } -#ifdef __WIN95__ bool wxControl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) @@ -324,62 +351,66 @@ bool wxControl::MSWOnNotify(int idCtrl, return GetEventHandler()->ProcessEvent(event); } -#endif // Win95 -void wxControl::OnEraseBackground(wxEraseEvent& event) +WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd) { - // notice that this 'dumb' implementation may cause flicker for some of the - // controls in which case they should intercept wxEraseEvent and process it - // themselves somehow + HDC hdc = (HDC)pDC; + if ( m_hasFgCol ) + { + ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + } - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + WXHBRUSH hbr = 0; + if ( !colBg.Ok() ) + { + hbr = MSWGetBgBrush(pDC, hWnd); - HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour())); + // 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(); + } - HDC hdc = GetHdcOf((*event.GetDC())); + // use the background colour override if a valid colour is given + if ( colBg.Ok() ) + { + ::SetBkColor(hdc, wxColourToRGB(colBg)); -#ifndef __WXWINCE__ - int mode = ::SetMapMode(hdc, MM_TEXT); -#endif + // draw children with the same colour as the parent + wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID); - ::FillRect(hdc, &rect, hBrush); - ::DeleteObject(hBrush); + hbr = (WXHBRUSH)brush->GetResourceHandle(); -#ifndef __WXWINCE__ - ::SetMapMode(hdc, mode); -#endif -} + } -WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), -#if wxUSE_CTL3D - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam -#else - WXUINT WXUNUSED(message), - WXWPARAM WXUNUSED(wParam), - WXLPARAM WXUNUSED(lParam) -#endif - ) -{ -#if wxUSE_CTL3D - if ( m_useCtl3D ) + // if we use custom background, we should set foreground ourselves too + if ( hbr && !m_hasFgCol ) { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; + ::SetTextColor(hdc, ::GetSysColor(COLOR_WINDOWTEXT)); } -#endif // wxUSE_CTL3D + //else: already set above - HDC hdc = (HDC)pDC; - wxColour colBack = GetBackgroundColour(); + return hbr; +} - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); +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(); - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + return DoMSWControlColor(pDC, colBg, hWnd); +} - return (WXHBRUSH)brush->GetResourceHandle(); +WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC) +{ + return DoMSWControlColor(pDC, + wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE), + GetHWND()); } // ---------------------------------------------------------------------------