X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3534fc20dd73fc400eb03c0cea71f509a68b85c3..3c203a185145a1aa720faf53e7f6fbebb35bce7a:/src/msw/notebook.cpp?ds=sidebyside diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 5510e52fb7..8eb710fbe4 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -35,18 +35,14 @@ #include "wx/notebook.h" #include "wx/app.h" #include "wx/sysopt.h" +#include "wx/dcclient.h" +#include "wx/dcmemory.h" #include "wx/msw/private.h" #include -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - -#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +#include #include "wx/msw/winundef.h" @@ -64,6 +60,14 @@ // hide the ugly cast #define m_hwnd (HWND)GetHWND() +#ifdef __WXWINCE__ +#define USE_NOTEBOOK_ANTIFLICKER 0 +#else +// Set this to 1 to compile anti-flicker code, which creates a potentially +// large bitmap for every paint event +#define USE_NOTEBOOK_ANTIFLICKER 0 +#endif + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -93,6 +97,10 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) BEGIN_EVENT_TABLE(wxNotebook, wxControl) +#if USE_NOTEBOOK_ANTIFLICKER + EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground) + EVT_PAINT(wxNotebook::OnPaint) +#endif EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) @@ -133,6 +141,8 @@ wxBEGIN_FLAGS( wxNotebookStyle ) wxFLAGS_MEMBER(wxNB_LEFT) wxFLAGS_MEMBER(wxNB_RIGHT) wxFLAGS_MEMBER(wxNB_BOTTOM) + wxFLAGS_MEMBER(wxNB_NOPAGETHEME) + wxFLAGS_MEMBER(wxNB_FLAT) wxEND_FLAGS( wxNotebookStyle ) @@ -178,6 +188,25 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookPageInfo, wxObject ) #endif IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) +// --------------------------------------------------------------------------- +// private functions +// --------------------------------------------------------------------------- + +#if USE_NOTEBOOK_ANTIFLICKER +// wnd proc for the spin button +LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hWnd, + UINT message, + WPARAM wParam, + LPARAM lParam); + +// --------------------------------------------------------------------------- +// global vars +// --------------------------------------------------------------------------- + +// the pointer to standard spin button wnd proc +static WXFARPROC s_wndprocNotebookSpinBtn = (WXFARPROC)NULL; +#endif + // ============================================================================ // implementation // ============================================================================ @@ -237,6 +266,13 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { +#ifdef __WXWINCE__ + // Not sure why, but without this style, there is no border + // around the notebook tabs. + if (style & wxNB_FLAT) + style |= wxBORDER_SUNKEN; +#endif + // comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the // control is simply not rendered correctly), so disable them in this case const int verComCtl32 = wxApp::GetComCtl32Version(); @@ -294,15 +330,26 @@ bool wxNotebook::Create(wxWindow *parent, if ( !MSWCreateControl(className, wxEmptyString, pos, size) ) return false; - if (HasFlag(wxNB_NOPAGETHEME) || (wxSystemOptions::HasOption(wxT("msw.notebook.themed-background")) && - wxSystemOptions::GetOptionInt(wxT("msw.notebook.themed-background")) == 0)) +#if wxUSE_UXTHEME + if ( HasFlag(wxNB_NOPAGETHEME) || + wxSystemOptions::IsFalse(wxT("msw.notebook.themed-background")) ) { - wxColour col = GetThemeBackgroundColour(); - if (col.Ok()) - { - SetBackgroundColour(col); - } + SetBackgroundColour(GetThemeBackgroundColour()); } +#endif // wxUSE_UXTHEME + + // Undocumented hack to get flat notebook style + // In fact, we should probably only do this in some + // curcumstances, i.e. if we know we will have a border + // at the bottom (the tab control doesn't draw it itself) +#if defined(__POCKETPC__) || defined(__SMARTPHONE__) + if (HasFlag(wxNB_FLAT)) + { + SendMessage(m_hwnd, CCM_SETVERSION, COMCTL32_VERSION, 0); + if (!m_hasBgCol) + SetBackgroundColour(*wxWHITE); + } +#endif return true; } @@ -446,6 +493,29 @@ void wxNotebook::SetImageList(wxImageList* imageList) // wxNotebook size settings // ---------------------------------------------------------------------------- +wxRect wxNotebook::GetPageSize() const +{ + wxRect r; + + RECT rc; + ::GetClientRect(GetHwnd(), &rc); + + // This check is to work around a bug in TabCtrl_AdjustRect which will + // cause a crash on win2k, or on XP with themes disabled, if the + // wxNB_MULTILINE style is used and the rectangle is very small, (such as + // when the notebook is first created.) The value of 20 is just + // arbitrarily chosen, if there is a better way to determine this value + // then please do so. --RD + if ( !HasFlag(wxNB_MULTILINE) || (rc.right > 20 && rc.bottom > 20) ) + { + TabCtrl_AdjustRect(m_hwnd, false, &rc); + + wxCopyRECTToRect(rc, r); + } + + return r; +} + void wxNotebook::SetPageSize(const wxSize& size) { // transform the page size into the notebook size @@ -504,23 +574,10 @@ void wxNotebook::AdjustPageSize(wxNotebookPage *page) { wxCHECK_RET( page, _T("NULL page in wxNotebook::AdjustPageSize") ); - RECT rc; - rc.left = - rc.top = 0; - - // get the page size from the notebook size - GetSize((int *)&rc.right, (int *)&rc.bottom); - - // This check is to work around a bug in TabCtrl_AdjustRect which will - // cause a crash on win2k, or on XP with themes disabled, if the - // wxNB_MULTILINE style is used and the rectangle is very small, (such as - // when the notebook is first created.) The value of 20 is just - // arbitrarily chosen, if there is a better way to determine this value - // then please do so. --RD - if (rc.right > 20 && rc.bottom > 20) + const wxRect r = GetPageSize(); + if ( !r.IsEmpty() ) { - TabCtrl_AdjustRect(m_hwnd, false, &rc); - page->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); + page->SetSize(r); } } @@ -724,10 +781,38 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const void wxNotebook::OnSize(wxSizeEvent& event) { - // update the background brush -#if wxUSE_UXTHEME - UpdateBgBrush(); -#endif // wxUSE_UXTHEME + if ( GetPageCount() == 0 ) + { + // Prevents droppings on resize, but does cause some flicker + // when there are no pages. + Refresh(); + event.Skip(); + return; + } +#ifndef __WXWINCE__ + else + { + // Without this, we can sometimes get droppings at the edges + // of a notebook, for example a notebook in a splitter window. + // This needs to be reconciled with the RefreshRect calls + // at the end of this function, which weren't enough to prevent + // the droppings. + + wxSize sz = GetClientSize(); + + // Refresh right side + wxRect rect(sz.x-4, 0, 4, sz.y); + RefreshRect(rect); + + // Refresh bottom side + rect = wxRect(0, sz.y-4, sz.x, 4); + RefreshRect(rect); + + // Refresh left side + rect = wxRect(0, 0, 4, sz.y); + RefreshRect(rect); + } +#endif // fit all the notebook pages to the tab control's display area @@ -762,6 +847,11 @@ void wxNotebook::OnSize(wxSizeEvent& event) } } +#if wxUSE_UXTHEME + // background bitmap size has changed, update the brush using it too + UpdateBgBrush(); +#endif // wxUSE_UXTHEME + TabCtrl_AdjustRect(m_hwnd, false, &rc); int width = rc.right - rc.left, @@ -874,8 +964,9 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // wxWindow * const parent = GetParent(); - const bool isFromParent = event.GetEventObject() == parent; - const bool isFromSelf = event.GetEventObject() == this; + // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE + const bool isFromParent = event.GetEventObject() == (wxObject*) parent; + const bool isFromSelf = event.GetEventObject() == (wxObject*) this; if ( isFromParent || isFromSelf ) { @@ -921,33 +1012,65 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) #if wxUSE_UXTHEME -WXHANDLE wxNotebook::QueryBgBitmap(wxWindow *win) +bool wxNotebook::DoDrawBackground(WXHDC hDC, wxWindow *child) { + wxUxThemeHandle theme(child ? child : this, L"TAB"); + if ( !theme ) + return false; + + // get the notebook client rect (we're not interested in drawing tabs + // themselves) + wxRect r = GetPageSize(); + if ( r.IsEmpty() ) + return false; + RECT rc; - GetWindowRect(GetHwnd(), &rc); + wxCopyRectToRECT(r, rc); - WindowHDC hDC(GetHwnd()); - MemoryHDC hDCMem(hDC); - CompatibleBitmap hBmp(hDC, rc.right - rc.left, rc.bottom - rc.top); + // map rect to the coords of the window we're drawing in + if ( child ) + ::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2); - SelectInHDC selectBmp(hDCMem, hBmp); - ::SendMessage(GetHwnd(), WM_PRINTCLIENT, - (WPARAM)(HDC)hDCMem, - PRF_ERASEBKGND | PRF_CLIENT | PRF_NONCLIENT); + // apparently DrawThemeBackground() modifies the rect passed to it and if we + // don't do these adjustments, there are some drawing artifacts which are + // only visible with some non default themes; so modify the rect here using + // the magic numbers below so that it still paints the correct area + rc.left -= 2; + rc.top -= 2; + rc.right += 4; + rc.bottom += 5; - if ( win ) - { - RECT rc2; - ::GetWindowRect(GetHwndOf(win), &rc2); - COLORREF c = ::GetPixel(hDCMem, rc2.left - rc.left, rc2.top - rc.top); + wxUxThemeEngine::Get()->DrawThemeBackground + ( + theme, + (HDC) hDC, + 9 /* TABP_PANE */, + 0, + &rc, + NULL + ); - return (WXHANDLE)c; - } - //else: we are asked to create the brush + return true; +} + +WXHBRUSH wxNotebook::QueryBgBitmap() +{ + wxRect r = GetPageSize(); + if ( r.IsEmpty() ) + return 0; + + WindowHDC hDC(GetHwnd()); + MemoryHDC hDCMem(hDC); + CompatibleBitmap hBmp(hDC, r.x + r.width, r.y + r.height); + + SelectInHDC selectBmp(hDCMem, hBmp); - return (WXHANDLE)::CreatePatternBrush(hBmp); + if ( !DoDrawBackground((WXHDC)(HDC)hDCMem) ) + return 0; + + return (WXHBRUSH)::CreatePatternBrush(hBmp); } void wxNotebook::UpdateBgBrush() @@ -957,22 +1080,22 @@ void wxNotebook::UpdateBgBrush() if ( !m_hasBgCol && wxUxThemeEngine::GetIfActive() ) { - m_hbrBackground = (WXHBRUSH)QueryBgBitmap(); + m_hbrBackground = QueryBgBitmap(); } - else // no themes + else // no themes or we've got user-defined solid colour { m_hbrBackground = NULL; } } -WXHBRUSH wxNotebook::MSWGetBgBrushForChild(WXHDC hDC, wxWindow *win) +WXHBRUSH wxNotebook::MSWGetBgBrushForChild(WXHDC hDC, WXHWND hWnd) { if ( m_hbrBackground ) { // before drawing with the background brush, we need to position it // correctly RECT rc; - ::GetWindowRect(GetHwndOf(win), &rc); + ::GetWindowRect((HWND)hWnd, &rc); ::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1); @@ -984,53 +1107,39 @@ WXHBRUSH wxNotebook::MSWGetBgBrushForChild(WXHDC hDC, wxWindow *win) return m_hbrBackground; } - return wxNotebookBase::MSWGetBgBrushForChild(hDC, win); + return wxNotebookBase::MSWGetBgBrushForChild(hDC, hWnd); } -wxColour wxNotebook::MSWGetBgColourForChild(wxWindow *win) +bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child) { - if ( m_hasBgCol ) - return GetBackgroundColour(); + // solid background colour overrides themed background drawing + if ( !UseBgCol() && DoDrawBackground(hDC, child) ) + return true; - if ( !wxUxThemeEngine::GetIfActive() ) - return wxNullColour; + // If we're using a solid colour (for example if we've switched off + // theming for this notebook), paint it + if (UseBgCol()) + { + wxRect r = GetPageSize(); + if ( r.IsEmpty() ) + return false; - COLORREF c = (COLORREF)QueryBgBitmap(win); + RECT rc; + wxCopyRectToRECT(r, rc); - return c == CLR_INVALID ? wxNullColour : wxRGBToColour(c); -} + // map rect to the coords of the window we're drawing in + if ( child ) + ::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2); -bool -wxNotebook::MSWPrintChild(wxWindow *win, - WXWPARAM wParam, - WXLPARAM WXUNUSED(lParam)) -{ - // Don't paint the theme for the child if we have a solid - // background - if (m_hasBgCol || HasFlag(wxNB_NOPAGETHEME) || (wxSystemOptions::HasOption(wxT("msw.notebook.themed-background")) && - wxSystemOptions::GetOptionInt(wxT("msw.notebook.themed-background")) == 0)) - return false; - - RECT rc; - ::GetClientRect(GetHwnd(), &rc); - TabCtrl_AdjustRect(GetHwnd(), true, &rc); - ::MapWindowPoints(GetHwnd(), GetHwndOf(win), (POINT *)&rc, 2); + wxBrush brush(GetBackgroundColour()); + HBRUSH hbr = GetHbrushOf(brush); + + ::FillRect((HDC) hDC, &rc, hbr); - wxUxThemeHandle theme(win, L"TAB"); - if ( theme ) - { - wxUxThemeEngine::Get()->DrawThemeBackground - ( - theme, - (WXHDC)wParam, - 9 /* TABP_PANE */, - 0, - &rc, - NULL - ); + return true; } - return true; + return wxNotebookBase::MSWPrintChild(hDC, child); } #endif // wxUSE_UXTHEME @@ -1073,8 +1182,7 @@ wxColour wxNotebook::GetThemeBackgroundColour() const &themeColor); } - wxColour colour(GetRValue(themeColor), GetGValue(themeColor), GetBValue(themeColor)); - return colour; + return wxRGBToColour(themeColor); } } #endif // wxUSE_UXTHEME @@ -1146,4 +1254,79 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) return processed; } +#ifndef __WXWINCE__ +void wxNotebook::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) +{ + // do nothing here +} + +void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event)) +{ + // Better painting behaviour, at the expense of system resources +#if USE_NOTEBOOK_ANTIFLICKER + wxPaintDC dc(this); + wxMemoryDC memdc; + RECT rc; + ::GetClientRect(GetHwnd(), &rc); + wxBitmap bmp(rc.right, rc.bottom); + memdc.SelectObject(bmp); + + // iterate over all child windows to find spin button + for ( HWND child = ::GetWindow(GetHwnd(), GW_CHILD); + child; + child = ::GetWindow(child, GW_HWNDNEXT) ) + { + wxWindow *childWindow = wxFindWinFromHandle((WXHWND)child); + + // see if it exists, if no wxWindow found then assume it's the spin btn + if ( !childWindow ) + { + // subclass the spin button to override WM_ERASEBKGND + if ( !s_wndprocNotebookSpinBtn ) + s_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child); + + wxSetWindowProc(child, wxNotebookSpinBtnWndProc); + break; + } + } + + HBRUSH hbr = (HBRUSH)m_hbrBackground; + + // if there is no special brush just use the solid background colour + wxBrush brush; + if ( !hbr ) + { + brush = wxBrush(GetBackgroundColour()); + hbr = GetHbrushOf(brush); + } + + ::FillRect(GetHdcOf(memdc), &rc, hbr); + + MSWDefWindowProc(WM_PAINT, (WPARAM)memdc.GetHDC(), 0); + + dc.Blit(0, 0, rc.right, rc.bottom, &memdc, 0, 0); +#endif +} +#endif + // __WXWINCE__ + +#if USE_NOTEBOOK_ANTIFLICKER +// --------------------------------------------------------------------------- +// window proc for spin button +// --------------------------------------------------------------------------- + +LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + if ( message == WM_ERASEBKGND ) + return 0; + + return ::CallWindowProc(CASTWNDPROC s_wndprocNotebookSpinBtn, hwnd, message, wParam, lParam); +} + +#endif + // USE_NOTEBOOK_ANTIFLICKER + #endif // wxUSE_NOTEBOOK