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

replace use of deprecated GtkPixmap, gtk_container_border_width

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-15 04:36:31 +00:00
parent 83b96a06ca
commit d41e1ab481
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gtk/notebook.cpp
View File

@@ -18,7 +18,6 @@
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/panel.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#endif #endif
@@ -26,12 +25,6 @@
#include "wx/imaglist.h" #include "wx/imaglist.h"
#include "wx/fontutil.h" #include "wx/fontutil.h"
// FIXME: Use GtkImage instead of GtkPixmap. Don't use gtk_container_border_width
#include <gtk/gtkversion.h>
#ifdef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#endif
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
@@ -500,7 +493,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
GList *child = gtk_container_get_children(GTK_CONTAINER(nb_page->m_box)); GList *child = gtk_container_get_children(GTK_CONTAINER(nb_page->m_box));
while (child) while (child)
{ {
if (GTK_IS_PIXMAP(child->data)) if (GTK_IS_IMAGE(child->data))
{ {
pixmapwid = GTK_WIDGET(child->data); pixmapwid = GTK_WIDGET(child->data);
break; break;
@@ -526,17 +519,11 @@ bool wxNotebook::SetPageImage( size_t page, int image )
/* Construct the new pixmap */ /* Construct the new pixmap */
const wxBitmap *bmp = m_imageList->GetBitmapPtr(image); const wxBitmap *bmp = m_imageList->GetBitmapPtr(image);
GdkPixmap *pixmap = bmp->GetPixmap();
GdkBitmap *mask = (GdkBitmap*) NULL;
if ( bmp->GetMask() )
{
mask = bmp->GetMask()->GetBitmap();
}
if (pixmapwid == NULL) if (pixmapwid == NULL)
{ {
/* Case 3) No old pixmap. Create a new one and prepend it to the hbox */ /* Case 3) No old pixmap. Create a new one and prepend it to the hbox */
pixmapwid = gtk_pixmap_new (pixmap, mask ); pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf());
/* CHECKME: Are these pack flags okay? */ /* CHECKME: Are these pack flags okay? */
gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
@@ -545,7 +532,7 @@ bool wxNotebook::SetPageImage( size_t page, int image )
else else
{ {
/* Case 4) Simply replace the pixmap */ /* Case 4) Simply replace the pixmap */
gtk_pixmap_set(GTK_PIXMAP(pixmapwid), pixmap, mask); gtk_image_set_from_pixbuf((GtkImage*)pixmapwid, bmp->GetPixbuf());
} }
nb_page->m_image = image; nb_page->m_image = image;
@@ -679,7 +666,7 @@ bool wxNotebook::InsertPage( size_t position,
m_pages.Insert(win, position); m_pages.Insert(win, position);
nb_page->m_box = gtk_hbox_new( FALSE, 1 ); nb_page->m_box = gtk_hbox_new( FALSE, 1 );
gtk_container_border_width( GTK_CONTAINER(nb_page->m_box), 2 ); gtk_container_set_border_width((GtkContainer*)nb_page->m_box, 2);
g_signal_connect (win->m_widget, "size_allocate", g_signal_connect (win->m_widget, "size_allocate",
G_CALLBACK (gtk_page_size_callback), win); G_CALLBACK (gtk_page_size_callback), win);
@@ -696,17 +683,8 @@ bool wxNotebook::InsertPage( size_t position,
wxASSERT( m_imageList != NULL ); wxASSERT( m_imageList != NULL );
const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId); const wxBitmap *bmp = m_imageList->GetBitmapPtr(imageId);
GdkPixmap *pixmap = bmp->GetPixmap(); GtkWidget* pixmapwid = gtk_image_new_from_pixbuf(bmp->GetPixbuf());
GdkBitmap *mask = (GdkBitmap*) NULL;
if ( bmp->GetMask() )
{
mask = bmp->GetMask()->GetBitmap();
}
GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding); gtk_box_pack_start(GTK_BOX(nb_page->m_box), pixmapwid, FALSE, FALSE, m_padding);
gtk_widget_show(pixmapwid); gtk_widget_show(pixmapwid);
} }
@@ -783,7 +761,7 @@ int wxNotebook::HitTest(const wxPoint& pt, long *flags) const
GList *children = gtk_container_get_children(GTK_CONTAINER(box)); GList *children = gtk_container_get_children(GTK_CONTAINER(box));
for ( GList *child = children; child; child = child->next ) for ( GList *child = children; child; child = child->next )
{ {
if ( GTK_IS_PIXMAP(child->data) ) if (GTK_IS_IMAGE(child->data))
{ {
pixmap = GTK_WIDGET(child->data); pixmap = GTK_WIDGET(child->data);
break; break;