X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c51a665c649f7579fb39e62070cef4f66b3210d..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index 9018d38702..5406419a13 100644 --- 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() )