X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5174130757185b012241369e7377454b2423e51e..28997d375d3948d92f0846d1de3bf82df7ce59ae:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index ea3334de80..e08843e33b 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -22,7 +22,7 @@ #if wxUSE_NOTEBOOK -// wxWindows +// wxWidgets #ifndef WX_PRECOMP #include "wx/string.h" #endif // WX_PRECOMP @@ -73,7 +73,7 @@ // ---------------------------------------------------------------------------- // check that the page index is valid -#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount())) +#define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount()) // hide the ugly cast #define m_hwnd (HWND)GetHWND() @@ -111,52 +111,82 @@ BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_SIZE(wxNotebook::OnSize) - EVT_SET_FOCUS(wxNotebook::OnSetFocus) - EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() #if wxUSE_EXTENDED_RTTI +WX_DEFINE_FLAGS( wxNotebookStyle ) + +wxBEGIN_FLAGS( wxNotebookStyle ) + // new style border flags, we put them first to + // use them for streaming out + wxFLAGS_MEMBER(wxBORDER_SIMPLE) + wxFLAGS_MEMBER(wxBORDER_SUNKEN) + wxFLAGS_MEMBER(wxBORDER_DOUBLE) + wxFLAGS_MEMBER(wxBORDER_RAISED) + wxFLAGS_MEMBER(wxBORDER_STATIC) + wxFLAGS_MEMBER(wxBORDER_NONE) + + // old style border flags + wxFLAGS_MEMBER(wxSIMPLE_BORDER) + wxFLAGS_MEMBER(wxSUNKEN_BORDER) + wxFLAGS_MEMBER(wxDOUBLE_BORDER) + wxFLAGS_MEMBER(wxRAISED_BORDER) + wxFLAGS_MEMBER(wxSTATIC_BORDER) + wxFLAGS_MEMBER(wxBORDER) + + // standard window styles + wxFLAGS_MEMBER(wxTAB_TRAVERSAL) + wxFLAGS_MEMBER(wxCLIP_CHILDREN) + wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) + wxFLAGS_MEMBER(wxWANTS_CHARS) + wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) + wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) + wxFLAGS_MEMBER(wxVSCROLL) + wxFLAGS_MEMBER(wxHSCROLL) + + wxFLAGS_MEMBER(wxNB_FIXEDWIDTH) + wxFLAGS_MEMBER(wxNB_LEFT) + wxFLAGS_MEMBER(wxNB_RIGHT) + wxFLAGS_MEMBER(wxNB_BOTTOM) + +wxEND_FLAGS( wxNotebookStyle ) IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl,"wx/notebook.h") IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" ) -template<> const wxTypeInfo* wxGetTypeInfo( wxNotebookPageInfoList * ) +wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo * , wxNotebookPageInfoList ) ; + +template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value) { - static wxCollectionTypeInfo s_typeInfo( (wxTypeInfo*) wxGetTypeInfo( (wxNotebookPageInfo **) NULL) ) ; - return &s_typeInfo ; + wxListCollectionToVariantArray( theList , value ) ; } -WX_BEGIN_PROPERTIES_TABLE(wxNotebook) - WX_PROPERTY_COLLECTION( PageInfos , wxNotebookPageInfoList , wxNotebookPageInfo* , AddPageInfo , GetPageInfos ) -/* - notebookpage - object - object_ref - label - selected - style - usenotebooksizer -*/ -WX_END_PROPERTIES_TABLE() +wxBEGIN_PROPERTIES_TABLE(wxNotebook) + wxEVENT_PROPERTY( PageChanging , wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING , wxNotebookEvent ) + 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 , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style +wxEND_PROPERTIES_TABLE() -WX_BEGIN_HANDLERS_TABLE(wxNotebook) -WX_END_HANDLERS_TABLE() +wxBEGIN_HANDLERS_TABLE(wxNotebook) +wxEND_HANDLERS_TABLE() -WX_CONSTRUCTOR_4( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) +wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) -WX_BEGIN_PROPERTIES_TABLE(wxNotebookPageInfo) - WX_READONLY_PROPERTY( Page , wxNotebookPage* , GetPage , ) - WX_READONLY_PROPERTY( Text , wxString , GetText , wxEmptyString ) - WX_READONLY_PROPERTY( Selected , bool , GetSelected , false ) - WX_READONLY_PROPERTY( ImageId , int , GetImageId , -1 ) -WX_END_PROPERTIES_TABLE() +wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo) + 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")) +wxEND_PROPERTIES_TABLE() -WX_BEGIN_HANDLERS_TABLE(wxNotebookPageInfo) -WX_END_HANDLERS_TABLE() +wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo) +wxEND_HANDLERS_TABLE() -WX_CONSTRUCTOR_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) @@ -176,10 +206,10 @@ const wxNotebookPageInfoList& wxNotebook::GetPageInfos() const { wxNotebookPageInfoList* list = const_cast< wxNotebookPageInfoList* >( &m_pageInfos ) ; WX_CLEAR_LIST( wxNotebookPageInfoList , *list ) ; - for( int i = 0 ; i < GetPageCount() ; ++i ) + for( size_t i = 0 ; i < GetPageCount() ; ++i ) { wxNotebookPageInfo *info = new wxNotebookPageInfo() ; - info->Create( const_cast(this)->GetPage(i) , GetPageText(i) , GetSelection() == i , GetPageImage(i) ) ; + info->Create( const_cast(this)->GetPage(i) , GetPageText(i) , GetSelection() == int(i) , GetPageImage(i) ) ; list->Append( info ) ; } return m_pageInfos ; @@ -225,24 +255,24 @@ bool wxNotebook::Create(wxWindow *parent, { if (style & wxNB_BOTTOM) style &= ~wxNB_BOTTOM; - + if (style & wxNB_LEFT) style &= ~wxNB_LEFT; - + if (style & wxNB_RIGHT) style &= ~wxNB_RIGHT; } - + if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL, wxDefaultValidator, name) ) - return FALSE; + return false; if ( !MSWCreateControl(WC_TABCONTROL, wxEmptyString, pos, size) ) - return FALSE; + return false; SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE))); - return TRUE; + return true; } WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const @@ -278,7 +308,7 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const // wxNotebook accessors // ---------------------------------------------------------------------------- -int wxNotebook::GetPageCount() const +size_t wxNotebook::GetPageCount() const { // consistency check wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) ); @@ -291,11 +321,11 @@ int wxNotebook::GetRowCount() const return TabCtrl_GetRowCount(m_hwnd); } -int wxNotebook::SetSelection(int nPage) +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 ( nPage != m_nSelection ) + if ( int(nPage) != m_nSelection ) { wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId); event.SetSelection(nPage); @@ -314,9 +344,9 @@ int wxNotebook::SetSelection(int nPage) return m_nSelection; } -bool wxNotebook::SetPageText(int nPage, const wxString& strText) +bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("notebook page out of range") ); TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; @@ -325,7 +355,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText) return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0; } -wxString wxNotebook::GetPageText(int nPage) const +wxString wxNotebook::GetPageText(size_t nPage) const { wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") ); @@ -342,7 +372,7 @@ wxString wxNotebook::GetPageText(int nPage) const return str; } -int wxNotebook::GetPageImage(int nPage) const +int wxNotebook::GetPageImage(size_t nPage) const { wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") ); @@ -352,9 +382,9 @@ int wxNotebook::GetPageImage(int nPage) const return TabCtrl_GetItem(m_hwnd, nPage, &tcItem) ? tcItem.iImage : -1; } -bool wxNotebook::SetPageImage(int nPage, int nImage) +bool wxNotebook::SetPageImage(size_t nPage, int nImage) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("notebook page out of range") ); TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; @@ -386,7 +416,7 @@ void wxNotebook::SetPageSize(const wxSize& size) rc.right = size.x; rc.bottom = size.y; - TabCtrl_AdjustRect(GetHwnd(), TRUE, &rc); + TabCtrl_AdjustRect(GetHwnd(), true, &rc); // and now set it SetSize(rc.right - rc.left, rc.bottom - rc.top); @@ -407,8 +437,8 @@ 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. + + // We need to make getting tab size part of the wxWidgets API. wxSize tabSize(0, 0); if (GetPageCount() > 0) { @@ -441,9 +471,18 @@ void wxNotebook::AdjustPageSize(wxNotebookPage *page) // 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); + // 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) + { + TabCtrl_AdjustRect(m_hwnd, false, &rc); + page->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); + } } // ---------------------------------------------------------------------------- @@ -451,7 +490,7 @@ void wxNotebook::AdjustPageSize(wxNotebookPage *page) // ---------------------------------------------------------------------------- // remove one page from the notebook, without deleting -wxNotebookPage *wxNotebook::DoRemovePage(int nPage) +wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) { wxNotebookPage *pageRemoved = wxNotebookBase::DoRemovePage(nPage); if ( !pageRemoved ) @@ -466,37 +505,35 @@ wxNotebookPage *wxNotebook::DoRemovePage(int nPage) } else // notebook still not empty { - // change the selected page if it was deleted or became invalid - int selNew; - if ( m_nSelection == GetPageCount() ) + int selNew = TabCtrl_GetCurSel(m_hwnd); + if (selNew != -1) { - // last page deleted, make the new last page the new selection - selNew = m_nSelection - 1; + // No selection change, just refresh the current selection. + // 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(); } - else if ( nPage <= m_nSelection ) + else if (int(nPage) == m_nSelection) { - // we must show another page, even if it has the same index - selNew = m_nSelection; - } - else // nothing changes for the currently selected page - { - selNew = -1; - - // we still must refresh the current page: this needs to be done - // for some unknown reason if the tab control shows the up-down - // control (i.e. when there are too many pages) -- otherwise after - // deleting a page nothing at all is shown - if (m_nSelection >= 0) - m_pages[m_nSelection]->Refresh(); - } + // The selection was deleted. + + // Determine new selection. + if (m_nSelection == int(GetPageCount())) + selNew = m_nSelection - 1; + else + selNew = m_nSelection; - if ( selNew != -1 ) - { // m_nSelection must be always valid so reset it before calling // SetSelection() m_nSelection = -1; SetSelection(selNew); } + else + { + wxFAIL; // Windows did not behave ok. + } } return pageRemoved; @@ -505,8 +542,8 @@ wxNotebookPage *wxNotebook::DoRemovePage(int nPage) // remove all pages bool wxNotebook::DeleteAllPages() { - int nPageCount = GetPageCount(); - int nPage; + size_t nPageCount = GetPageCount(); + size_t nPage; for ( nPage = 0; nPage < nPageCount; nPage++ ) delete m_pages[nPage]; @@ -516,34 +553,35 @@ bool wxNotebook::DeleteAllPages() m_nSelection = -1; - return TRUE; + InvalidateBestSize(); + return true; } // same as AddPage() but does it at given position -bool wxNotebook::InsertPage(int nPage, +bool wxNotebook::InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect, int imageId) { - wxCHECK_MSG( pPage != NULL, FALSE, _T("NULL page in wxNotebook::InsertPage") ); - wxCHECK_MSG( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE, + wxCHECK_MSG( pPage != NULL, false, _T("NULL page in wxNotebook::InsertPage") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false, _T("invalid index in wxNotebook::InsertPage") ); 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; + static bool g_TestedForTheme = false; + static bool g_UseTheme = false; if (!g_TestedForTheme) { int commCtrlVersion = wxTheApp->GetComCtl32Version() ; - + g_UseTheme = (commCtrlVersion >= 600); - g_TestedForTheme = TRUE; + 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 @@ -575,6 +613,16 @@ bool wxNotebook::InsertPage(int nPage, 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! @@ -585,36 +633,27 @@ bool wxNotebook::InsertPage(int nPage, { wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str()); - return FALSE; + return false; } // succeeded: save the pointer to the page m_pages.Insert(pPage, nPage); - // for the first page (only) we need to adjust the size again because the - // notebook size changed: the tabs which hadn't been there before are now - // shown - if ( m_pages.GetCount() == 1 ) + // we may need to adjust the size again if the notebook size changed: + // normally this only happens for the first page we add (the tabs which + // hadn't been there before are now shown) but for a multiline notebook it + // can happen for any page at all as a new row could have been started + if ( m_pages.GetCount() == 1 || HasFlag(wxNB_MULTILINE) ) { 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 // --------------------------- // if the inserted page is before the selected one, we must update the // index of the selected page - if ( nPage <= m_nSelection ) + if ( int(nPage) <= m_nSelection ) { // one extra page added m_nSelection++; @@ -631,7 +670,8 @@ bool wxNotebook::InsertPage(int nPage, if ( selNew != -1 ) SetSelection(selNew); - return TRUE; + InvalidateBestSize(); + return true; } int wxNotebook::HitTest(const wxPoint& pt, long *flags) const @@ -670,7 +710,30 @@ void wxNotebook::OnSize(wxSizeEvent& event) rc.left = rc.top = 0; GetSize((int *)&rc.right, (int *)&rc.bottom); - TabCtrl_AdjustRect(m_hwnd, FALSE, &rc); + // 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; + } + } + + TabCtrl_AdjustRect(m_hwnd, false, &rc); int width = rc.right - rc.left, height = rc.bottom - rc.top; @@ -690,14 +753,30 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) { int sel = event.GetOldSelection(); if ( sel != -1 ) - m_pages[sel]->Show(FALSE); + m_pages[sel]->Show(false); sel = event.GetSelection(); if ( sel != -1 ) { wxNotebookPage *pPage = m_pages[sel]; - pPage->Show(TRUE); + 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(); + + } + else // no pages in the notebook, give the focus to itself + { + SetFocus(); } m_nSelection = sel; @@ -707,18 +786,23 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) event.Skip(); } -void wxNotebook::OnSetFocus(wxFocusEvent& event) +bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg) { - // this function is only called when the focus is explicitly set (i.e. from - // the program) to the notebook - in this case we don't need the - // complicated OnNavigationKey() logic because the programmer knows better - // what [s]he wants - - // set focus to the currently selected page if any - if ( m_nSelection != -1 ) - m_pages[m_nSelection]->SetFocus(); + const MSG * const msg = (MSG *)wxmsg; + + // intercept TAB, CTRL+TAB and CTRL+SHIFT+TAB for processing by wxNotebook. + // TAB will be passed to the currently selected page, CTRL+TAB and + // CTRL+SHIFT+TAB will be processed by the notebook itself. do not + // 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 && + (wxIsCtrlDown() || !wxIsShiftDown()) ) + { + return MSWProcessMessage(wxmsg); + } - event.Skip(); + return false; } void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) @@ -728,7 +812,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) AdvanceSelection(event.GetDirection()); } else { - // we get this event in 2 cases + // we get this event in 3 cases // // a) one of our pages might have generated it because the user TABbed // out from it in which case we should propagate the event upwards and @@ -741,12 +825,22 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // OnSetFocus() because we don't know which direction the focus came // from in this case and so can't choose between setting the focus to // first or last panel child - wxWindow *parent = GetParent(); - // the cast is here to fic a GCC ICE - if ( ((wxWindow*)event.GetEventObject()) == parent ) + // + // or + // + // c) we ourselves (see MSWTranslateMessage) generated the event + // + wxWindow * const parent = GetParent(); + + const bool isFromParent = event.GetEventObject() == parent; + const bool isFromSelf = event.GetEventObject() == this; + + if ( isFromParent || isFromSelf ) { - // no, it doesn't come from child, case (b): forward to a page - if ( m_nSelection != -1 ) + // no, it doesn't come from child, case (b) or (c): forward to a + // page but only if direction is backwards (TAB) or from ourselves, + if ( m_nSelection != -1 && + (!event.GetDirection() || isFromSelf) ) { // so that the page knows that the event comes from it's parent // and is being propagated downwards @@ -759,16 +853,23 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) } //else: page manages focus inside it itself } - else + else // otherwise set the focus to the notebook itself { - // we have no pages - still have to give focus to _something_ SetFocus(); } } else { - // it comes from our child, case (a), pass to the parent - if ( parent ) { + // it comes from our child, case (a), pass to the parent, but only + // if the direction is forwards. Otherwise set the focus to the + // notebook itself. The notebook is always the 'first' control of a + // page. + if ( !event.GetDirection() ) + { + SetFocus(); + } + else if ( parent ) + { event.SetCurrentFocus(this); parent->GetEventHandler()->ProcessEvent(event); } @@ -787,12 +888,12 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse)) { // don't set the sizes of the pages - their correct size is not yet known - wxControl::SetConstraintSizes(FALSE); + wxControl::SetConstraintSizes(false); } bool wxNotebook::DoPhase(int WXUNUSED(nPhase)) { - return TRUE; + return true; } #endif // wxUSE_CONSTRAINTS @@ -807,7 +908,7 @@ bool wxNotebook::MSWOnScroll(int orientation, WXWORD nSBCode, // don't generate EVT_SCROLLWIN events for the WM_SCROLLs coming from the // up-down control if ( control ) - return FALSE; + return false; return wxNotebookBase::MSWOnScroll(orientation, nSBCode, pos, control); } @@ -852,15 +953,32 @@ wxColour wxNotebook::GetThemeBackgroundColour() // This is total guesswork. // See PlatformSDK\Include\Tmschema.h for values COLORREF themeColor; - wxUxThemeEngine::Get()->GetThemeColor - ( + wxUxThemeEngine::Get()->GetThemeColor( hTheme, 10 /* TABP_BODY */, 1 /* NORMAL */, - 3821, /* FILLCOLORHINT */ - & themeColor - ); - + 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); + } + wxColour colour(GetRValue(themeColor), GetGValue(themeColor), GetBValue(themeColor)); return colour; } @@ -878,27 +996,8 @@ void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&) #endif { #if wxUSE_UXTHEME - // 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); - else if (window->IsKindOf(CLASSINFO(wxStaticText)) || - window->IsKindOf(CLASSINFO(wxStaticBox)) || - window->IsKindOf(CLASSINFO(wxStaticLine)) || - window->IsKindOf(CLASSINFO(wxRadioButton)) || - window->IsKindOf(CLASSINFO(wxRadioBox)) || - window->IsKindOf(CLASSINFO(wxCheckBox)) || - window->IsKindOf(CLASSINFO(wxBitmapButton)) || - window->IsKindOf(CLASSINFO(wxSlider)) || - window->IsKindOf(CLASSINFO(wxPanel)) || - (window->IsKindOf(CLASSINFO(wxNotebook)) && (window != this)) || - window->IsKindOf(CLASSINFO(wxScrolledWindow)) - ) - { - window->SetBackgroundColour(colour); - } + + window->ApplyParentThemeBackground(colour); for ( wxWindowList::compatibility_iterator node = window->GetChildren().GetFirst(); node; node = node->GetNext() ) { @@ -908,10 +1007,11 @@ void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&) #endif } -long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +#if wxUSE_UXTHEME +WXLRESULT wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { - static bool g_TestedForTheme = FALSE; - static bool g_UseTheme = FALSE; + static bool g_TestedForTheme = false; + static bool g_supportsThemes = false; switch ( nMsg ) { case WM_ERASEBKGND: @@ -920,19 +1020,25 @@ long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { int commCtrlVersion = wxTheApp->GetComCtl32Version() ; - g_UseTheme = (commCtrlVersion >= 600); - g_TestedForTheme = TRUE; + g_supportsThemes = (commCtrlVersion >= 600); + g_TestedForTheme = true; } - // If using XP themes, it seems we can get away + // If currently an XP theme is active, it seems we can get away // with not drawing a background, which reduces flicker. - if (g_UseTheme) - return TRUE; + 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