X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8b9518ee4a9cb8f6d4934afaed07aea011ec5ab1..f5419957e5794f2d10f4e125f77b2c2e2cd222d6:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 882cd41f45..74dfb4cd9d 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -9,28 +9,15 @@ // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -// TODO: -// 1) keyboard interface for changing pages ([Shift]+Ctrl-Tab) -// 2) using OnSize() for showing pages for the first time works, but it surely -// us ugly -// 3) I'm not sure that setting fonts works - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "notebook.h" +#pragma implementation "notebook.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop +#pragma hdrstop #endif // wxWindows @@ -49,6 +36,8 @@ #error "wxNotebook is not supported under Windows 3.1" #endif //Win95 +#include // for SetWindowFont + #ifdef __GNUWIN32__ #include "wx/msw/gnuwin32/extra.h" #else //!GnuWin32 @@ -74,6 +63,7 @@ EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) + EVT_ERASE_BACKGROUND(wxNotebook::OnEraseBackground) EVT_SET_FOCUS(wxNotebook::OnSetFocus) EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey) END_EVENT_TABLE() @@ -134,11 +124,8 @@ bool wxNotebook::Create(wxWindow *parent, m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE)); m_foregroundColour = *wxBLACK ; - m_defaultForegroundColour = *wxBLACK ; - m_defaultBackgroundColour = wxColour(GetSysColor(COLOR_BTNFACE)); - // style - m_windowStyle = style; + m_windowStyle = style | wxTAB_TRAVERSAL; long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS; if ( m_windowStyle & wxTC_MULTILINE ) @@ -165,6 +152,12 @@ bool wxNotebook::Create(wxWindow *parent, return FALSE; } + // Not all compilers recognise SetWindowFont +// SetWindowFont((HWND)m_hwnd, ::GetStockObject(DEFAULT_GUI_FONT), FALSE); + ::SendMessage((HWND) m_hwnd, WM_SETFONT, + (WPARAM)::GetStockObject(DEFAULT_GUI_FONT),TRUE); + + if ( parent != NULL ) parent->AddChild(this); @@ -196,7 +189,7 @@ int wxNotebook::GetRowCount() const int wxNotebook::SetSelection(int nPage) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" ); ChangePage(m_nSelection, nPage); @@ -215,7 +208,7 @@ void wxNotebook::AdvanceSelection(bool bForward) bool wxNotebook::SetPageText(int nPage, const wxString& strText) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" ); TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; @@ -226,7 +219,7 @@ bool wxNotebook::SetPageText(int nPage, const wxString& strText) wxString wxNotebook::GetPageText(int nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), "", "notebook page out of range" ); char buf[256]; TC_ITEM tcItem; @@ -243,7 +236,7 @@ wxString wxNotebook::GetPageText(int nPage) const int wxNotebook::GetPageImage(int nPage) const { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" ); TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; @@ -253,7 +246,7 @@ int wxNotebook::GetPageImage(int nPage) const bool wxNotebook::SetPageImage(int nPage, int nImage) { - wxASSERT( IS_VALID_PAGE(nPage) ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" ); TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; @@ -275,7 +268,7 @@ void wxNotebook::SetImageList(wxImageList* imageList) // remove one page from the notebook bool wxNotebook::DeletePage(int nPage) { - wxCHECK( IS_VALID_PAGE(nPage), FALSE ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" ); TabCtrl_DeleteItem(m_hwnd, nPage); @@ -285,6 +278,18 @@ bool wxNotebook::DeletePage(int nPage) return TRUE; } +// remove one page from the notebook, without deleting +bool wxNotebook::RemovePage(int nPage) +{ + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" ); + + TabCtrl_DeleteItem(m_hwnd, nPage); + + m_aPages.Remove(nPage); + + return TRUE; +} + // remove all pages bool wxNotebook::DeleteAllPages() { @@ -351,24 +356,28 @@ bool wxNotebook::InsertPage(int nPage, // wxNotebook callbacks // ---------------------------------------------------------------------------- -// @@@ OnSize() is used for setting the font when it's called for the first -// time because doing it in ::Create() doesn't work (for unknown reasons) void wxNotebook::OnSize(wxSizeEvent& event) { - static bool s_bFirstTime = TRUE; - if ( s_bFirstTime ) { - SendMessage((HWND)m_hwnd, WM_SETFONT, - (WPARAM)GetStockObject(DEFAULT_GUI_FONT), - MAKELPARAM(TRUE, 0)); - s_bFirstTime = FALSE; - } - // emulate page change (it's esp. important to do it first time because // otherwise our page would stay invisible) int nSel = m_nSelection; m_nSelection = -1; SetSelection(nSel); + // fit the notebook page to the tab control's display area + RECT rc; + rc.left = rc.top = 0; + GetSize((int *)&rc.right, (int *)&rc.bottom); + + TabCtrl_AdjustRect(m_hwnd, FALSE, &rc); + size_t nCount = m_aPages.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); + if ( pPage->GetAutoLayout() ) + pPage->Layout(); + } + event.Skip(); } @@ -401,7 +410,7 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // pass to the parent if ( GetParent() ) { event.SetCurrentFocus(this); - GetParent()->ProcessEvent(event); + GetParent()->GetEventHandler()->ProcessEvent(event); } } } @@ -409,15 +418,28 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event) // ---------------------------------------------------------------------------- // wxNotebook base class virtuals // ---------------------------------------------------------------------------- + +// override these 2 functions to do nothing: everything is done in OnSize + +void wxNotebook::SetConstraintSizes(bool /* recurse */) +{ + // don't set the sizes of the pages - their correct size is not yet known + wxControl::SetConstraintSizes(FALSE); +} + +bool wxNotebook::DoPhase(int /* nPhase */) +{ + return TRUE; +} + void wxNotebook::Command(wxCommandEvent& event) { wxFAIL_MSG("wxNotebook::Command not implemented"); } -bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) +bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result) { - wxNotebookEvent event(wxEVT_NULL, m_windowId, - TabCtrl_GetCurSel(m_hwnd), m_nSelection); + wxNotebookEvent event(wxEVT_NULL, m_windowId); NMHDR* hdr = (NMHDR *)lParam; switch ( hdr->code ) { @@ -429,14 +451,18 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING); break; - default : - return wxControl::MSWNotify(wParam, lParam); + default: + return wxControl::MSWNotify(wParam, lParam, result); } + event.SetSelection(TabCtrl_GetCurSel(m_hwnd)); + event.SetOldSelection(m_nSelection); event.SetEventObject(this); - event.SetInt(LOWORD(wParam)); + event.SetInt(LOWORD(wParam)); // ctrl id - return ProcessEvent(event); + bool processed = GetEventHandler()->ProcessEvent(event); + *result = !event.IsAllowed(); + return processed; } // ---------------------------------------------------------------------------- @@ -446,35 +472,48 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam) // hide the currently active panel and show the new one void wxNotebook::ChangePage(int nOldSel, int nSel) { - wxASSERT( nOldSel != nSel ); // impossible + // MT-FIXME should use a real semaphore + static bool s_bInsideChangePage = FALSE; - if ( nOldSel != -1 ) { - m_aPages[nOldSel]->Show(FALSE); + // when we call ProcessEvent(), our own OnSelChange() is called which calls + // this function - break the infinite loop + if ( s_bInsideChangePage ) + return; + + // it's not an error (the message may be generated by the tab control itself) + // and it may happen - just do nothing + if ( nSel == nOldSel ) + return; + + s_bInsideChangePage = TRUE; + + wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, m_windowId); + event.SetSelection(nSel); + event.SetOldSelection(nOldSel); + event.SetEventObject(this); + if ( ProcessEvent(event) && !event.IsAllowed() ) + { + // program doesn't allow the page change + s_bInsideChangePage = FALSE; + return; } + if ( nOldSel != -1 ) + m_aPages[nOldSel]->Show(FALSE); + wxNotebookPage *pPage = m_aPages[nSel]; - FitPage(pPage); pPage->Show(TRUE); + pPage->SetFocus(); - // set focus to the currently selected page - wxWindow *win = m_aPages[nSel]; - if ( win->IsKindOf(CLASSINFO(wxPanel)) ) { - wxList *children = win->GetChildren(); - if ( children->First() != NULL ); - win = (wxWindow *)children->First()->Data(); - } - win->SetFocus(); + event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); + ProcessEvent(event); m_nSelection = nSel; + s_bInsideChangePage = FALSE; } -// fit the notebook page to the tab control's display area -void wxNotebook::FitPage(wxNotebookPage *pPage) +void wxNotebook::OnEraseBackground(wxEraseEvent& event) { - RECT rc; - rc.left = rc.top = 0; - GetSize((int *)&rc.right, (int *)&rc.bottom); + Default(); +} - TabCtrl_AdjustRect(m_hwnd, FALSE, &rc); - pPage->SetSize(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); -} \ No newline at end of file