X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60d5c563d29ef0d99cdcfb5ac235f62f64476002..53f1a5b1bd6b98ead146526c5346f655056f0216:/src/os2/notebook.cpp?ds=sidebyside

diff --git a/src/os2/notebook.cpp b/src/os2/notebook.cpp
index f0a88c0c6a..aefab123b2 100644
--- a/src/os2/notebook.cpp
+++ b/src/os2/notebook.cpp
@@ -4,7 +4,6 @@
 // Author:      David Webster
 // Modified by:
 // Created:     10/12/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -60,8 +59,6 @@ BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 
-IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -75,7 +72,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxBookCtrlBase)
 //
 void wxNotebook::Init()
 {
-    m_imageList  = NULL;
     m_nTabSize   = 0;
 } // end of wxNotebook::Init
 
@@ -211,7 +207,7 @@ int wxNotebook::SetSelection( size_t nPage )
 
     if (nPage != (size_t)m_selection)
     {
-        wxBookCtrlEvent             vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
+        wxBookCtrlEvent             vEvent( wxEVT_NOTEBOOK_PAGE_CHANGING
                                            ,m_windowId
                                           );
 
@@ -224,7 +220,7 @@ int wxNotebook::SetSelection( size_t nPage )
             //
             // Program allows the page change
             //
-            vEvent.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
+            vEvent.SetEventType(wxEVT_NOTEBOOK_PAGE_CHANGED);
             HandleWindowEvent(vEvent);
 
             ::WinSendMsg( GetHWND()
@@ -327,7 +323,7 @@ bool wxNotebook::SetPageImage (
 , int                               nImage
 )
 {
-    wxBitmap                        vBitmap = (wxBitmap)m_imageList->GetBitmap(nImage);
+    wxBitmap                        vBitmap = (wxBitmap)GetImageList()->GetBitmap(nImage);
 
     return (bool)::WinSendMsg( GetHWND()
                               ,BKM_SETTABBITMAP