X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdf1e7142564c55f5299f1f2d0909090534eb97c..1a787c5dc89b1cb6a9ddb4ebef3ad2fb24b49c8c:/src/os2/notebook.cpp diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp index 6355b3d9de..82ebe9a138 100644 --- a/src/os2/notebook.cpp +++ b/src/os2/notebook.cpp @@ -2,7 +2,7 @@ // Name: notebook.cpp // Purpose: implementation of wxNotebook // Author: David Webster -// Modified by: +// Modified by: // Created: 10/12/99 // RCS-ID: $Id$ // Copyright: (c) David Webster @@ -56,7 +56,6 @@ // event table // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARIES BEGIN_EVENT_TABLE(wxNotebook, wxControl) EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange) EVT_SIZE(wxNotebook::OnSize) @@ -66,7 +65,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxNotifyEvent) -#endif // ============================================================================ // implementation @@ -115,7 +113,7 @@ bool wxNotebook::Create(wxWindow *parent, return FALSE; // colors and font - m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE)); +// TODO: m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE)); m_foregroundColour = *wxBLACK ; // TODO: @@ -139,7 +137,7 @@ bool wxNotebook::Create(wxWindow *parent, tabStyle |= TCS_VERTICAL; 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, @@ -233,7 +231,7 @@ bool wxNotebook::SetPageImage(int nPage, int nImage) } void wxNotebook::SetImageList(wxImageList* imageList) -{ +{ m_pImageList = imageList; // TODO } @@ -309,7 +307,7 @@ bool wxNotebook::InsertPage(int nPage, // 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; @@ -365,7 +363,7 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) int sel = event.GetOldSelection(); if ( sel != -1 ) m_aPages[sel]->Show(FALSE); - + sel = event.GetSelection(); if ( sel != -1 ) { @@ -373,7 +371,7 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event) pPage->Show(TRUE); pPage->SetFocus(); } - + m_nSelection = sel; } // we want to give others a chance to process this message as well @@ -440,13 +438,13 @@ bool wxNotebook::OS2OnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result) return wxControl::MSWOnNotify(idCtrl, lParam, result); } */ - event.SetSelection(TabCtrl_GetCurSel(m_hwnd)); +// TODO: event.SetSelection(TabCtrl_GetCurSel(m_hwnd)); event.SetOldSelection(m_nSelection); event.SetEventObject(this); event.SetInt(idCtrl); bool processed = GetEventHandler()->ProcessEvent(event); - *result = !event.IsAllowed(); +// TODO: *result = !event.IsAllowed(); return processed; }