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

Use GtkPixmap instead of GtkImage as the latter incorrectly

Browse Source 
displays greyed images for some reason.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-03-07 17:19:02 +00:00
parent 499bbaeba3
commit f05e0979c2
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/tbargtk.cpp
View File

@@ -136,14 +136,10 @@ public:
: (GdkBitmap *)NULL; : (GdkBitmap *)NULL;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if (bitmap.HasPixbuf()) if (bitmap.HasPixbuf())
gtk_image_set_from_pixbuf(GTK_IMAGE(m_pixmap), gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() );
bitmap.GetPixbuf());
else else
gtk_image_set_from_pixmap(GTK_IMAGE(m_pixmap),
bitmap.GetPixmap(), mask);
#else
gtk_pixmap_set(GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask);
#endif // !__WXGTK20__ #endif // !__WXGTK20__
gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
} }
} }
@@ -396,10 +392,15 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if (bitmap.HasPixbuf())
{
tool_pixmap = gtk_image_new(); tool_pixmap = gtk_image_new();
tool->m_pixmap = tool_pixmap; tool->m_pixmap = tool_pixmap;
tool->SetPixmap(bitmap); tool->SetPixmap(bitmap);
#else }
else
#endif
{
GdkPixmap *pixmap = bitmap.GetPixmap(); GdkPixmap *pixmap = bitmap.GetPixmap();
GdkBitmap *mask = (GdkBitmap *)NULL; GdkBitmap *mask = (GdkBitmap *)NULL;
@@ -408,7 +409,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
tool_pixmap = gtk_pixmap_new( pixmap, mask ); tool_pixmap = gtk_pixmap_new( pixmap, mask );
gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE ); gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
#endif }
gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );

17
src/gtk1/tbargtk.cpp
View File

@@ -136,14 +136,10 @@ public:
: (GdkBitmap *)NULL; : (GdkBitmap *)NULL;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if (bitmap.HasPixbuf()) if (bitmap.HasPixbuf())
gtk_image_set_from_pixbuf(GTK_IMAGE(m_pixmap), gtk_image_set_from_pixbuf( GTK_IMAGE(m_pixmap), bitmap.GetPixbuf() );
bitmap.GetPixbuf());
else else
gtk_image_set_from_pixmap(GTK_IMAGE(m_pixmap),
bitmap.GetPixmap(), mask);
#else
gtk_pixmap_set(GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask);
#endif // !__WXGTK20__ #endif // !__WXGTK20__
gtk_pixmap_set( GTK_PIXMAP(m_pixmap), bitmap.GetPixmap(), mask );
} }
} }
@@ -396,10 +392,15 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
#ifdef __WXGTK20__ #ifdef __WXGTK20__
if (bitmap.HasPixbuf())
{
tool_pixmap = gtk_image_new(); tool_pixmap = gtk_image_new();
tool->m_pixmap = tool_pixmap; tool->m_pixmap = tool_pixmap;
tool->SetPixmap(bitmap); tool->SetPixmap(bitmap);
#else }
else
#endif
{
GdkPixmap *pixmap = bitmap.GetPixmap(); GdkPixmap *pixmap = bitmap.GetPixmap();
GdkBitmap *mask = (GdkBitmap *)NULL; GdkBitmap *mask = (GdkBitmap *)NULL;
@@ -408,7 +409,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
tool_pixmap = gtk_pixmap_new( pixmap, mask ); tool_pixmap = gtk_pixmap_new( pixmap, mask );
gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE ); gtk_pixmap_set_build_insensitive( GTK_PIXMAP(tool_pixmap), TRUE );
#endif }
gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 ); gtk_misc_set_alignment( GTK_MISC(tool_pixmap), 0.5, 0.5 );