X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/628eae0bcd7916c57847b7eab739d4cc32534ccf..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index e6104def38..1879bb2ba3 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/notebook.cpp +// Name: src/msw/notebook.cpp // Purpose: implementation of wxNotebook // Author: Vadim Zeitlin // Modified by: @@ -9,10 +9,6 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "notebook.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,28 +18,28 @@ #if wxUSE_NOTEBOOK -// wxWidgets +#include "wx/notebook.h" + #ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/dc.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" + #include "wx/panel.h" #endif // WX_PRECOMP -#include "wx/log.h" -#include "wx/imaglist.h" -#include "wx/event.h" -#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/imaglist.h" +#include "wx/sysopt.h" -#include "wx/msw/private.h" - -#include - -#include +#include "wx/msw/private.h" +#include "wx/msw/dc.h" +#include #include "wx/msw/winundef.h" #if wxUSE_UXTHEME @@ -93,21 +89,35 @@ // the pointer to standard spin button wnd proc static WXFARPROC gs_wndprocNotebookSpinBtn = (WXFARPROC)NULL; +// the pointer to standard tab control wnd proc +static WXFARPROC gs_wndprocNotebook = (WXFARPROC)NULL; + +LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam); + #endif // USE_NOTEBOOK_ANTIFLICKER // ---------------------------------------------------------------------------- -// event table +// global functions // ---------------------------------------------------------------------------- -#include +static bool HasTroubleWithNonTopTabs() +{ + const int verComCtl32 = wxApp::GetComCtl32Version(); -WX_DEFINE_LIST( wxNotebookPageInfoList ) ; + // 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; +} -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) +// ---------------------------------------------------------------------------- +// event table +// ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxNotebook, wxControl) - EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) +BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase) EVT_SIZE(wxNotebook::OnSize) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) @@ -117,88 +127,6 @@ BEGIN_EVENT_TABLE(wxNotebook, wxControl) #endif // USE_NOTEBOOK_ANTIFLICKER 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) - wxFLAGS_MEMBER(wxNB_NOPAGETHEME) - wxFLAGS_MEMBER(wxNB_FLAT) - -wxEND_FLAGS( wxNotebookStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebook, wxControl,"wx/notebook.h") -IMPLEMENT_DYNAMIC_CLASS_XTI(wxNotebookPageInfo, wxObject , "wx/notebook.h" ) - -wxCOLLECTION_TYPE_INFO( wxNotebookPageInfo * , wxNotebookPageInfoList ) ; - -template<> void wxCollectionToVariantArray( wxNotebookPageInfoList const &theList, wxxVariantArray &value) -{ - wxListCollectionToVariantArray( theList , value ) ; -} - -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() - -wxBEGIN_HANDLERS_TABLE(wxNotebook) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) - - -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() - -wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) - -#else -IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) -IMPLEMENT_DYNAMIC_CLASS(wxNotebookPageInfo, wxObject ) -#endif -IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) - // ============================================================================ // implementation // ============================================================================ @@ -207,31 +135,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) // wxNotebook construction // ---------------------------------------------------------------------------- -const wxNotebookPageInfoList& wxNotebook::GetPageInfos() const -{ - wxNotebookPageInfoList* list = const_cast< wxNotebookPageInfoList* >( &m_pageInfos ) ; - WX_CLEAR_LIST( wxNotebookPageInfoList , *list ) ; - for( size_t i = 0 ; i < GetPageCount() ; ++i ) - { - wxNotebookPageInfo *info = new wxNotebookPageInfo() ; - info->Create( const_cast(this)->GetPage(i) , GetPageText(i) , GetSelection() == int(i) , GetPageImage(i) ) ; - list->Append( info ) ; - } - return m_pageInfos ; -} - // common part of all ctors void wxNotebook::Init() { - m_imageList = NULL; - m_nSelection = -1; + m_imageList = NULL; #if wxUSE_UXTHEME - m_hbrBackground = NULL; + m_hbrBackground = NULL; #endif // wxUSE_UXTHEME #if USE_NOTEBOOK_ANTIFLICKER - m_hasSubclassedUpdown = false; + m_hasSubclassedUpdown = false; #endif // USE_NOTEBOOK_ANTIFLICKER } @@ -262,6 +176,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. @@ -269,22 +192,24 @@ bool wxNotebook::Create(wxWindow *parent, 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 !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 have been compiled without uxtheme support, we have to clear those + // styles + if ( HasTroubleWithNonTopTabs() ) { - // 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); - } + 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 // causes horrible flicker when resizing notebook, so get rid of it by // using a class without these styles (but otherwise identical to it) @@ -296,16 +221,19 @@ bool wxNotebook::Create(wxWindow *parent, // get a copy of standard class and modify it WNDCLASS wc; - if ( ::GetClassInfo(::GetModuleHandle(NULL), WC_TABCONTROL, &wc) ) + if ( ::GetClassInfo(NULL, WC_TABCONTROL, &wc) ) { + gs_wndprocNotebook = + reinterpret_cast(wc.lpfnWndProc); wc.lpszClassName = wxT("_wx_SysTabCtl32"); wc.style &= ~(CS_HREDRAW | CS_VREDRAW); - + wc.hInstance = wxGetInstance(); + wc.lpfnWndProc = wxNotebookWndProc; s_clsNotebook.Register(wc); } else { - wxLogLastError(_T("GetClassInfoEx(SysTabCtl32)")); + wxLogLastError(wxT("GetClassInfoEx(SysTabCtl32)")); } } @@ -318,6 +246,7 @@ bool wxNotebook::Create(wxWindow *parent, className = s_clsNotebook.GetName().c_str(); } } +#endif // USE_NOTEBOOK_ANTIFLICKER if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL, wxDefaultValidator, name) ) @@ -332,6 +261,27 @@ bool wxNotebook::Create(wxWindow *parent, { SetBackgroundColour(GetThemeBackgroundColour()); } + else // use themed background by default + { + // create backing store + UpdateBgBrush(); + } + + // 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. + 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() ) + { + wxUxThemeEngine::GetIfActive()->SetWindowTheme(GetHwnd(), L"", L""); + + // correct the background color for the new non-themed control + SetBackgroundColour(GetThemeBackgroundColour()); + } + } #endif // wxUSE_UXTHEME // Undocumented hack to get flat notebook style @@ -360,21 +310,13 @@ WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const if ( style & wxNB_FIXEDWIDTH ) tabStyle |= TCS_FIXEDWIDTH; - if ( style & wxNB_BOTTOM ) + if ( style & wxBK_BOTTOM ) tabStyle |= TCS_RIGHT; - else if ( style & wxNB_LEFT ) + else if ( style & wxBK_LEFT ) tabStyle |= TCS_VERTICAL; - else if ( style & wxNB_RIGHT ) + else if ( style & wxBK_RIGHT ) tabStyle |= TCS_VERTICAL | TCS_RIGHT; - // ex style - if ( exstyle ) - { - // note that we never want to have the default WS_EX_CLIENTEDGE style - // as it looks too ugly for the notebooks - *exstyle = 0; - } - return tabStyle; } @@ -392,97 +334,152 @@ wxNotebook::~wxNotebook() size_t wxNotebook::GetPageCount() const { - // consistency check - wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(GetHwnd()) ); + // consistency check + wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(GetHwnd()) ); - return m_pages.Count(); + return m_pages.Count(); } int wxNotebook::GetRowCount() const { - return TabCtrl_GetRowCount(GetHwnd()); + return TabCtrl_GetRowCount(GetHwnd()); } 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 ) - { - 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() ) + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); + + if ( m_selection == wxNOT_FOUND || nPage != (size_t)m_selection ) { - // program allows the page change - event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); - (void)GetEventHandler()->ProcessEvent(event); + if ( SendPageChangingEvent(nPage) ) + { + // program allows the page change + const int selectionOld = m_selection; + + UpdateSelection(nPage); - TabCtrl_SetCurSel(GetHwnd(), nPage); + TabCtrl_SetCurSel(GetHwnd(), nPage); + + SendPageChangedEvent(selectionOld, nPage); + } } - } - return m_nSelection; + return m_selection; +} + +void wxNotebook::UpdateSelection(int selNew) +{ + if ( m_selection != wxNOT_FOUND ) + m_pages[m_selection]->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_selection = selNew; +} + +int wxNotebook::ChangeSelection(size_t nPage) +{ + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); + + const int selOld = m_selection; + + if ( m_selection == wxNOT_FOUND || nPage != (size_t)m_selection ) + { + TabCtrl_SetCurSel(GetHwnd(), nPage); + + UpdateSelection(nPage); + } + + return selOld; } 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; + tcItem.pszText = (wxChar *)strText.wx_str(); - TC_ITEM tcItem; - tcItem.mask = TCIF_TEXT; - tcItem.pszText = (wxChar *)strText.c_str(); + if ( !HasFlag(wxNB_MULTILINE) ) + return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; - return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; + // multiline - we need to set new page size if a line is added or removed + int rows = GetRowCount(); + bool ret = TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; + + if ( ret && rows != GetRowCount() ) + { + const wxRect r = GetPageSize(); + const size_t count = m_pages.Count(); + for ( size_t page = 0; page < count; page++ ) + m_pages[page]->SetSize(r); + } + + return ret; } wxString wxNotebook::GetPageText(size_t nPage) const { - wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") ); - wxChar buf[256]; - TC_ITEM tcItem; - tcItem.mask = TCIF_TEXT; - tcItem.pszText = buf; - tcItem.cchTextMax = WXSIZEOF(buf); + wxChar buf[256]; + TC_ITEM tcItem; + tcItem.mask = TCIF_TEXT; + tcItem.pszText = buf; + tcItem.cchTextMax = WXSIZEOF(buf); - wxString str; - if ( TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ) - str = tcItem.pszText; + wxString str; + if ( TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ) + str = tcItem.pszText; - return str; + return str; } int wxNotebook::GetPageImage(size_t nPage) const { - 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") ); - TC_ITEM tcItem; - tcItem.mask = TCIF_IMAGE; + TC_ITEM tcItem; + tcItem.mask = TCIF_IMAGE; - return TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ? tcItem.iImage : -1; + return TabCtrl_GetItem(GetHwnd(), nPage, &tcItem) ? tcItem.iImage + : wxNOT_FOUND; } 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; - tcItem.iImage = nImage; + TC_ITEM tcItem; + tcItem.mask = TCIF_IMAGE; + tcItem.iImage = nImage; - return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; + return TabCtrl_SetItem(GetHwnd(), nPage, &tcItem) != 0; } void wxNotebook::SetImageList(wxImageList* imageList) { - wxNotebookBase::SetImageList(imageList); + wxNotebookBase::SetImageList(imageList); - if ( imageList ) - { - TabCtrl_SetImageList(GetHwnd(), (HIMAGELIST)imageList->GetHIMAGELIST()); - } + if ( imageList ) + { + (void) TabCtrl_SetImageList(GetHwnd(), GetHimagelistOf(imageList)); + } } // ---------------------------------------------------------------------------- @@ -541,26 +538,31 @@ 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(wxNB_LEFT) || HasFlag(wxNB_RIGHT) ) + + const int rows = GetRowCount(); + + // 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 * rows + MARGIN; } - else + else // horizontal layout { - sizeTotal.x += 7; - sizeTotal.y += tabSize.y + 7; + sizeTotal.x += tabSize.x * rows + MARGIN; + sizeTotal.y += MARGIN; } return sizeTotal; @@ -568,7 +570,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const void wxNotebook::AdjustPageSize(wxNotebookPage *page) { - wxCHECK_RET( page, _T("NULL page in wxNotebook::AdjustPageSize") ); + wxCHECK_RET( page, wxT("NULL page in wxNotebook::AdjustPageSize") ); const wxRect r = GetPageSize(); if ( !r.IsEmpty() ) @@ -588,38 +590,42 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) if ( !pageRemoved ) return NULL; + // hide the removed page to maintain the invariant that only the + // selected page is visible and others are hidden: + pageRemoved->Show(false); + TabCtrl_DeleteItem(GetHwnd(), nPage); if ( m_pages.IsEmpty() ) { // no selection any more, the notebook becamse empty - m_nSelection = -1; + m_selection = 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 // we need to update it. // Note: this does not mean the selection it self changed. - m_nSelection = selNew; - m_pages[m_nSelection]->Refresh(); + m_selection = selNew; + m_pages[m_selection]->Refresh(); } - else if (int(nPage) == m_nSelection) + else if (int(nPage) == m_selection) { // The selection was deleted. // Determine new selection. - if (m_nSelection == int(GetPageCount())) - selNew = m_nSelection - 1; + if (m_selection == int(GetPageCount())) + selNew = m_selection - 1; else - selNew = m_nSelection; + selNew = m_selection; - // m_nSelection must be always valid so reset it before calling + // m_selection must be always valid so reset it before calling // SetSelection() - m_nSelection = -1; + m_selection = wxNOT_FOUND; SetSelection(selNew); } else @@ -634,19 +640,19 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) // remove all pages bool wxNotebook::DeleteAllPages() { - size_t nPageCount = GetPageCount(); - size_t nPage; - for ( nPage = 0; nPage < nPageCount; nPage++ ) - delete m_pages[nPage]; + size_t nPageCount = GetPageCount(); + size_t nPage; + for ( nPage = 0; nPage < nPageCount; nPage++ ) + delete m_pages[nPage]; - m_pages.Clear(); + m_pages.Clear(); - TabCtrl_DeleteAllItems(GetHwnd()); + TabCtrl_DeleteAllItems(GetHwnd()); - m_nSelection = -1; + m_selection = wxNOT_FOUND; - InvalidateBestSize(); - return true; + InvalidateBestSize(); + return true; } // same as AddPage() but does it at given position @@ -656,12 +662,12 @@ bool wxNotebook::InsertPage(size_t nPage, bool bSelect, int imageId) { - wxCHECK_MSG( pPage != NULL, false, _T("NULL page in wxNotebook::InsertPage") ); + wxCHECK_MSG( pPage != NULL, false, wxT("NULL page in wxNotebook::InsertPage") ); wxCHECK_MSG( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false, - _T("invalid index in wxNotebook::InsertPage") ); + wxT("invalid index in wxNotebook::InsertPage") ); wxASSERT_MSG( pPage->GetParent() == this, - _T("notebook pages must have notebook as parent") ); + wxT("notebook pages must have notebook as parent") ); // add a new tab to the control // ---------------------------- @@ -681,7 +687,7 @@ bool wxNotebook::InsertPage(size_t nPage, if ( !strText.empty() ) { tcItem.mask |= TCIF_TEXT; - tcItem.pszText = (wxChar *)strText.c_str(); // const_cast + tcItem.pszText = const_cast(strText.wx_str()); } // hide the page: unless it is selected, it shouldn't be shown (and if it @@ -707,6 +713,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); @@ -724,22 +739,13 @@ bool wxNotebook::InsertPage(size_t nPage, // if the inserted page is before the selected one, we must update the // index of the selected page - if ( int(nPage) <= m_nSelection ) + if ( int(nPage) <= m_selection ) { // one extra page added - m_nSelection++; + m_selection++; } - // some page should be selected: either this one or the first one if there - // is still no selection - int selNew = -1; - if ( bSelect ) - selNew = nPage; - else if ( m_nSelection == -1 ) - selNew = 0; - - if ( selNew != -1 ) - SetSelection(selNew); + DoSetSelectionAfterInsertion(nPage, bSelect); InvalidateBestSize(); @@ -758,13 +764,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; @@ -789,6 +797,14 @@ LRESULT APIENTRY _EXPORT wxNotebookSpinBtnWndProc(HWND hwnd, hwnd, message, wParam, lParam); } +LRESULT APIENTRY _EXPORT wxNotebookWndProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + return ::CallWindowProc(CASTWNDPROC gs_wndprocNotebook, + hwnd, message, wParam, lParam); +} void wxNotebook::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { @@ -804,8 +820,15 @@ 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; +#else + HBRUSH hbr = 0; +#endif wxBrush brush; if ( !hbr ) { @@ -813,11 +836,16 @@ void wxNotebook::OnPaint(wxPaintEvent& WXUNUSED(event)) hbr = GetHbrushOf(brush); } - ::FillRect(GetHdcOf(memdc), &rc, hbr); + wxMSWDCImpl *impl = (wxMSWDCImpl*) memdc.GetImpl(); + + ::FillRect(GetHdcOf(*impl), &rc, hbr); - MSWDefWindowProc(WM_PAINT, (WPARAM)memdc.GetHDC(), 0); + MSWDefWindowProc(WM_PAINT, (WPARAM)(impl->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 @@ -892,6 +920,10 @@ void wxNotebook::OnSize(wxSizeEvent& event) MAKELPARAM(rc.right, rc.bottom)); s_isInOnSize = false; } + + // The best size depends on the number of rows of tabs, which can + // change when the notepad is resized. + InvalidateBestSize(); } #if wxUSE_UXTHEME @@ -918,7 +950,7 @@ void wxNotebook::OnSize(wxSizeEvent& event) 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), + RefreshRect(wxRect(rc.right, rc.top, widthNbook - rc.right, height), false); } @@ -953,65 +985,6 @@ void wxNotebook::OnSize(wxSizeEvent& event) event.Skip(); } -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); - 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; - } - - // 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()) ) - { - return MSWProcessMessage(wxmsg); - } - - return false; -} - void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { if ( event.IsWindowChange() ) { @@ -1042,20 +1015,30 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // 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; + const bool isForward = event.GetDirection(); - if ( isFromParent || isFromSelf ) + if ( isFromSelf && !isForward ) + { + // focus is currently on notebook tab and should leave + // it backwards (Shift-TAB) + event.SetCurrentFocus(this); + parent->HandleWindowEvent(event); + } + else if ( isFromParent || isFromSelf ) { // 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 && + // page but only if entering notebook page (i.e. direction is + // backwards (Shift-TAB) comething from out-of-notebook, or + // direction is forward (TAB) from ourselves), + if ( m_selection != wxNOT_FOUND && (!event.GetDirection() || isFromSelf) ) { // so that the page knows that the event comes from it's parent // and is being propagated downwards event.SetEventObject(this); - wxWindow *page = m_pages[m_nSelection]; - if ( !page->GetEventHandler()->ProcessEvent(event) ) + wxWindow *page = m_pages[m_selection]; + if ( !page->HandleWindowEvent(event) ) { page->SetFocus(); } @@ -1072,14 +1055,14 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // 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() ) + if ( !isForward ) { SetFocus(); } else if ( parent ) { event.SetCurrentFocus(this); - parent->GetEventHandler()->ProcessEvent(event); + parent->HandleWindowEvent(event); } } } @@ -1106,17 +1089,17 @@ bool wxNotebook::DoDrawBackground(WXHDC hDC, wxWindow *child) 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; - - + // we have the content area (page size), but we need to draw all of the + // background for it to be aligned correctly + wxUxThemeEngine::Get()->GetThemeBackgroundExtent + ( + theme, + (HDC) hDC, + 9 /* TABP_PANE */, + 0, + &rc, + &rc + ); wxUxThemeEngine::Get()->DrawThemeBackground ( theme, @@ -1163,28 +1146,6 @@ void wxNotebook::UpdateBgBrush() } } -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 @@ -1229,14 +1190,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: @@ -1257,7 +1221,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 @@ -1303,7 +1293,7 @@ bool wxNotebook::MSWOnScroll(int orientation, WXWORD nSBCode, bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) { - wxNotebookEvent event(wxEVT_NULL, m_windowId); + wxBookCtrlEvent event(wxEVT_NULL, m_windowId); NMHDR* hdr = (NMHDR *)lParam; switch ( hdr->code ) { @@ -1320,11 +1310,16 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) } event.SetSelection(TabCtrl_GetCurSel(GetHwnd())); - event.SetOldSelection(m_nSelection); + event.SetOldSelection(m_selection); event.SetEventObject(this); event.SetInt(idCtrl); - bool processed = GetEventHandler()->ProcessEvent(event); + // Change the selection before generating the event as its handler should + // already see the new page selected. + if ( hdr->code == TCN_SELCHANGE ) + UpdateSelection(event.GetSelection()); + + bool processed = HandleWindowEvent(event); *result = !event.IsAllowed(); return processed; }