X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/907f37b35ba1c44ed49230d97a9dae861dd7d062..2a31049201e9c1ff9f515eb9d144ae392f4b4e5a:/src/msw/notebook.cpp diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index eed57498e9..43b70d1dbb 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -22,16 +22,16 @@ // wxWindows #ifndef WX_PRECOMP - #include + #include "wx/string.h" #endif // WX_PRECOMP -#include -#include -#include -#include -#include +#include "wx/log.h" +#include "wx/imaglist.h" +#include "wx/event.h" +#include "wx/control.h" +#include "wx/notebook.h" -#include +#include "wx/msw/private.h" // Windows standard headers #ifndef __WIN95__ @@ -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 @@ -60,23 +62,39 @@ // hide the ugly cast #define m_hwnd (HWND)GetHWND() +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +// This is a work-around for missing defines in gcc-2.95 headers +#ifndef TCS_RIGHT + #define TCS_RIGHT 0x0002 +#endif + +#ifndef TCS_VERTICAL + #define TCS_VERTICAL 0x0080 +#endif + +#ifndef TCS_BOTTOM + #define TCS_BOTTOM TCS_RIGHT +#endif + // ---------------------------------------------------------------------------- // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) 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() IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) -#endif // ============================================================================ // implementation @@ -121,10 +139,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)); @@ -143,30 +159,24 @@ bool wxNotebook::Create(wxWindow *parent, tabStyle &= WS_BORDER; if (m_windowStyle & wxNB_FIXEDWIDTH) tabStyle |= TCS_FIXEDWIDTH ; + if (m_windowStyle & wxNB_BOTTOM) + tabStyle |= TCS_RIGHT; + if (m_windowStyle & wxNB_LEFT) + tabStyle |= TCS_VERTICAL; + if (m_windowStyle & wxNB_RIGHT) + tabStyle |= TCS_VERTICAL|TCS_RIGHT; - // 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 ) @@ -200,7 +210,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, wxT("notebook page out of range") ); ChangePage(m_nSelection, nPage); @@ -219,20 +229,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, wxT("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), wxT(""), wxT("notebook page out of range") ); - char buf[256]; + wxChar buf[256]; TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; tcItem.pszText = buf; @@ -247,7 +257,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, wxT("notebook page out of range") ); TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; @@ -257,7 +267,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, wxT("notebook page out of range") ); TC_ITEM tcItem; tcItem.mask = TCIF_IMAGE; @@ -272,6 +282,14 @@ void wxNotebook::SetImageList(wxImageList* 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,25 +297,44 @@ 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, wxT("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; + } + else + m_nSelection = TabCtrl_GetCurSel(m_hwnd); + + 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, wxT("notebook page out of range") ); TabCtrl_DeleteItem(m_hwnd, nPage); m_aPages.Remove(nPage); + if ( m_aPages.IsEmpty() ) + m_nSelection = -1; + else + m_nSelection = TabCtrl_GetCurSel(m_hwnd); + return TRUE; } @@ -313,6 +350,8 @@ bool wxNotebook::DeleteAllPages() TabCtrl_DeleteAllItems(m_hwnd); + m_nSelection = -1; + return TRUE; } @@ -335,44 +374,66 @@ bool wxNotebook::InsertPage(int nPage, wxASSERT( pPage != NULL ); wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE ); - // add the tab to the control + // do add the tab to the control + + // init all fields to 0 TC_ITEM tcItem; - tcItem.mask = 0; + memset(&tcItem, 0, sizeof(tcItem)); - if (imageId != -1) + if ( imageId != -1 ) { tcItem.mask |= TCIF_IMAGE; tcItem.iImage = imageId; } - else - tcItem.iImage = 0; - if (!strText.IsEmpty()) + if ( !strText.IsEmpty() ) { - tcItem.mask |= TCIF_TEXT; - tcItem.pszText = (char *)strText.c_str(); + tcItem.mask |= TCIF_TEXT; + tcItem.pszText = (wxChar *)strText.c_str(); // const_cast } - else - tcItem.pszText = (char *) NULL; if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) { - wxLogError("Can't create the notebook page '%s'.", strText.c_str()); + wxLogError(wxT("Can't create the notebook page '%s'."), strText.c_str()); + return FALSE; } + // if the inserted page is before the selected one, we must update the + // index of the selected page + if ( nPage <= m_nSelection ) + { + // one extra page added + m_nSelection++; + } + // 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 + // don't show pages by default (we'll need to adjust their size first) + 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); + + // 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); + 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; if ( bSelect ) - m_nSelection = nPage; + selNew = nPage; else if ( m_nSelection == -1 ) - m_nSelection = 0; + selNew = 0; - // don't show pages by default (we'll need to adjust their size first) - HWND hwnd = (HWND)pPage->GetHWND(); - SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~WS_VISIBLE); + if ( selNew != -1 ) + SetSelection(selNew); return TRUE; } @@ -383,14 +444,6 @@ bool wxNotebook::InsertPage(int nPage, void wxNotebook::OnSize(wxSizeEvent& event) { - // make sure the current page is shown and has focus (it's useful because all - // pages are created invisible initially) - if ( m_nSelection != -1 ) { - wxNotebookPage *pPage = m_aPages[m_nSelection]; - pPage->Show(TRUE); - pPage->SetFocus(); - } - // fit the notebook page to the tab control's display area RECT rc; rc.left = rc.top = 0; @@ -401,8 +454,6 @@ void wxNotebook::OnSize(wxSizeEvent& event) 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(); @@ -412,7 +463,21 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) { // is it our tab control? if ( event.GetEventObject() == this ) - ChangePage(event.GetOldSelection(), event.GetSelection()); + { + 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,11 +524,6 @@ bool wxNotebook::DoPhase(int /* nPhase */) return TRUE; } -void wxNotebook::Command(wxCommandEvent& event) -{ - wxFAIL_MSG("wxNotebook::Command not implemented"); -} - bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) { wxNotebookEvent event(wxEVT_NULL, m_windowId); @@ -496,7 +556,8 @@ bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) // wxNotebook helper functions // ---------------------------------------------------------------------------- -// hide the currently active panel and show the new one +// generate the page changing and changed events, hide the currently active +// panel and show the new one void wxNotebook::ChangePage(int nOldSel, int nSel) { // MT-FIXME should use a real semaphore @@ -525,29 +586,8 @@ void wxNotebook::ChangePage(int nOldSel, int nSel) return; } - if ( nOldSel != -1 ) - m_aPages[nOldSel]->Show(FALSE); - - wxNotebookPage *pPage = m_aPages[nSel]; - pPage->Show(TRUE); - pPage->SetFocus(); - event.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); ProcessEvent(event); - 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)); -} -