X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0176dd9fb716ad0a1a8804f0a93e16048f09054..cd7800274bd120f099ae712dfd76ea69eaeeed73:/src/msw/control.cpp diff --git a/src/msw/control.cpp b/src/msw/control.cpp index 20c7dd20fe..caaa395f3c 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -40,7 +40,12 @@ #include "wx/control.h" +#if wxUSE_NOTEBOOK + #include "wx/notebook.h" +#endif // wxUSE_NOTEBOOK + #include "wx/msw/private.h" +#include "wx/msw/uxtheme.h" #if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include @@ -52,10 +57,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow) -BEGIN_EVENT_TABLE(wxControl, wxWindow) - EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground) -END_EVENT_TABLE() - // ============================================================================ // wxControl implementation // ============================================================================ @@ -66,7 +67,7 @@ END_EVENT_TABLE() wxControl::~wxControl() { - m_isBeingDeleted = TRUE; + m_isBeingDeleted = true; } // ---------------------------------------------------------------------------- @@ -82,13 +83,13 @@ bool wxControl::Create(wxWindow *parent, const wxString& name) { if ( !wxWindow::Create(parent, id, pos, size, style, name) ) - return FALSE; + return false; #if wxUSE_VALIDATORS SetValidator(validator); #endif - return TRUE; + return true; } bool wxControl::MSWCreateControl(const wxChar *classname, @@ -125,13 +126,17 @@ bool wxControl::MSWCreateControl(const wxChar *classname, style |= WS_VISIBLE; } - // choose the position for the control - int x = pos.x == -1 ? 0 : pos.x, - y = pos.y == -1 ? 0 : pos.y, - w = size.x == -1 ? 0 : size.x, - h = size.y == -1 ? 0 : size.y; - - // ... and adjust it to account for ap ossible parent frames toolbar + // 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 ? 1 : size.x, + h = size.y == wxDefaultCoord ? 1 : size.y; + + // ... and adjust it to account for a possible parent frames toolbar AdjustForParentClientOrigin(x, y); m_hWnd = (WXHWND)::CreateWindowEx @@ -149,20 +154,17 @@ 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")); - - return FALSE; +#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); @@ -174,7 +176,7 @@ bool wxControl::MSWCreateControl(const wxChar *classname, // set the size now if no initial size specified SetInitialBestSize(size); - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -206,6 +208,37 @@ wxSize wxControl::DoGetBestSize() const return wxSize(DEFAULT_ITEM_WIDTH, DEFAULT_ITEM_HEIGHT); } +// This is a helper for all wxControls made with UPDOWN native control. +// 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::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) +#endif + ); + + // correct size as for undocumented MSW variants cases (WinCE and perhaps others) + if (bestSize.x==0) + bestSize.x = bestSize.y; + if (bestSize.y==0) + bestSize.y = bestSize.x; + + // double size according to layout + if (is_vertical) + bestSize.y *= 2; + else + bestSize.x *= 2; + + return bestSize; +} + /* static */ wxVisualAttributes wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { @@ -250,7 +283,7 @@ bool wxControl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) { - wxEventType eventType = wxEVT_NULL; + wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL); NMHDR *hdr = (NMHDR*) lParam; switch ( hdr->code ) @@ -295,60 +328,47 @@ bool wxControl::MSWOnNotify(int idCtrl, } #endif // Win95 -void wxControl::OnEraseBackground(wxEraseEvent& event) +WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg) { - // 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 - - RECT rect; - ::GetClientRect(GetHwnd(), &rect); - - HBRUSH hBrush = ::CreateSolidBrush(wxColourToRGB(GetBackgroundColour())); - - HDC hdc = GetHdcOf((*event.GetDC())); - -#ifndef __WXWINCE__ - int mode = ::SetMapMode(hdc, MM_TEXT); -#endif + HDC hdc = (HDC)pDC; + if ( m_hasFgCol ) + { + ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); + } - ::FillRect(hdc, &rect, hBrush); - ::DeleteObject(hBrush); + // use the background colour override if a valid colour is given + WXHBRUSH hbr; + if ( colBg.Ok() ) + { + ::SetBkColor(hdc, wxColourToRGB(colBg)); -#ifndef __WXWINCE__ - ::SetMapMode(hdc, mode); -#endif -} + // draw children with the same colour as the parent + wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBg, wxSOLID); -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 ) + hbr = (WXHBRUSH)brush->GetResourceHandle(); + } + else // use our own background colour and recurse upwards if necessary { - HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam); - return (WXHBRUSH) hbrush; + hbr = MSWGetBgBrush(pDC); } -#endif // wxUSE_CTL3D - HDC hdc = (HDC)pDC; - wxColour colBack = GetBackgroundColour(); + return hbr; +} - ::SetBkColor(hdc, wxColourToRGB(colBack)); - ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour())); +WXHBRUSH wxControl::MSWControlColor(WXHDC pDC) +{ + // by default consider that the controls text shouldn't erase the + // background under it (this is true for all static controls, check boxes, + // radio buttons, ... + ::SetBkMode((HDC)pDC, TRANSPARENT); - wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID); + return DoMSWControlColor(pDC, wxNullColour); +} - return (WXHBRUSH)brush->GetResourceHandle(); +WXHBRUSH wxControl::MSWControlColorDisabled(WXHDC pDC) +{ + return DoMSWControlColor(pDC, + wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)); } // --------------------------------------------------------------------------- @@ -360,7 +380,7 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED // // Call this repeatedly for several wnds to find the overall size // of the widget. -// Call it initially with -1 for all values in rect. +// Call it initially with wxDefaultCoord for all values in rect. // Keep calling for other widgets, and rect will be modified // to calculate largest bounding rectangle. void wxFindMaxSize(WXHWND wnd, RECT *rect)