X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d6fcbcc7088e9c104b3dc5b4704a07f728d55ae..8d7490018a47f60149a35ced6f880ec834aba471:/src/msw/notebook.cpp?ds=sidebyside diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 1efd29f383..6c4342ed91 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -97,6 +97,20 @@ LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd, #endif // USE_NOTEBOOK_ANTIFLICKER +// ---------------------------------------------------------------------------- +// global functions +// ---------------------------------------------------------------------------- + +static bool HasTroubleWithNonTopTabs() +{ + const int verComCtl32 = wxApp::GetComCtl32Version(); + + // 600 is XP, 616 is Vista -- and both have a problem with tabs not on top + // (but don't just test for >= 600 as Microsoft might decide to fix it in + // later versions, who knows...) + return verComCtl32 >= 600 && verComCtl32 <= 616; +} + // ---------------------------------------------------------------------------- // event table // ---------------------------------------------------------------------------- @@ -228,7 +242,7 @@ const wxNotebookPageInfoList& wxNotebook::GetPageInfos() const void wxNotebook::Init() { m_imageList = NULL; - m_nSelection = -1; + m_nSelection = wxNOT_FOUND; #if wxUSE_UXTHEME m_hbrBackground = NULL; @@ -283,17 +297,21 @@ bool wxNotebook::Create(wxWindow *parent, #endif #if !wxUSE_UXTHEME - // ComCtl32 notebook tabs simply don't work unless they're on top if we have uxtheme, we can - // work around it later (after control creation), but if we don't have uxtheme, we have to clear - // those styles - const int verComCtl32 = wxApp::GetComCtl32Version(); - if ( verComCtl32 == 600 ) + // ComCtl32 notebook tabs simply don't work unless they're on top if we + // have uxtheme, we can work around it later (after control creation), but + // if we have been compiled without uxtheme support, we have to clear those + // styles + if ( HasTroubleWithNonTopTabs() ) { style &= ~(wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT); } #endif //wxUSE_UXTHEME +#if defined(__WINE__) && wxUSE_UNICODE + LPCTSTR className = L"SysTabControl32"; +#else LPCTSTR className = WC_TABCONTROL; +#endif #if USE_NOTEBOOK_ANTIFLICKER // SysTabCtl32 class has natively CS_HREDRAW and CS_VREDRAW enabled and it @@ -356,16 +374,16 @@ bool wxNotebook::Create(wxWindow *parent, // comctl32.dll 6.0 doesn't support non-top tabs with visual styles (the // control is simply not rendered correctly), so we disable themes // if possible, otherwise we simply clear the styles. - // It's probably not possible to have UXTHEME without ComCtl32 6 or better, but lets - // check it anyway. - const int verComCtl32 = wxApp::GetComCtl32Version(); - if ( verComCtl32 == 600 ) + if ( HasTroubleWithNonTopTabs() && + (style & (wxBK_BOTTOM | wxBK_LEFT | wxBK_RIGHT)) ) { // check if we use themes at all -- if we don't, we're still okay - if ( wxUxThemeEngine::GetIfActive() && (style & (wxBK_BOTTOM|wxBK_LEFT|wxBK_RIGHT))) + if ( wxUxThemeEngine::GetIfActive() ) { - wxUxThemeEngine::GetIfActive()->SetWindowTheme((HWND)this->GetHandle(), L"", L""); - SetBackgroundColour(GetThemeBackgroundColour()); //correct the background color for the new non-themed control + wxUxThemeEngine::GetIfActive()->SetWindowTheme(GetHwnd(), L"", L""); + + // correct the background color for the new non-themed control + SetBackgroundColour(GetThemeBackgroundColour()); } } #endif // wxUSE_UXTHEME @@ -443,33 +461,28 @@ int wxNotebook::SetSelection(size_t nPage) { wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); - if ( int(nPage) != m_nSelection ) + if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection ) { - wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId); - event.SetSelection(nPage); - event.SetOldSelection(m_nSelection); - event.SetEventObject(this); - if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() ) + if ( SendPageChangingEvent(nPage) ) { // program allows the page change - event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(event); + SendPageChangedEvent(m_nSelection, nPage); - TabCtrl_SetCurSel(GetHwnd(), nPage); + TabCtrl_SetCurSel(GetHwnd(), nPage); } } return m_nSelection; } -void wxNotebook::UpdateSelection(size_t newsel) +void wxNotebook::UpdateSelection(int selNew) { - if ( m_nSelection != -1 ) + if ( m_nSelection != wxNOT_FOUND ) m_pages[m_nSelection]->Show(false); - if ( newsel != -1 ) + if ( selNew != wxNOT_FOUND ) { - wxNotebookPage *pPage = m_pages[newsel]; + wxNotebookPage *pPage = m_pages[selNew]; pPage->Show(true); } @@ -483,14 +496,14 @@ void wxNotebook::UpdateSelection(size_t newsel) if ( ::IsWindowVisible(GetHwnd()) ) SetFocus(); - m_nSelection = newsel; + m_nSelection = selNew; } int wxNotebook::ChangeSelection(size_t nPage) { wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); - if ( int(nPage) != m_nSelection ) + if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection ) { TabCtrl_SetCurSel(GetHwnd(), nPage); @@ -506,7 +519,7 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; - tcItem.pszText = (wxChar *)strText.c_str(); + tcItem.pszText = (wxChar *)strText.wx_str(); if ( !HasFlag(wxNB_MULTILINE) ) return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; @@ -550,7 +563,8 @@ int wxNotebook::GetPageImage(size_t nPage) const TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; - return TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ? tcItem.iImage : wxNOT_FOUND; + return TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ? tcItem.iImage + : wxNOT_FOUND; } bool wxNotebook::SetPageImage(size_t nPage, int nImage) @@ -570,7 +584,7 @@ void wxNotebook::SetImageList(wxImageList* imageList) if ( imageList ) { - (void) TabCtrl_SetImageList(GetHwnd(), (HIMAGELIST)imageList->GetHIMAGELIST()); + (void) TabCtrl_SetImageList(GetHwnd(), GetHimagelistOf(imageList)); } } @@ -685,12 +699,12 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) if ( m_pages.IsEmpty() ) { // no selection any more, the notebook becamse empty - m_nSelection = -1; + m_nSelection = wxNOT_FOUND; } else // notebook still not empty { int selNew = TabCtrl_GetCurSel(GetHwnd()); - if (selNew != -1) + if ( selNew != wxNOT_FOUND ) { // No selection change, just refresh the current selection. // Because it could be that the slection index changed @@ -711,7 +725,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) // m_nSelection must be always valid so reset it before calling // SetSelection() - m_nSelection = -1; + m_nSelection = wxNOT_FOUND; SetSelection(selNew); } else @@ -735,7 +749,7 @@ bool wxNotebook::DeleteAllPages() TabCtrl_DeleteAllItems(GetHwnd()); - m_nSelection = -1; + m_nSelection = wxNOT_FOUND; InvalidateBestSize(); return true; @@ -773,7 +787,7 @@ bool wxNotebook::InsertPage(size_t nPage, if ( !strText.empty() ) { tcItem.mask |= TCIF_TEXT; - tcItem.pszText = (wxChar *)strText.c_str(); // const_cast + tcItem.pszText = (wxChar *)strText.wx_str(); // const_cast } // hide the page: unless it is selected, it shouldn't be shown (and if it @@ -803,7 +817,9 @@ bool wxNotebook::InsertPage(size_t nPage, // so the first panel gets the correct themed background if ( m_pages.empty() ) { +#if wxUSE_UXTHEME UpdateBgBrush(); +#endif // wxUSE_UXTHEME } // succeeded: save the pointer to the page @@ -831,13 +847,13 @@ bool wxNotebook::InsertPage(size_t nPage, // some page should be selected: either this one or the first one if there // is still no selection - int selNew = -1; + int selNew = wxNOT_FOUND; if ( bSelect ) selNew = nPage; - else if ( m_nSelection == -1 ) + else if ( m_nSelection == wxNOT_FOUND ) selNew = 0; - if ( selNew != -1 ) + if ( selNew != wxNOT_FOUND ) SetSelection(selNew); InvalidateBestSize(); @@ -913,6 +929,9 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event)) wxBitmap bmp(rc.right, rc.bottom); memdc.SelectObject(bmp); + const wxLayoutDirection dir = dc.GetLayoutDirection(); + memdc.SetLayoutDirection(dir); + // if there is no special brush just use the solid background colour #if wxUSE_UXTHEME HBRUSH hbr = (HBRUSH)m_hbrBackground; @@ -930,7 +949,10 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event)) MSWDefWindowProc(WM_PAINT, (WPARAM)memdc.GetHDC(), 0); - dc.Blit(0, 0, rc.right, rc.bottom, &memdc, 0, 0); + // For some reason in RTL mode, source offset has to be -1, otherwise the + // right border (physical) remains unpainted. + const wxCoord ofs = dir == wxLayout_RightToLeft ? -1 : 0; + dc.Blit(ofs, 0, rc.right, rc.bottom, &memdc, ofs, 0); } #endif // USE_NOTEBOOK_ANTIFLICKER @@ -1113,7 +1135,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { // 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 && + if ( m_nSelection != wxNOT_FOUND && (!event.GetDirection() || isFromSelf) ) { // so that the page knows that the event comes from it's parent @@ -1295,14 +1317,17 @@ wxColour wxNotebook::GetThemeBackgroundColour() const if (hTheme) { // This is total guesswork. - // See PlatformSDK\Include\Tmschema.h for values + // See PlatformSDK\Include\Tmschema.h for values. + // JACS: can also use 9 (TABP_PANE) COLORREF themeColor; - wxUxThemeEngine::Get()->GetThemeColor( + bool success = (S_OK == wxUxThemeEngine::Get()->GetThemeColor( hTheme, 10 /* TABP_BODY */, 1 /* NORMAL */, 3821 /* FILLCOLORHINT */, - &themeColor); + &themeColor)); + if (!success) + return GetBackgroundColour(); /* [DS] Workaround for WindowBlinds: @@ -1323,7 +1348,33 @@ wxColour wxNotebook::GetThemeBackgroundColour() const &themeColor); } - return wxRGBToColour(themeColor); + wxColour colour = wxRGBToColour(themeColor); + + // Under Vista, the tab background colour is reported incorrectly. + // So for the default theme at least, hard-code the colour to something + // that will blend in. + + static int s_AeroStatus = -1; + if (s_AeroStatus == -1) + { + WCHAR szwThemeFile[1024]; + WCHAR szwThemeColor[256]; + if (S_OK == wxUxThemeEngine::Get()->GetCurrentThemeName(szwThemeFile, 1024, szwThemeColor, 256, NULL, 0)) + { + wxString themeFile(szwThemeFile), themeColor(szwThemeColor); + if (themeFile.Find(wxT("Aero")) != -1 && themeColor == wxT("NormalColor")) + s_AeroStatus = 1; + else + s_AeroStatus = 0; + } + else + s_AeroStatus = 0; + } + + if (s_AeroStatus == 1) + colour = wxColour(255, 255, 255); + + return colour; } } #endif // wxUSE_UXTHEME