Return an invalid item from wxDataViewCtrl::GetItemByRow() for invalid rows.

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

diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp
index 9018d387024c98844609c8d67052dcca4205dcb8..5406419a13286baac57c00c6be0911a7714dfc8b 100644 (file)
--- a/src/gtk1/notebook.cpp
+++ b/src/gtk1/notebook.cpp
@@ -289,7 +289,6 @@ void wxNotebook::Init()
     m_padding = 0;
     m_inSwitchPage = false;
 
-    m_imageList = NULL;
     m_themeEnabled = true;
 }
 
@@ -511,10 +510,10 @@ bool wxNotebook::SetPageImage( size_t page, int image )
     }
 
     /* Only cases 3) and 4) left */
-    wxASSERT( m_imageList != NULL ); /* Just in case */
+    wxASSERT( HasImageList() ); /* Just in case */
 
     /* 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() )
@@ -680,9 +679,9 @@ bool wxNotebook::InsertPage( size_t position,
 
     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() )