Add missing WXK constants for the control keys

[wxWidgets.git] / src / gtk1 / notebook.cpp

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 780ef4d3db75371b4897f2bf08665904e2ab351f..5406419a13286baac57c00c6be0911a7714dfc8b 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -100,7 +100,7 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 
     if (notebook->m_skipNextPageChangeEvent)
     {
 
     if (notebook->m_skipNextPageChangeEvent)
     {

-        // this event was programatically generated by ChangeSelection() and thus must
+        // this event was programmatically generated by ChangeSelection() and thus must

         // be skipped
         notebook->m_skipNextPageChangeEvent = false;
 
         // be skipped
         notebook->m_skipNextPageChangeEvent = false;
 


@@ -280,8 +280,6 @@ static void wxInsertChildInNotebook( wxNotebook* parent, wxWindow* child )
 // wxNotebook
 //-----------------------------------------------------------------------------
 
 // wxNotebook
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxBookCtrlBase)
-

 BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(wxNotebook, wxBookCtrlBase)
     EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
 END_EVENT_TABLE()


@@ -291,7 +289,6 @@ void wxNotebook::Init()
     m_padding = 0;
     m_inSwitchPage = false;
 
     m_padding = 0;
     m_inSwitchPage = false;
 

-    m_imageList = NULL;

     m_themeEnabled = true;
 }
 
     m_themeEnabled = true;
 }
 


@@ -513,10 +510,10 @@ bool wxNotebook::SetPageImage( size_t page, int image )
     }
 
     /* Only cases 3) and 4) left */
     }
 
     /* Only cases 3) and 4) left */

-    wxASSERT( m_imageList != NULL ); /* Just in case */
+    wxASSERT( HasImageList() ); /* Just in case */

 
     /* Construct the new pixmap */
 
     /* Construct the new pixmap */

-    const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);
+    const wxBitmap *bmp = GetImageList()->GetBitmapPtr(image);

     GdkPixmap *pixmap = bmp->GetPixmap();
     GdkBitmap *mask = NULL;
     if ( bmp->GetMask() )
     GdkPixmap *pixmap = bmp->GetPixmap();
     GdkBitmap *mask = NULL;
     if ( bmp->GetMask() )


@@ -682,9 +679,9 @@ bool wxNotebook::InsertPage( size_t position,
 
     if (imageId != -1)
     {
 
     if (imageId != -1)
     {

-        wxASSERT( m_imageList != NULL );
+        wxASSERT( HasImageList() );

 
 

-        const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);
+        const wxBitmap *bmp = GetImageList()->GetBitmapPtr(imageId);

         GdkPixmap *pixmap = bmp->GetPixmap();
         GdkBitmap *mask = NULL;
         if ( bmp->GetMask() )
         GdkPixmap *pixmap = bmp->GetPixmap();
         GdkBitmap *mask = NULL;
         if ( bmp->GetMask() )