X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01c8cbf54dd8de509cf343bbfb6e66f8e0bcd3f4..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/msw/notebook.cpp?ds=sidebyside diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 1408e69ca7..5694d072b9 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -57,12 +57,14 @@ // check that the page index is valid #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) +// you can set USE_NOTEBOOK_ANTIFLICKER to 0 for desktop Windows versions too +// to disable code whih results in flicker-less notebook redrawing at the +// expense of some extra GDI resource consumption #ifdef __WXWINCE__ -#define USE_NOTEBOOK_ANTIFLICKER 0 + // notebooks are never resized under CE anyhow + #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 + #define USE_NOTEBOOK_ANTIFLICKER 1 #endif // ---------------------------------------------------------------------------- @@ -82,6 +84,17 @@ #define TCS_BOTTOM TCS_RIGHT #endif +// ---------------------------------------------------------------------------- +// global variables +// ---------------------------------------------------------------------------- + +#if USE_NOTEBOOK_ANTIFLICKER + +// the pointer to standard spin button wnd proc +static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL; + +#endif // USE_NOTEBOOK_ANTIFLICKER + // ---------------------------------------------------------------------------- // event table // ---------------------------------------------------------------------------- @@ -94,13 +107,14 @@ 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) + +#if USE_NOTEBOOK_ANTIFLICKER + EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground) + EVT_PAINT(wxNotebook::OnPaint) +#endif // USE_NOTEBOOK_ANTIFLICKER END_EVENT_TABLE() #if wxUSE_EXTENDED_RTTI @@ -185,25 +199,6 @@ 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 // ============================================================================ @@ -234,6 +229,10 @@ void wxNotebook::Init() #if wxUSE_UXTHEME m_hbrBackground = NULL; #endif // wxUSE_UXTHEME + +#if USE_NOTEBOOK_ANTIFLICKER + m_hasSubclassedUpdown = false; +#endif // USE_NOTEBOOK_ANTIFLICKER } // default for dynamic class @@ -498,12 +497,12 @@ wxRect wxNotebook::GetPageSize() const ::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) ) + // cause a crash on win2k or on XP with themes disabled if either + // wxNB_MULTILINE is used or tabs are placed on a side, if the rectangle + // is too small. + // + // The value of 20 is chosen arbitrarily but seems to work + if ( rc.right > 20 && rc.bottom > 20 ) { TabCtrl_AdjustRect(GetHwnd(), false, &rc); @@ -771,6 +770,57 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const return item; } +// ---------------------------------------------------------------------------- +// flicker-less notebook redraw +// ---------------------------------------------------------------------------- + +#if USE_NOTEBOOK_ANTIFLICKER + +// wnd proc for the spin button +LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + if ( message == WM_ERASEBKGND ) + return 0; + + return ::CallWindowProc(CASTWNDPROC gs_wndprocNotebookSpinBtn, + hwnd, message, wParam, lParam); +} + + +void wxNotebook::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) +{ + // do nothing here +} + +void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event)) +{ + wxPaintDC dc(this); + wxMemoryDC memdc; + RECT rc; + ::GetClientRect(GetHwnd(), &rc); + wxBitmap bmp(rc.right, rc.bottom); + memdc.SelectObject(bmp); + + // if there is no special brush just use the solid background colour + HBRUSH hbr = (HBRUSH)m_hbrBackground; + 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 // USE_NOTEBOOK_ANTIFLICKER // ---------------------------------------------------------------------------- // wxNotebook callbacks @@ -809,7 +859,7 @@ void wxNotebook::OnSize(wxSizeEvent& event) rect = wxRect(0, 0, 4, sz.y); RefreshRect(rect); } -#endif +#endif // !__WXWINCE__ // fit all the notebook pages to the tab control's display area @@ -872,6 +922,34 @@ void wxNotebook::OnSize(wxSizeEvent& event) false); } +#if USE_NOTEBOOK_ANTIFLICKER + // subclass the spin control used by the notebook to scroll pages to + // prevent it from flickering on resize + if ( !m_hasSubclassedUpdown ) + { + // 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 ( !gs_wndprocNotebookSpinBtn ) + gs_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child); + + wxSetWindowProc(child, wxNotebookSpinBtnWndProc); + m_hasSubclassedUpdown = true; + break; + } + } + } +#endif // USE_NOTEBOOK_ANTIFLICKER + event.Skip(); } @@ -889,18 +967,14 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) { wxNotebookPage *pPage = m_pages[sel]; pPage->Show(true); - pPage->SetFocus(); - - // If the newly focused window is not a child of the new page, - // SetFocus was not successful and the notebook itself should be - // focused - wxWindow *currentFocus = FindFocus(); - wxWindow *startFocus = currentFocus; - while ( currentFocus && currentFocus != pPage && currentFocus != this ) - currentFocus = currentFocus->GetParent(); - - if ( startFocus == pPage || currentFocus != pPage ) - SetFocus(); + + // As per bug report: + // http://sourceforge.net/tracker/index.php?func=detail&aid=1150659&group_id=9863&atid=109863, + // we should not set the page focus (and thereby the focus for + // a child window) since it erroneously selects radio button controls and also + // breaks keyboard handling for a notebook's scroll buttons. So + // we always focus the notebook and not the page. + SetFocus(); } else // no pages in the notebook, give the focus to itself @@ -1251,78 +1325,4 @@ 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