Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation of various notebook.cpp's.

Browse Source 
Make use of HasImageList() and GetImageList() instead of accessing the now private m_imageList directly. Fixed for wxUniv, wxGTK1, and wxOS2 (the latter 2 blindly). Changes are similar to r68856 and should have been a part of that.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2011-08-23 03:08:01 +00:00
parent f340c9ca88
commit 3f4880a451
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gtk1/notebook.cpp
View File

@@ -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() )