X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd507486e07b742bb7acb118811efd60ee027859..11bfe4bfdc79b0374a0f287dac80efa262b365a7:/src/msw/notebook.cpp?ds=inline diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index e04027b7da..4b02f0bc09 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -22,9 +22,10 @@ #if wxUSE_NOTEBOOK -// wxWindows +// wxWidgets #ifndef WX_PRECOMP #include "wx/string.h" + #include "wx/dc.h" #endif // WX_PRECOMP #include "wx/log.h" @@ -33,39 +34,20 @@ #include "wx/control.h" #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" -// Windows standard headers -#ifndef __WIN95__ - #error "wxNotebook is only supported Windows 95 and above" -#endif //Win95 +#include -#include // for SetWindowFont - -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +#include #include "wx/msw/winundef.h" #if wxUSE_UXTHEME -#include "wx/msw/uxtheme.h" - -#include "wx/radiobut.h" -#include "wx/radiobox.h" -#include "wx/checkbox.h" -#include "wx/bmpbuttn.h" -#include "wx/statline.h" -#include "wx/statbox.h" -#include "wx/stattext.h" -#include "wx/slider.h" -#include "wx/scrolwin.h" -#include "wx/panel.h" + #include "wx/msw/uxtheme.h" #endif // ---------------------------------------------------------------------------- @@ -75,8 +57,15 @@ // check that the page index is valid #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) -// hide the ugly cast -#define m_hwnd (HWND)GetHWND() +// 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__ + // notebooks are never resized under CE anyhow + #define USE_NOTEBOOK_ANTIFLICKER 0 +#else + #define USE_NOTEBOOK_ANTIFLICKER 1 +#endif // ---------------------------------------------------------------------------- // constants @@ -95,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 // ---------------------------------------------------------------------------- @@ -108,10 +108,13 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) BEGIN_EVENT_TABLE(wxNotebook, wxControl) 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 @@ -126,7 +129,7 @@ wxBEGIN_FLAGS( wxNotebookStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -149,6 +152,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 ) @@ -167,17 +172,17 @@ wxBEGIN_PROPERTIES_TABLE(wxNotebook) wxEVENT_PROPERTY( PageChanged , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED , wxNotebookEvent ) wxPROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) - wxPROPERTY_FLAGS( WindowStyle , wxNotebookStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style + wxPROPERTY_FLAGS( WindowStyle , wxNotebookStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxNotebook) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) +wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo) - wxREADONLY_PROPERTY( Page , wxNotebookPage* , GetPage , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) + wxREADONLY_PROPERTY( Page , wxNotebookPage* , GetPage , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) wxREADONLY_PROPERTY( Text , wxString , GetText , wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) wxREADONLY_PROPERTY( Selected , bool , GetSelected , false, 0 /*flags*/ , wxT("Helpstring") , wxT("group") ) wxREADONLY_PROPERTY( ImageId , int , GetImageId , -1 , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) @@ -186,7 +191,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) +wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) #else IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) @@ -220,6 +225,10 @@ void wxNotebook::Init() { m_imageList = NULL; m_nSelection = -1; + +#if wxUSE_UXTHEME + m_hbrBackground = NULL; +#endif // wxUSE_UXTHEME } // default for dynamic class @@ -249,29 +258,90 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { - // Does ComCtl32 support non-top tabs? - int verComCtl32 = wxApp::GetComCtl32Version(); - if ( verComCtl32 < 470 || verComCtl32 >= 600 ) +#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(); + if ( verComCtl32 == 600 ) { - if (style & wxNB_BOTTOM) - style &= ~wxNB_BOTTOM; - - if (style & wxNB_LEFT) - style &= ~wxNB_LEFT; - - if (style & wxNB_RIGHT) - style &= ~wxNB_RIGHT; + // check if we use themes at all -- if we don't, we're still ok +#if wxUSE_UXTHEME + if ( wxUxThemeEngine::GetIfActive() ) +#endif + { + style &= ~(wxNB_BOTTOM | wxNB_LEFT | wxNB_RIGHT); + } } - + + LPCTSTR className = WC_TABCONTROL; + + // 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) + if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) ) + { + static ClassRegistrar s_clsNotebook; + if ( !s_clsNotebook.IsInitialized() ) + { + // get a copy of standard class and modify it + WNDCLASS wc; + + if ( ::GetClassInfo(::GetModuleHandle(NULL), WC_TABCONTROL, &wc) ) + { + wc.lpszClassName = wxT("_wx_SysTabCtl32"); + wc.style &= ~(CS_HREDRAW | CS_VREDRAW); + + s_clsNotebook.Register(wc); + } + else + { + wxLogLastError(_T("GetClassInfoEx(SysTabCtl32)")); + } + } + + // use our custom class if available but fall back to the standard + // notebook if we failed to register it + if ( s_clsNotebook.IsRegistered() ) + { + // it's ok to use c_str() here as the static s_clsNotebook object + // has sufficiently long lifetime + className = s_clsNotebook.GetName().c_str(); + } + } + if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL, wxDefaultValidator, name) ) return false; - if ( !MSWCreateControl(WC_TABCONTROL, wxEmptyString, pos, size) ) + if ( !MSWCreateControl(className, wxEmptyString, pos, size) ) return false; - SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE))); +#if wxUSE_UXTHEME + if ( HasFlag(wxNB_NOPAGETHEME) || + wxSystemOptions::IsFalse(wxT("msw.notebook.themed-background")) ) + { + 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(GetHwnd(), CCM_SETVERSION, COMCTL32_VERSION, 0); + if (!m_hasBgCol) + SetBackgroundColour(*wxWHITE); + } +#endif return true; } @@ -304,6 +374,14 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const return tabStyle; } +wxNotebook::~wxNotebook() +{ +#if wxUSE_UXTHEME + if ( m_hbrBackground ) + ::DeleteObject((HBRUSH)m_hbrBackground); +#endif // wxUSE_UXTHEME +} + // ---------------------------------------------------------------------------- // wxNotebook accessors // ---------------------------------------------------------------------------- @@ -311,19 +389,19 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const size_t wxNotebook::GetPageCount() const { // consistency check - wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) ); + wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(GetHwnd()) ); return m_pages.Count(); } int wxNotebook::GetRowCount() const { - return TabCtrl_GetRowCount(m_hwnd); + return TabCtrl_GetRowCount(GetHwnd()); } int wxNotebook::SetSelection(size_t nPage) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); if ( int(nPage) != m_nSelection ) { @@ -337,7 +415,7 @@ int wxNotebook::SetSelection(size_t nPage) event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); (void)GetEventHandler()->ProcessEvent(event); - TabCtrl_SetCurSel(m_hwnd, nPage); + TabCtrl_SetCurSel(GetHwnd(), nPage); } } @@ -352,7 +430,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) tcItem.mask = TCIF_TEXT; tcItem.pszText = (wxChar *)strText.c_str(); - return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0; + return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; } wxString wxNotebook::GetPageText(size_t nPage) const @@ -366,7 +444,7 @@ wxString wxNotebook::GetPageText(size_t nPage) const tcItem.cchTextMax = WXSIZEOF(buf); wxString str; - if ( TabCtrl_GetItem(m_hwnd, nPage, &tcItem) ) + if ( TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ) str = tcItem.pszText; return str; @@ -379,7 +457,7 @@ int wxNotebook::GetPageImage(size_t nPage) const TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; - return TabCtrl_GetItem(m_hwnd, nPage, &tcItem) ? tcItem.iImage : -1; + return TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ? tcItem.iImage : -1; } bool wxNotebook::SetPageImage(size_t nPage, int nImage) @@ -390,7 +468,7 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage) tcItem.mask = TCIF_IMAGE; tcItem.iImage = nImage; - return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0; + return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; } void wxNotebook::SetImageList(wxImageList* imageList) @@ -399,7 +477,7 @@ void wxNotebook::SetImageList(wxImageList* imageList) if ( imageList ) { - TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST()); + TabCtrl_SetImageList(GetHwnd(), (HIMAGELIST)imageList->GetHIMAGELIST()); } } @@ -407,6 +485,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(GetHwnd(), false, &rc); + + wxCopyRECTToRect(rc, r); + } + + return r; +} + void wxNotebook::SetPageSize(const wxSize& size) { // transform the page size into the notebook size @@ -437,9 +538,9 @@ void wxNotebook::SetTabSize(const wxSize& sz) wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { wxSize sizeTotal = sizePage; - - // We need to make getting tab size part of the wxWindows API. - wxSize tabSize(0, 0); + + // We need to make getting tab size part of the wxWidgets API. + wxSize tabSize; if (GetPageCount() > 0) { RECT rect; @@ -465,15 +566,11 @@ 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); - TabCtrl_AdjustRect(m_hwnd, false, &rc); - - page->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); + const wxRect r = GetPageSize(); + if ( !r.IsEmpty() ) + { + page->SetSize(r); + } } // ---------------------------------------------------------------------------- @@ -487,7 +584,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) if ( !pageRemoved ) return NULL; - TabCtrl_DeleteItem(m_hwnd, nPage); + TabCtrl_DeleteItem(GetHwnd(), nPage); if ( m_pages.IsEmpty() ) { @@ -496,12 +593,12 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) } else // notebook still not empty { - int selNew = TabCtrl_GetCurSel(m_hwnd); + int selNew = TabCtrl_GetCurSel(GetHwnd()); if (selNew != -1) { // No selection change, just refresh the current selection. - // Because it could be that the slection index changed - // we need to update it. + // Because it could be that the slection index changed + // we need to update it. // Note: this does not mean the selection it self changed. m_nSelection = selNew; m_pages[m_nSelection]->Refresh(); @@ -509,13 +606,13 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) else if (int(nPage) == m_nSelection) { // The selection was deleted. - + // Determine new selection. if (m_nSelection == int(GetPageCount())) selNew = m_nSelection - 1; else selNew = m_nSelection; - + // m_nSelection must be always valid so reset it before calling // SetSelection() m_nSelection = -1; @@ -540,10 +637,11 @@ bool wxNotebook::DeleteAllPages() m_pages.Clear(); - TabCtrl_DeleteAllItems(m_hwnd); + TabCtrl_DeleteAllItems(GetHwnd()); m_nSelection = -1; + InvalidateBestSize(); return true; } @@ -561,27 +659,6 @@ bool wxNotebook::InsertPage(size_t nPage, wxASSERT_MSG( pPage->GetParent() == this, _T("notebook pages must have notebook as parent") ); -#if wxUSE_UXTHEME && wxUSE_UXTHEME_AUTO - static bool g_TestedForTheme = false; - static bool g_UseTheme = false; - if (!g_TestedForTheme) - { - int commCtrlVersion = wxTheApp->GetComCtl32Version() ; - - g_UseTheme = (commCtrlVersion >= 600); - g_TestedForTheme = true; - } - - // Automatically apply the theme background, - // changing the colour of the panel to match the - // tab page colour. This won't work well with all - // themes but it's a start. - if (g_UseTheme && wxUxThemeEngine::Get() && pPage->IsKindOf(CLASSINFO(wxPanel))) - { - ApplyThemeBackground(pPage, GetThemeBackgroundColour()); - } -#endif - // add a new tab to the control // ---------------------------- @@ -597,19 +674,29 @@ bool wxNotebook::InsertPage(size_t nPage, } // and the text - if ( !strText.IsEmpty() ) + if ( !strText.empty() ) { tcItem.mask |= TCIF_TEXT; tcItem.pszText = (wxChar *)strText.c_str(); // const_cast } + // hide the page: unless it is selected, it shouldn't be shown (and if it + // is selected it will be shown later) + HWND hwnd = GetWinHwnd(pPage); + SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_VISIBLE); + + // this updates internal flag too -- otherwise it would get out of sync + // with the real state + pPage->Show(false); + + // fit the notebook page to the tab control's display area: this should be // done before adding it to the notebook or TabCtrl_InsertItem() will // change the notebooks size itself! AdjustPageSize(pPage); // finally do insert it - if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) + if ( TabCtrl_InsertItem(GetHwnd(), nPage, &tcItem) == -1 ) { wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str()); @@ -628,16 +715,6 @@ bool wxNotebook::InsertPage(size_t nPage, AdjustPageSize(pPage); } - // hide the page: unless it is selected, it shouldn't be shown (and if it - // is selected it will be shown later) - HWND hwnd = GetWinHwnd(pPage); - SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_VISIBLE); - - // this updates internal flag too -- otherwise it would get out of sync - // with the real state - pPage->Show(false); - - // now deal with the selection // --------------------------- @@ -660,6 +737,8 @@ bool wxNotebook::InsertPage(size_t nPage, if ( selNew != -1 ) SetSelection(selNew); + InvalidateBestSize(); + return true; } @@ -687,6 +766,53 @@ 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; + if ( !hbr ) + hbr = GetHbrushOf(wxBrush(GetBackgroundColour())); + + ::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 @@ -694,45 +820,127 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const void wxNotebook::OnSize(wxSizeEvent& event) { - // fit the notebook page to the tab control's display area - RECT rc; - rc.left = rc.top = 0; - GetSize((int *)&rc.right, (int *)&rc.bottom); - - // there seems to be a bug in the implementation of TabCtrl_AdjustRect(): it - // returns completely false values for multiline tab controls after the tabs - // are added but before getting the first WM_SIZE (off by ~50 pixels, see - // - // http://sf.net/tracker/index.php?func=detail&aid=645323&group_id=9863&atid=109863 - // - // and the only work around I could find was this ugly hack... without it - // simply toggling the "multiline" checkbox in the notebook sample resulted - // in a noticeable page displacement - if ( HasFlag(wxNB_MULTILINE) ) - { - // avoid an infinite recursion: we get another notification too! - static bool s_isInOnSize = false; + 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. - if ( !s_isInOnSize ) - { - s_isInOnSize = true; - SendMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, - MAKELPARAM(rc.right, rc.bottom)); - s_isInOnSize = false; - } - } + wxSize sz = GetClientSize(); - TabCtrl_AdjustRect(m_hwnd, false, &rc); + // Refresh right side + wxRect rect(sz.x-4, 0, 4, sz.y); + RefreshRect(rect); - int width = rc.right - rc.left, - height = rc.bottom - rc.top; - size_t nCount = m_pages.Count(); - for ( size_t nPage = 0; nPage < nCount; nPage++ ) { - wxNotebookPage *pPage = m_pages[nPage]; - pPage->SetSize(rc.left, rc.top, width, height); - } + // Refresh bottom side + rect = wxRect(0, sz.y-4, sz.x, 4); + RefreshRect(rect); - event.Skip(); + // Refresh left side + rect = wxRect(0, 0, 4, sz.y); + RefreshRect(rect); + } +#endif // !__WXWINCE__ + + // fit all the notebook pages to the tab control's display area + + RECT rc; + rc.left = rc.top = 0; + GetSize((int *)&rc.right, (int *)&rc.bottom); + + // save the total size, we'll use it below + int widthNbook = rc.right - rc.left, + heightNbook = rc.bottom - rc.top; + + // there seems to be a bug in the implementation of TabCtrl_AdjustRect(): it + // returns completely false values for multiline tab controls after the tabs + // are added but before getting the first WM_SIZE (off by ~50 pixels, see + // + // http://sf.net/tracker/index.php?func=detail&aid=645323&group_id=9863&atid=109863 + // + // and the only work around I could find was this ugly hack... without it + // simply toggling the "multiline" checkbox in the notebook sample resulted + // in a noticeable page displacement + if ( HasFlag(wxNB_MULTILINE) ) + { + // avoid an infinite recursion: we get another notification too! + static bool s_isInOnSize = false; + + if ( !s_isInOnSize ) + { + s_isInOnSize = true; + SendMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, + MAKELPARAM(rc.right, rc.bottom)); + s_isInOnSize = false; + } + } + +#if wxUSE_UXTHEME + // background bitmap size has changed, update the brush using it too + UpdateBgBrush(); +#endif // wxUSE_UXTHEME + + TabCtrl_AdjustRect(GetHwnd(), false, &rc); + + int width = rc.right - rc.left, + height = rc.bottom - rc.top; + size_t nCount = m_pages.Count(); + for ( size_t nPage = 0; nPage < nCount; nPage++ ) { + wxNotebookPage *pPage = m_pages[nPage]; + pPage->SetSize(rc.left, rc.top, width, height); + } + + + // unless we had already repainted everything, we now need to refresh + if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) ) + { + // invalidate areas not covered by pages + RefreshRect(wxRect(0, 0, widthNbook, rc.top), false); + 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), + 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 ) + { + // 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 + gs_wndprocNotebookSpinBtn = (WXFARPROC)wxGetWindowProc(child); + + wxSetWindowProc(child, wxNotebookSpinBtnWndProc); + break; + } + } + } +#endif // USE_NOTEBOOK_ANTIFLICKER + + event.Skip(); } void wxNotebook::OnSelChange(wxNotebookEvent& event) @@ -785,7 +993,7 @@ bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg) // intercept SHIFT+TAB. This goes to the parent of the notebook which will // process it. if ( msg->message == WM_KEYDOWN && msg->wParam == VK_TAB && - msg->hwnd == m_hwnd && + msg->hwnd == GetHwnd() && (wxIsCtrlDown() || !wxIsShiftDown()) ) { return MSWProcessMessage(wxmsg); @@ -821,8 +1029,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 ) { @@ -866,6 +1075,186 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) } } +#if wxUSE_UXTHEME + +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; + wxCopyRectToRECT(r, rc); + + // map rect to the coords of the window we're drawing in + 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; + + + wxUxThemeEngine::Get()->DrawThemeBackground + ( + theme, + (HDC) hDC, + 9 /* TABP_PANE */, + 0, + &rc, + NULL + ); + + 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); + + if ( !DoDrawBackground((WXHDC)(HDC)hDCMem) ) + return 0; + + return (WXHBRUSH)::CreatePatternBrush(hBmp); +} + +void wxNotebook::UpdateBgBrush() +{ + if ( m_hbrBackground ) + ::DeleteObject((HBRUSH)m_hbrBackground); + + if ( !m_hasBgCol && wxUxThemeEngine::GetIfActive() ) + { + m_hbrBackground = QueryBgBitmap(); + } + else // no themes or we've got user-defined solid colour + { + m_hbrBackground = NULL; + } +} + +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((HWND)hWnd, &rc); + + ::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1); + + if ( !::SetBrushOrgEx((HDC)hDC, -rc.left, -rc.top, NULL) ) + { + wxLogLastError(_T("SetBrushOrgEx(notebook bg brush)")); + } + + return m_hbrBackground; + } + + return wxNotebookBase::MSWGetBgBrushForChild(hDC, hWnd); +} + +bool wxNotebook::MSWPrintChild(WXHDC hDC, wxWindow *child) +{ + // solid background colour overrides themed background drawing + if ( !UseBgCol() && DoDrawBackground(hDC, child) ) + return true; + + // 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; + + RECT rc; + wxCopyRectToRECT(r, rc); + + // map rect to the coords of the window we're drawing in + if ( child ) + ::MapWindowPoints(GetHwnd(), GetHwndOf(child), (POINT *)&rc, 2); + + wxBrush brush(GetBackgroundColour()); + HBRUSH hbr = GetHbrushOf(brush); + + ::FillRect((HDC) hDC, &rc, hbr); + + return true; + } + + return wxNotebookBase::MSWPrintChild(hDC, child); +} + +#endif // wxUSE_UXTHEME + +// Windows only: attempts to get colour for UX theme page background +wxColour wxNotebook::GetThemeBackgroundColour() const +{ +#if wxUSE_UXTHEME + if (wxUxThemeEngine::Get()) + { + wxUxThemeHandle hTheme((wxNotebook*) this, L"TAB"); + if (hTheme) + { + // This is total guesswork. + // See PlatformSDK\Include\Tmschema.h for values + COLORREF themeColor; + wxUxThemeEngine::Get()->GetThemeColor( + hTheme, + 10 /* TABP_BODY */, + 1 /* NORMAL */, + 3821 /* FILLCOLORHINT */, + &themeColor); + + /* + [DS] Workaround for WindowBlinds: + Some themes return a near black theme color using FILLCOLORHINT, + this makes notebook pages have an ugly black background and makes + text (usually black) unreadable. Retry again with FILLCOLOR. + + This workaround potentially breaks appearance of some themes, + but in practice it already fixes some themes. + */ + if (themeColor == 1) + { + wxUxThemeEngine::Get()->GetThemeColor( + hTheme, + 10 /* TABP_BODY */, + 1 /* NORMAL */, + 3802 /* FILLCOLOR */, + &themeColor); + } + + return wxRGBToColour(themeColor); + } + } +#endif // wxUSE_UXTHEME + + return GetBackgroundColour(); +} + // ---------------------------------------------------------------------------- // wxNotebook base class virtuals // ---------------------------------------------------------------------------- @@ -920,7 +1309,7 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) return wxControl::MSWOnNotify(idCtrl, lParam, result); } - event.SetSelection(TabCtrl_GetCurSel(m_hwnd)); + event.SetSelection(TabCtrl_GetCurSel(GetHwnd())); event.SetOldSelection(m_nSelection); event.SetEventObject(this); event.SetInt(idCtrl); @@ -930,95 +1319,4 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) return processed; } -// Windows only: attempts to get colour for UX theme page background -wxColour wxNotebook::GetThemeBackgroundColour() -{ -#if wxUSE_UXTHEME - if (wxUxThemeEngine::Get()) - { - wxUxThemeHandle hTheme(this, L"TAB"); - if (hTheme) - { - // This is total guesswork. - // See PlatformSDK\Include\Tmschema.h for values - COLORREF themeColor; - wxUxThemeEngine::Get()->GetThemeColor( - hTheme, - 10 /* TABP_BODY */, - 1 /* NORMAL */, - 3802 /* color of bg fill */, - &themeColor); - - wxColour colour(GetRValue(themeColor), GetGValue(themeColor), GetBValue(themeColor)); - return colour; - } - } -#endif // wxUSE_UXTHEME - - return GetBackgroundColour(); -} - -// Windows only: attempts to apply the UX theme page background to this page -#if wxUSE_UXTHEME -void wxNotebook::ApplyThemeBackground(wxWindow* window, const wxColour& colour) -#else -void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&) -#endif -{ -#if wxUSE_UXTHEME - // Special case for wxButton: Don't set the background for buttons since - // this will switch it into ownerdraw mode - if (window->IsKindOf(CLASSINFO(wxButton)) && !window->IsKindOf(CLASSINFO(wxBitmapButton))) - // This is essential, otherwise you'll see dark grey - // corners in the buttons. - ((wxButton*)window)->wxControl::SetBackgroundColour(colour); - - // for all other classes let them decide - else if ((window != this) && window->CanApplyParentThemeBackground()) - { - window->SetBackgroundColour(colour); - } - - for ( wxWindowList::compatibility_iterator node = window->GetChildren().GetFirst(); node; node = node->GetNext() ) - { - wxWindow *child = node->GetData(); - ApplyThemeBackground(child, colour); - } -#endif -} - -#if wxUSE_UXTHEME -WXLRESULT wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) -{ - static bool g_TestedForTheme = false; - static bool g_supportsThemes = false; - switch ( nMsg ) - { - case WM_ERASEBKGND: - { - if (!g_TestedForTheme) - { - int commCtrlVersion = wxTheApp->GetComCtl32Version() ; - - g_supportsThemes = (commCtrlVersion >= 600); - g_TestedForTheme = true; - } - - // If currently an XP theme is active, it seems we can get away - // with not drawing a background, which reduces flicker. - if (g_supportsThemes) - { - wxUxThemeEngine *p = wxUxThemeEngine::Get(); - if (p && p->IsThemeActive() ) - { - return true; - } - } - } - } - - return wxControl::MSWWindowProc(nMsg, wParam, lParam); -} -#endif // #if wxUSE_UXTHEME - #endif // wxUSE_NOTEBOOK