X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d5b3bf0417ea60690c5c1eaf60422fe6d99ef81..7bdfb981a826d29e292738a27700543fa10d2bfb:/src/msw/notebook.cpp?ds=sidebyside diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 094a91b357..e70911eeeb 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -167,7 +167,7 @@ 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) @@ -177,7 +177,7 @@ wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , P 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")) @@ -496,37 +496,35 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) } else // notebook still not empty { - // change the selected page if it was deleted or became invalid - int selNew; - if ( m_nSelection == int(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 ( 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(); - } - - if ( selNew != -1 ) + 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; SetSelection(selNew); } + else + { + wxFAIL; // Windows did not behave ok. + } } return pageRemoved; @@ -621,10 +619,11 @@ bool wxNotebook::InsertPage(size_t nPage, // 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); } @@ -700,6 +699,29 @@ void wxNotebook::OnSize(wxSizeEvent& event) 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 ( !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, @@ -920,15 +942,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; } @@ -946,28 +985,9 @@ 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() ) { wxWindow *child = node->GetData(); @@ -976,10 +996,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_supportsThemes = false; switch ( nMsg ) { case WM_ERASEBKGND: @@ -988,19 +1009,25 @@ long wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { int commCtrlVersion = wxTheApp->GetComCtl32Version() ; - g_UseTheme = (commCtrlVersion >= 600); + 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