X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/014ee083ecd8838a40bb9a5214371375e55b733e..dd9ea234f2e8802e182194bfe375079d1bdd1ccf:/src/msw/notebook.cpp?ds=sidebyside diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 4b02f0bc09..1d8d450104 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/notebook.cpp +// Name: src/msw/notebook.cpp // Purpose: implementation of wxNotebook // Author: Vadim Zeitlin // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "notebook.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -93,6 +89,14 @@ // the pointer to standard spin button wnd proc static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL; +// the pointer to standard tab control wnd proc +static WXFARPROC gs_wndprocNotebook = (WXFARPROC)NULL; + +LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam); + #endif // USE_NOTEBOOK_ANTIFLICKER // ---------------------------------------------------------------------------- @@ -101,7 +105,7 @@ static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL; #include -WX_DEFINE_LIST( wxNotebookPageInfoList ) ; +WX_DEFINE_LIST( wxNotebookPageInfoList ) DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) @@ -149,9 +153,11 @@ wxBEGIN_FLAGS( wxNotebookStyle ) wxFLAGS_MEMBER(wxHSCROLL) wxFLAGS_MEMBER(wxNB_FIXEDWIDTH) - wxFLAGS_MEMBER(wxNB_LEFT) - wxFLAGS_MEMBER(wxNB_RIGHT) - wxFLAGS_MEMBER(wxNB_BOTTOM) + wxFLAGS_MEMBER(wxBK_DEFAULT) + wxFLAGS_MEMBER(wxBK_TOP) + wxFLAGS_MEMBER(wxBK_LEFT) + wxFLAGS_MEMBER(wxBK_RIGHT) + wxFLAGS_MEMBER(wxBK_BOTTOM) wxFLAGS_MEMBER(wxNB_NOPAGETHEME) wxFLAGS_MEMBER(wxNB_FLAT) @@ -229,6 +235,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 @@ -275,12 +285,13 @@ bool wxNotebook::Create(wxWindow *parent, if ( wxUxThemeEngine::GetIfActive() ) #endif { - style &= ~(wxNB_BOTTOM | wxNB_LEFT | wxNB_RIGHT); + style &= ~(wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT); } } LPCTSTR className = WC_TABCONTROL; +#if USE_NOTEBOOK_ANTIFLICKER // SysTabCtl32 class has natively CS_HREDRAW and CS_VREDRAW enabled and it // causes horrible flicker when resizing notebook, so get rid of it by // using a class without these styles (but otherwise identical to it) @@ -292,11 +303,14 @@ bool wxNotebook::Create(wxWindow *parent, // get a copy of standard class and modify it WNDCLASS wc; - if ( ::GetClassInfo(::GetModuleHandle(NULL), WC_TABCONTROL, &wc) ) + if ( ::GetClassInfo(NULL, WC_TABCONTROL, &wc) ) { + gs_wndprocNotebook = + wx_reinterpret_cast(WXFARPROC, wc.lpfnWndProc); wc.lpszClassName = wxT("_wx_SysTabCtl32"); wc.style &= ~(CS_HREDRAW | CS_VREDRAW); - + wc.hInstance = wxGetInstance(); + wc.lpfnWndProc = wxNotebookWndProc; s_clsNotebook.Register(wc); } else @@ -314,6 +328,7 @@ bool wxNotebook::Create(wxWindow *parent, className = s_clsNotebook.GetName().c_str(); } } +#endif // USE_NOTEBOOK_ANTIFLICKER if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL, wxDefaultValidator, name) ) @@ -328,6 +343,11 @@ bool wxNotebook::Create(wxWindow *parent, { SetBackgroundColour(GetThemeBackgroundColour()); } + else // use themed background by default + { + // create backing store + UpdateBgBrush(); + } #endif // wxUSE_UXTHEME // Undocumented hack to get flat notebook style @@ -356,11 +376,11 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const if ( style & wxNB_FIXEDWIDTH ) tabStyle |= TCS_FIXEDWIDTH; - if ( style & wxNB_BOTTOM ) + if ( style & wxBK_BOTTOM ) tabStyle |= TCS_RIGHT; - else if ( style & wxNB_LEFT ) + else if ( style & wxBK_LEFT ) tabStyle |= TCS_VERTICAL; - else if ( style & wxNB_RIGHT ) + else if ( style & wxBK_RIGHT ) tabStyle |= TCS_VERTICAL | TCS_RIGHT; // ex style @@ -493,12 +513,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); @@ -548,7 +568,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const tabSize.x = rect.right - rect.left; tabSize.y = rect.bottom - rect.top; } - if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) ) + if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) ) { sizeTotal.x += tabSize.x + 7; sizeTotal.y += 7; @@ -785,6 +805,14 @@ LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd, hwnd, message, wParam, lParam); } +LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + return ::CallWindowProc(CASTWNDPROC gs_wndprocNotebook, + hwnd, message, wParam, lParam); +} void wxNotebook::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { @@ -802,8 +830,12 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event)) // if there is no special brush just use the solid background colour HBRUSH hbr = (HBRUSH)m_hbrBackground; + wxBrush brush; if ( !hbr ) - hbr = GetHbrushOf(wxBrush(GetBackgroundColour())); + { + brush = wxBrush(GetBackgroundColour()); + hbr = GetHbrushOf(brush); + } ::FillRect(GetHdcOf(memdc), &rc, hbr); @@ -910,14 +942,14 @@ void wxNotebook::OnSize(wxSizeEvent& event) RefreshRect(wxRect(0, rc.top, rc.left, height), false); RefreshRect(wxRect(0, rc.bottom, widthNbook, heightNbook - rc.bottom), false); - RefreshRect(wxRect(rc.right, rc.top, widthNbook - rc.bottom, height), + RefreshRect(wxRect(rc.right, rc.top, widthNbook - rc.right, height), false); } #if USE_NOTEBOOK_ANTIFLICKER // subclass the spin control used by the notebook to scroll pages to // prevent it from flickering on resize - if ( !gs_wndprocNotebookSpinBtn ) + if ( !m_hasSubclassedUpdown ) { // iterate over all child windows to find spin button for ( HWND child = ::GetWindow(GetHwnd(), GW_CHILD); @@ -931,9 +963,11 @@ void wxNotebook::OnSize(wxSizeEvent& event) if ( !childWindow ) { // subclass the spin button to override WM_ERASEBKGND - gs_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child); + if ( !gs_wndprocNotebookSpinBtn ) + gs_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child); wxSetWindowProc(child, wxNotebookSpinBtnWndProc); + m_hasSubclassedUpdown = true; break; } } @@ -957,24 +991,17 @@ 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(); + // Changing the page should give the focus to it but, as per bug report + // http://sf.net/tracker/index.php?func=detail&aid=1150659&group_id=9863&atid=109863, + // we should not set the focus to it directly since it erroneously + // selects radio buttons and breaks keyboard handling for a notebook's + // scroll buttons. So give focus to the notebook and not the page. - } - else // no pages in the notebook, give the focus to itself - { - SetFocus(); - } + // but don't do this is the notebook is hidden + if ( ::IsWindowVisible(GetHwnd()) ) + SetFocus(); m_nSelection = sel; } @@ -1096,17 +1123,17 @@ bool wxNotebook::DoDrawBackground(WXHDC hDC, wxWindow *child) if ( child ) ::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2); - - // 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; - - + // we have the content area (page size), but we need to draw all of the + // background for it to be aligned correctly + wxUxThemeEngine::Get()->GetThemeBackgroundExtent + ( + theme, + (HDC) hDC, + 9 /* TABP_PANE */, + 0, + &rc, + &rc + ); wxUxThemeEngine::Get()->DrawThemeBackground ( theme,