X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d13c32e99d20b8282f590b5f5beef50b63662e5a..2356708db31b737c6eae53c2316b642aa5a2e68d:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 049703b142..2961439e4b 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -2,7 +2,7 @@ // Name: msw/notebook.cpp // Purpose: implementation of wxNotebook // Author: Vadim Zeitlin -// Modified by: +// Modified by: // Created: 11.06.98 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin @@ -42,11 +42,13 @@ #ifndef __TWIN32__ #ifdef __GNUWIN32__ +#ifndef wxUSE_NORLANDER_HEADERS #include "wx/msw/gnuwin32/extra.h" #endif #endif +#endif -#if !defined(__GNUWIN32__) || defined(__TWIN32__) +#if !defined(__GNUWIN32__) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) #include #endif @@ -69,8 +71,9 @@ 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() @@ -121,10 +124,8 @@ bool wxNotebook::Create(wxWindow *parent, const wxString& name) { // base init - SetName(name); - SetParent(parent); - - m_windowId = id == -1 ? NewControlId() : id; + if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) + return FALSE; // colors and font m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE)); @@ -144,34 +145,21 @@ bool wxNotebook::Create(wxWindow *parent, if (m_windowStyle & wxNB_FIXEDWIDTH) tabStyle |= TCS_FIXEDWIDTH ; - // create the tab control. - m_hWnd = (WXHWND)CreateWindowEx - ( - 0, // extended style - WC_TABCONTROL, // class name for the tab control - "", // no caption - tabStyle, // style - pos.x, pos.y, size.x, size.y, // size and position - (HWND)parent->GetHWND(), // parent window - (HMENU)m_windowId, // child id - wxGetInstance(), // current instance - NULL // no class data - ); - - if ( m_hWnd == 0 ) { - wxLogSysError("Can't create the notebook control"); + if ( !MSWCreate(GetId(), GetParent(), WC_TABCONTROL, + this, NULL, pos.x, pos.y, size.x, size.y, + tabStyle, NULL, 0) ) + { 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); + ::SendMessage(GetHwnd(), WM_SETFONT, + (WPARAM)::GetStockObject(DEFAULT_GUI_FONT), TRUE); - if ( parent != NULL ) + if ( parent != NULL ) parent->AddChild(this); - + SubclassWin(m_hWnd); return TRUE; @@ -200,7 +188,7 @@ int wxNotebook::GetRowCount() const int wxNotebook::SetSelection(int nPage) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("notebook page out of range") ); ChangePage(m_nSelection, nPage); @@ -219,20 +207,20 @@ void wxNotebook::AdvanceSelection(bool bForward) bool wxNotebook::SetPageText(int nPage, const wxString& strText) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") ); TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; - tcItem.pszText = (char *)strText.c_str(); + tcItem.pszText = (wxChar *)strText.c_str(); return TabCtrl_SetItem(m_hwnd, nPage, &tcItem) != 0; } wxString wxNotebook::GetPageText(int nPage) const { - wxCHECK_MSG( IS_VALID_PAGE(nPage), "", "notebook page out of range" ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), _T(""), _T("notebook page out of range") ); - char buf[256]; + wxChar buf[256]; TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; tcItem.pszText = buf; @@ -247,7 +235,7 @@ wxString wxNotebook::GetPageText(int nPage) const int wxNotebook::GetPageImage(int nPage) const { - wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, "notebook page out of range" ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, _T("notebook page out of range") ); TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; @@ -257,7 +245,7 @@ int wxNotebook::GetPageImage(int nPage) const bool wxNotebook::SetPageImage(int nPage, int nImage) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") ); TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; @@ -267,11 +255,19 @@ bool wxNotebook::SetPageImage(int nPage, int nImage) } void wxNotebook::SetImageList(wxImageList* imageList) -{ +{ m_pImageList = imageList; TabCtrl_SetImageList(m_hwnd, (HIMAGELIST)imageList->GetHIMAGELIST()); } + +// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH +// style. +void wxNotebook::SetTabSize(const wxSize& sz) +{ + ::SendMessage(GetHwnd(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y)); +} + // ---------------------------------------------------------------------------- // wxNotebook operations // ---------------------------------------------------------------------------- @@ -279,20 +275,31 @@ void wxNotebook::SetImageList(wxImageList* imageList) // remove one page from the notebook bool wxNotebook::DeletePage(int nPage) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, "notebook page out of range" ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") ); + + if ( m_nSelection == nPage ) { + // advance selection backwards - the page being deleted shouldn't be left + // selected + AdvanceSelection(FALSE); + } TabCtrl_DeleteItem(m_hwnd, nPage); delete m_aPages[nPage]; m_aPages.Remove(nPage); + if ( m_aPages.IsEmpty() ) { + // no selection if the notebook became empty + m_nSelection = -1; + } + 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" ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, _T("notebook page out of range") ); TabCtrl_DeleteItem(m_hwnd, nPage); @@ -304,8 +311,6 @@ bool wxNotebook::RemovePage(int nPage) // remove all pages bool wxNotebook::DeleteAllPages() { - TabCtrl_DeleteAllItems(m_hwnd); - int nPageCount = GetPageCount(); int nPage; for ( nPage = 0; nPage < nPageCount; nPage++ ) @@ -313,6 +318,8 @@ bool wxNotebook::DeleteAllPages() m_aPages.Clear(); + TabCtrl_DeleteAllItems(m_hwnd); + return TRUE; } @@ -350,20 +357,20 @@ bool wxNotebook::InsertPage(int nPage, if (!strText.IsEmpty()) { tcItem.mask |= TCIF_TEXT; - tcItem.pszText = (char *)strText.c_str(); + tcItem.pszText = (wxChar *)strText.c_str(); } else - tcItem.pszText = (char *) NULL; + tcItem.pszText = (wxChar *) NULL; if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) { - wxLogError("Can't create the notebook page '%s'.", strText.c_str()); + wxLogError(_T("Can't create the notebook page '%s'."), strText.c_str()); return FALSE; } // save the pointer to the page m_aPages.Insert(pPage, nPage); - // some page must be selected: either this one or the first one if there is + // some page must be selected: either this one or the first one if there is // still no selection if ( bSelect ) m_nSelection = nPage; @@ -371,9 +378,17 @@ bool wxNotebook::InsertPage(int nPage, m_nSelection = 0; // don't show pages by default (we'll need to adjust their size first) - HWND hwnd = (HWND)pPage->GetHWND(); + HWND hwnd = GetWinHwnd(pPage); SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_VISIBLE); + // this updates internal flag too - otherwise it will get out of sync + pPage->Show(FALSE); + + // FIXME this is ugly, I'm breaking my own rules... but needed to get display + // right (why?) + wxSizeEvent event; + OnSize(event); + return TRUE; } @@ -412,7 +427,23 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) { // is it our tab control? if ( event.GetEventObject() == this ) - ChangePage(event.GetOldSelection(), event.GetSelection()); + { + // don't call ChangePage() here because it will generate redundant + // notification events + int sel = event.GetOldSelection(); + if ( sel != -1 ) + m_aPages[sel]->Show(FALSE); + + sel = event.GetSelection(); + if ( sel != -1 ) + { + wxNotebookPage *pPage = m_aPages[sel]; + pPage->Show(TRUE); + pPage->SetFocus(); + } + + m_nSelection = sel; + } // we want to give others a chance to process this message as well event.Skip(); @@ -459,12 +490,7 @@ 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, WXLPARAM* result) +bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) { wxNotebookEvent event(wxEVT_NULL, m_windowId); @@ -479,13 +505,13 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result) break; default: - return wxControl::MSWNotify(wParam, lParam, result); + return wxControl::MSWOnNotify(idCtrl, lParam, result); } event.SetSelection(TabCtrl_GetCurSel(m_hwnd)); event.SetOldSelection(m_nSelection); event.SetEventObject(this); - event.SetInt(LOWORD(wParam)); // ctrl id + event.SetInt(idCtrl); bool processed = GetEventHandler()->ProcessEvent(event); *result = !event.IsAllowed(); @@ -538,16 +564,3 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) m_nSelection = nSel; s_bInsideChangePage = FALSE; } - -void wxNotebook::OnEraseBackground(wxEraseEvent& event) -{ - Default(); -} - -// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH -// style. -void wxNotebook::SetTabSize(const wxSize& sz) -{ - ::SendMessage((HWND) GetHWND(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y)); -} -