X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9317fd47263a9521466156d7bf0f7988000bf15..81c9effa8462662263c3b4eac2cfae1ef5caae2c:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 185a915c58..424201d9c6 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -17,9 +17,11 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_NOTEBOOK + // wxWindows #ifndef WX_PRECOMP #include "wx/string.h" @@ -41,15 +43,13 @@ #include // for SetWindowFont #ifndef __TWIN32__ -#ifdef __GNUWIN32__ -#ifndef wxUSE_NORLANDER_HEADERS - #include "wx/msw/gnuwin32/extra.h" -#endif -#endif + #ifdef __GNUWIN32_OLD__ + #include "wx/msw/gnuwin32/extra.h" + #endif #endif -#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) - #include +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) + #include #endif // ---------------------------------------------------------------------------- @@ -83,6 +83,9 @@ // event table // ---------------------------------------------------------------------------- +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED) +DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING) + BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) @@ -107,7 +110,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) // common part of all ctors void wxNotebook::Init() { - m_pImageList = NULL; + m_imageList = NULL; m_nSelection = -1; } @@ -142,21 +145,22 @@ bool wxNotebook::Create(wxWindow *parent, if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; - // colors and font - m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE)); - m_foregroundColour = *wxBLACK ; + parent->AddChild(this); // style m_windowStyle = style | wxTAB_TRAVERSAL; - long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS; + long tabStyle = WS_TABSTOP | TCS_TABS; + if ( m_windowStyle & wxBORDER ) + tabStyle |= WS_BORDER; + if ( m_windowStyle & wxCLIP_SIBLINGS ) + tabStyle |= WS_CLIPSIBLINGS; if (m_windowStyle & wxCLIP_CHILDREN) tabStyle |= WS_CLIPCHILDREN; + if ( m_windowStyle & wxTC_MULTILINE ) tabStyle |= TCS_MULTILINE; - if ( m_windowStyle & wxBORDER ) - tabStyle &= WS_BORDER; if (m_windowStyle & wxNB_FIXEDWIDTH) tabStyle |= TCS_FIXEDWIDTH ; if (m_windowStyle & wxNB_BOTTOM) @@ -166,41 +170,28 @@ bool wxNotebook::Create(wxWindow *parent, if (m_windowStyle & wxNB_RIGHT) tabStyle |= TCS_VERTICAL|TCS_RIGHT; - - if ( !MSWCreate(GetId(), GetParent(), WC_TABCONTROL, - this, NULL, pos.x, pos.y, size.x, size.y, - tabStyle, NULL, 0) ) + // note that we don't want to have the default WS_EX_CLIENTEDGE style for the + // notebook, so explicitly specify 0 as last parameter + if ( !MSWCreateControl(WC_TABCONTROL, tabStyle, pos, size, _T(""), 0) ) { return FALSE; } - // Not all compilers recognise SetWindowFont - ::SendMessage(GetHwnd(), WM_SETFONT, - (WPARAM)::GetStockObject(DEFAULT_GUI_FONT), TRUE); - - - if ( parent != NULL ) - parent->AddChild(this); - - SubclassWin(m_hWnd); + SetBackgroundColour(wxColour(::GetSysColor(COLOR_BTNFACE))); return TRUE; } -// dtor -wxNotebook::~wxNotebook() -{ -} - // ---------------------------------------------------------------------------- // wxNotebook accessors // ---------------------------------------------------------------------------- + int wxNotebook::GetPageCount() const { // consistency check - wxASSERT( (int)m_aPages.Count() == TabCtrl_GetItemCount(m_hwnd) ); + wxASSERT( (int)m_pages.Count() == TabCtrl_GetItemCount(m_hwnd) ); - return m_aPages.Count(); + return m_pages.Count(); } int wxNotebook::GetRowCount() const @@ -217,16 +208,6 @@ int wxNotebook::SetSelection(int nPage) return TabCtrl_SetCurSel(m_hwnd, nPage); } -void wxNotebook::AdvanceSelection(bool bForward) -{ - int nSel = GetSelection(); - int nMax = GetPageCount() - 1; - if ( bForward ) - SetSelection(nSel == nMax ? 0 : nSel + 1); - else - SetSelection(nSel == 0 ? nMax : nSel - 1); -} - bool wxNotebook::SetPageText(int nPage, const wxString& strText) { wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") ); @@ -278,10 +259,37 @@ bool wxNotebook::SetPageImage(int nPage, int nImage) void wxNotebook::SetImageList(wxImageList* imageList) { - m_pImageList = imageList; - TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST()); + wxNotebookBase::SetImageList(imageList); + + if ( imageList ) + { + TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST()); + } +} + +// ---------------------------------------------------------------------------- +// wxNotebook size settings +// ---------------------------------------------------------------------------- + +void wxNotebook::SetPageSize(const wxSize& size) +{ + // transform the page size into the notebook size + RECT rc; + rc.left = + rc.top = 0; + rc.right = size.x; + rc.bottom = size.y; + + TabCtrl_AdjustRect(GetHwnd(), TRUE, &rc); + + // and now set it + SetSize(rc.right - rc.left, rc.bottom - rc.top); } +void wxNotebook::SetPadding(const wxSize& padding) +{ + TabCtrl_SetPadding(GetHwnd(), padding.x, padding.y); +} // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH // style. @@ -307,10 +315,10 @@ bool wxNotebook::DeletePage(int nPage) TabCtrl_DeleteItem(m_hwnd, nPage); - delete m_aPages[nPage]; - m_aPages.Remove(nPage); + delete m_pages[nPage]; + m_pages.RemoveAt(nPage); - if ( m_aPages.IsEmpty() ) { + if ( m_pages.IsEmpty() ) { // no selection if the notebook became empty m_nSelection = -1; } @@ -322,20 +330,20 @@ bool wxNotebook::DeletePage(int nPage) } // remove one page from the notebook, without deleting -bool wxNotebook::RemovePage(int nPage) +wxNotebookPage *wxNotebook::DoRemovePage(int nPage) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") ); + wxNotebookPage *pageRemoved = wxNotebookBase::DoRemovePage(nPage); + if ( !pageRemoved ) + return NULL; TabCtrl_DeleteItem(m_hwnd, nPage); - m_aPages.Remove(nPage); - - if ( m_aPages.IsEmpty() ) - m_nSelection = -1; - else - m_nSelection = TabCtrl_GetCurSel(m_hwnd); + if ( m_pages.IsEmpty() ) + m_nSelection = -1; + else + m_nSelection = TabCtrl_GetCurSel(m_hwnd); - return TRUE; + return pageRemoved; } // remove all pages @@ -344,9 +352,9 @@ bool wxNotebook::DeleteAllPages() int nPageCount = GetPageCount(); int nPage; for ( nPage = 0; nPage < nPageCount; nPage++ ) - delete m_aPages[nPage]; + delete m_pages[nPage]; - m_aPages.Clear(); + m_pages.Clear(); TabCtrl_DeleteAllItems(m_hwnd); @@ -407,7 +415,7 @@ bool wxNotebook::InsertPage(int nPage, } // save the pointer to the page - m_aPages.Insert(pPage, nPage); + m_pages.Insert(pPage, nPage); // don't show pages by default (we'll need to adjust their size first) HWND hwnd = GetWinHwnd(pPage); @@ -423,7 +431,6 @@ bool wxNotebook::InsertPage(int nPage, TabCtrl_AdjustRect(m_hwnd, FALSE, &rc); pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); - // some page should be selected: either this one or the first one if there is // still no selection int selNew = -1; @@ -450,10 +457,13 @@ void wxNotebook::OnSize(wxSizeEvent& event) GetSize((int *)&rc.right, (int *)&rc.bottom); TabCtrl_AdjustRect(m_hwnd, FALSE, &rc); - size_t nCount = m_aPages.Count(); + + int width = rc.right - rc.left, + height = rc.bottom - rc.top; + size_t nCount = m_pages.Count(); for ( size_t nPage = 0; nPage < nCount; nPage++ ) { - wxNotebookPage *pPage = m_aPages[nPage]; - pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); + wxNotebookPage *pPage = m_pages[nPage]; + pPage->SetSize(rc.left, rc.top, width, height); } event.Skip(); @@ -466,12 +476,12 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) { int sel = event.GetOldSelection(); if ( sel != -1 ) - m_aPages[sel]->Show(FALSE); + m_pages[sel]->Show(FALSE); sel = event.GetSelection(); if ( sel != -1 ) { - wxNotebookPage *pPage = m_aPages[sel]; + wxNotebookPage *pPage = m_pages[sel]; pPage->Show(TRUE); pPage->SetFocus(); } @@ -485,26 +495,71 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) void wxNotebook::OnSetFocus(wxFocusEvent& event) { - // set focus to the currently selected page if any - if ( m_nSelection != -1 ) - m_aPages[m_nSelection]->SetFocus(); + // 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 - event.Skip(); + // set focus to the currently selected page if any + if ( m_nSelection != -1 ) + m_pages[m_nSelection]->SetFocus(); + + event.Skip(); } void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) { - if ( event.IsWindowChange() ) { - // change pages - AdvanceSelection(event.GetDirection()); - } - else { - // pass to the parent - if ( GetParent() ) { - event.SetCurrentFocus(this); - GetParent()->GetEventHandler()->ProcessEvent(event); + if ( event.IsWindowChange() ) { + // change pages + AdvanceSelection(event.GetDirection()); + } + else { + // we get this event in 2 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 + // our parent will take care of setting the focus to prev/next sibling + // + // or + // + // b) the parent panel wants to give the focus to us so that we + // forward it to our selected page. We can't deal with this in + // 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(); + if ( event.GetEventObject() == parent ) + { + // no, it doesn't come from child, case (b): forward to a page + if ( m_nSelection != -1 ) + { + // 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) ) + { + page->SetFocus(); + } + //else: page manages focus inside it itself + } + else + { + // 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 ) { + event.SetCurrentFocus(this); + parent->GetEventHandler()->ProcessEvent(event); + } + } } - } } // ---------------------------------------------------------------------------- @@ -513,13 +568,13 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // override these 2 functions to do nothing: everything is done in OnSize -void wxNotebook::SetConstraintSizes(bool /* recurse */) +void wxNotebook::SetConstraintSizes(bool WXUNUSED(recurse)) { // don't set the sizes of the pages - their correct size is not yet known wxControl::SetConstraintSizes(FALSE); } -bool wxNotebook::DoPhase(int /* nPhase */) +bool wxNotebook::DoPhase(int WXUNUSED(nPhase)) { return TRUE; } @@ -579,7 +634,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) event.SetSelection(nSel); event.SetOldSelection(nOldSel); event.SetEventObject(this); - if ( ProcessEvent(event) && !event.IsAllowed() ) + if ( GetEventHandler()->ProcessEvent(event) && !event.IsAllowed() ) { // program doesn't allow the page change s_bInsideChangePage = FALSE; @@ -587,7 +642,9 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) } event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); - ProcessEvent(event); + GetEventHandler()->ProcessEvent(event); s_bInsideChangePage = FALSE; } + +#endif // wxUSE_NOTEBOOK