X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cb43b372fb1567caf7ccfa523aca10c676ceaec4..f135ff73b4b0b7c76a1fa3396f768c44f8dc204f:/src/gtk1/notebook.cpp diff --git a/src/gtk1/notebook.cpp b/src/gtk1/notebook.cpp index d9b2bbc090..f006c328a0 100644 --- a/src/gtk1/notebook.cpp +++ b/src/gtk1/notebook.cpp @@ -2,9 +2,8 @@ // Name: notebook.cpp // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Id: $id$ +// Copyright: (c) 1998 Robert Roebling, Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -351,10 +350,14 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text, { wxASSERT( m_imageList != NULL ); - wxBitmap *bmp = m_imageList->GetBitmap(imageId); + const wxBitmap *bmp = m_imageList->GetBitmap(imageId); GdkPixmap *pixmap = bmp->GetPixmap(); GdkBitmap *mask = (GdkBitmap*) NULL; - if (bmp->GetMask()) mask = bmp->GetMask()->GetBitmap(); + if ( bmp->GetMask() ) + { + mask = bmp->GetMask()->GetBitmap(); + } + GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask ); gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);