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_padding = 0;
m_inSwitchPage = false; m_inSwitchPage = false;
m_imageList = NULL;
m_themeEnabled = true; m_themeEnabled = true;
} }
@@ -511,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(); GdkPixmap *pixmap = bmp->GetPixmap();
GdkBitmap *mask = NULL; GdkBitmap *mask = NULL;
if ( bmp->GetMask() ) if ( bmp->GetMask() )
@@ -680,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(); GdkPixmap *pixmap = bmp->GetPixmap();
GdkBitmap *mask = NULL; GdkBitmap *mask = NULL;
if ( bmp->GetMask() ) if ( bmp->GetMask() )

3
src/os2/notebook.cpp
View File

@@ -73,7 +73,6 @@ END_EVENT_TABLE()
// //
void wxNotebook::Init() void wxNotebook::Init()
{ {
m_imageList = NULL;
m_nTabSize = 0; m_nTabSize = 0;
} // end of wxNotebook::Init } // end of wxNotebook::Init
@@ -325,7 +324,7 @@ bool wxNotebook::SetPageImage (
, int nImage , int nImage
) )
{ {
wxBitmap vBitmap = (wxBitmap)m_imageList->GetBitmap(nImage); wxBitmap vBitmap = (wxBitmap)GetImageList()->GetBitmap(nImage);
return (bool)::WinSendMsg( GetHWND() return (bool)::WinSendMsg( GetHWND()
,BKM_SETTABBITMAP ,BKM_SETTABBITMAP

12
src/univ/notebook.cpp
View File

@@ -191,8 +191,8 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage)
{ {
wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("invalid notebook page") ); wxCHECK_MSG( IS_VALID_PAGE(nPage), false, wxT("invalid notebook page") );
wxCHECK_MSG( m_imageList && nImage < m_imageList->GetImageCount(), false, wxCHECK_MSG( HasImageList() && nImage < GetImageList()->GetImageCount(),
wxT("invalid image index in SetPageImage()") ); false, wxT("invalid image index in SetPageImage()") );
if ( nImage != m_images[nPage] ) if ( nImage != m_images[nPage] )
{ {
@@ -472,15 +472,15 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
// used for wxUniversal under MSW // used for wxUniversal under MSW
#if 0 // def __WXMSW__ // FIXME #if 0 // def __WXMSW__ // FIXME
int w, h; int w, h;
m_imageList->GetSize(n, w, h); GetImageList()->GetSize(n, w, h);
bmp.Create(w, h); bmp.Create(w, h);
wxMemoryDC dc; wxMemoryDC dc;
dc.SelectObject(bmp); dc.SelectObject(bmp);
dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID)); dc.SetBackground(wxBrush(GetBackgroundColour(), wxSOLID));
m_imageList->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true); GetImageList()->Draw(image, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL, true);
dc.SelectObject(wxNullBitmap); dc.SelectObject(wxNullBitmap);
#else #else
bmp = m_imageList->GetBitmap(image); bmp = GetImageList()->GetBitmap(image);
#endif #endif
} }
@@ -829,7 +829,7 @@ wxSize wxNotebook::CalcTabSize(int page) const
if ( HasImage(page) ) if ( HasImage(page) )
{ {
wxSize sizeImage; wxSize sizeImage;
m_imageList->GetSize(m_images[page], sizeImage.x, sizeImage.y); GetImageList()->GetSize(m_images[page], sizeImage.x, sizeImage.y);
size.x += sizeImage.x + 5; // FIXME: hard coded margin size.x += sizeImage.x + 5; // FIXME: hard coded margin