X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38924e863cd44e2abd49d20d201d72aa773c51e..ccddcbac5eb708e0812784f53d2c42db1738c50b:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index ff438e3dc6..bfc98f9e01 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -18,28 +18,26 @@ #if wxUSE_NOTEBOOK -#include "wx/notebook.h" +#include "wx/notebook.h" #ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/dc.h" - #include "wx/log.h" - #include "wx/event.h" - #include "wx/app.h" - #include "wx/dcclient.h" - #include "wx/dcmemory.h" + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/string.h" + #include "wx/dc.h" + #include "wx/log.h" + #include "wx/event.h" + #include "wx/app.h" + #include "wx/dcclient.h" + #include "wx/dcmemory.h" + #include "wx/control.h" #endif // WX_PRECOMP -#include "wx/imaglist.h" -#include "wx/control.h" -#include "wx/sysopt.h" +#include "wx/imaglist.h" +#include "wx/sysopt.h" -#include "wx/msw/private.h" - -#include - -#include +#include "wx/msw/private.h" +#include #include "wx/msw/winundef.h" #if wxUSE_UXTHEME @@ -230,7 +228,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; @@ -268,6 +266,15 @@ bool wxNotebook::Create(wxWindow *parent, long style, const wxString& name) { + if ( (style & wxBK_ALIGN_MASK) == wxBK_DEFAULT ) + { +#if defined(__POCKETPC__) + style |= wxBK_BOTTOM | wxNB_FLAT; +#else + style |= wxBK_TOP; +#endif + } + #ifdef __WXWINCE__ // Not sure why, but without this style, there is no border // around the notebook tabs. @@ -436,25 +443,58 @@ 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(int selNew) +{ + if ( m_nSelection != wxNOT_FOUND ) + m_pages[m_nSelection]->Show(false); + + if ( selNew != wxNOT_FOUND ) + { + wxNotebookPage *pPage = m_pages[selNew]; + pPage->Show(true); + } + + // 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. + + // but don't do this is the notebook is hidden + if ( ::IsWindowVisible(GetHwnd()) ) + SetFocus(); + + m_nSelection = selNew; +} + +int wxNotebook::ChangeSelection(size_t nPage) +{ + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); + + if ( m_nSelection == wxNOT_FOUND || nPage != (size_t)m_nSelection ) + { + TabCtrl_SetCurSel(GetHwnd(), nPage); + + UpdateSelection(nPage); + } + + return m_nSelection; +} + bool wxNotebook::SetPageText(size_t nPage, const wxString& strText) { wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("notebook page out of range") ); @@ -505,7 +545,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) @@ -525,7 +566,7 @@ void wxNotebook::SetImageList(wxImageList* imageList) if ( imageList ) { - (void) TabCtrl_SetImageList(GetHwnd(), (HIMAGELIST)imageList->GetHIMAGELIST()); + (void) TabCtrl_SetImageList(GetHwnd(), GetHimagelistOf(imageList)); } } @@ -585,26 +626,29 @@ void wxNotebook::SetTabSize(const wxSize& sz) wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { + // we can't use TabCtrl_AdjustRect here because it only works for wxNB_TOP wxSize sizeTotal = sizePage; - // We need to make getting tab size part of the wxWidgets API. wxSize tabSize; - if (GetPageCount() > 0) + if ( GetPageCount() > 0 ) { RECT rect; - TabCtrl_GetItemRect((HWND) GetHWND(), 0, & rect); + TabCtrl_GetItemRect(GetHwnd(), 0, &rect); tabSize.x = rect.right - rect.left; tabSize.y = rect.bottom - rect.top; } - if ( HasFlag(wxBK_LEFT) || HasFlag(wxBK_RIGHT) ) + + // add an extra margin in both directions + const int MARGIN = 8; + if ( IsVertical() ) { - sizeTotal.x += tabSize.x + 7; - sizeTotal.y += 7; + sizeTotal.x += MARGIN; + sizeTotal.y += tabSize.y + MARGIN; } - else + else // horizontal layout { - sizeTotal.x += 7; - sizeTotal.y += tabSize.y + 7; + sizeTotal.x += tabSize.x + MARGIN; + sizeTotal.y += MARGIN; } return sizeTotal; @@ -637,12 +681,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 @@ -663,7 +707,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 @@ -687,7 +731,7 @@ bool wxNotebook::DeleteAllPages() TabCtrl_DeleteAllItems(GetHwnd()); - m_nSelection = -1; + m_nSelection = wxNOT_FOUND; InvalidateBestSize(); return true; @@ -751,6 +795,15 @@ bool wxNotebook::InsertPage(size_t nPage, return false; } + // need to update the bg brush when the first page is added + // 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 m_pages.Insert(pPage, nPage); @@ -776,13 +829,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(); @@ -802,13 +855,15 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const *flags = 0; if ((hitTestInfo.flags & TCHT_NOWHERE) == TCHT_NOWHERE) - *flags |= wxNB_HITTEST_NOWHERE; + *flags |= wxBK_HITTEST_NOWHERE; if ((hitTestInfo.flags & TCHT_ONITEM) == TCHT_ONITEM) - *flags |= wxNB_HITTEST_ONITEM; + *flags |= wxBK_HITTEST_ONITEM; if ((hitTestInfo.flags & TCHT_ONITEMICON) == TCHT_ONITEMICON) - *flags |= wxNB_HITTEST_ONICON; + *flags |= wxBK_HITTEST_ONICON; if ((hitTestInfo.flags & TCHT_ONITEMLABEL) == TCHT_ONITEMLABEL) - *flags |= wxNB_HITTEST_ONLABEL; + *flags |= wxBK_HITTEST_ONLABEL; + if ( item == wxNOT_FOUND && GetPageSize().Contains(pt) ) + *flags |= wxBK_HITTEST_ONPAGE; } return item; @@ -856,6 +911,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; @@ -873,7 +931,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 @@ -1011,54 +1072,14 @@ void wxNotebook::OnSize(wxSizeEvent& event) void wxNotebook::OnSelChange(wxNotebookEvent& event) { - // is it our tab control? - if ( event.GetEventObject() == this ) - { - int sel = event.GetOldSelection(); - if ( sel != -1 ) - m_pages[sel]->Show(false); - - sel = event.GetSelection(); - if ( sel != -1 ) - { - wxNotebookPage *pPage = m_pages[sel]; - pPage->Show(true); - } - - // 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. - - // but don't do this is the notebook is hidden - if ( ::IsWindowVisible(GetHwnd()) ) - SetFocus(); - - m_nSelection = sel; - } - - // we want to give others a chance to process this message as well - event.Skip(); -} - -bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg) -{ - 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 == GetHwnd() && - (wxIsCtrlDown() || !wxIsShiftDown()) ) + // is it our tab control? + if ( event.GetEventObject() == this ) { - return MSWProcessMessage(wxmsg); + UpdateSelection(event.GetSelection()); } - return false; + // we want to give others a chance to process this message as well + event.Skip(); } void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) @@ -1096,7 +1117,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