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

added alpha channel support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-22 19:36:37 +00:00
parent 61ba12f043
commit ab86c659ac
2 changed files with 60 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/gtk/tbargtk.cpp
View File

@@ -128,6 +128,25 @@ public:
} }
} }
void SetPixmap(const wxBitmap& bitmap)
{
if (bitmap.Ok())
{
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
#ifdef __WXGTK20__
if (bitmap.HasPixbuf())
gtk_image_set_from_pixbuf(GTK_IMAGE(m_pixmap),
bitmap.GetPixbuf());
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__
}
}
GtkWidget *m_item; GtkWidget *m_item;
GtkWidget *m_pixmap; GtkWidget *m_pixmap;
@@ -166,16 +185,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
{ {
tool->Toggle(); tool->Toggle();
wxBitmap bitmap = tool->GetBitmap(); tool->SetPixmap(tool->GetBitmap());
if ( bitmap.Ok() )
{
GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
}
if ( tool->IsRadio() && !tool->IsToggled() ) if ( tool->IsRadio() && !tool->IsToggled() )
{ {
@@ -189,16 +199,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
// revert back // revert back
tool->Toggle(); tool->Toggle();
wxBitmap bitmap = tool->GetBitmap(); tool->SetPixmap(tool->GetBitmap());
if ( bitmap.Ok() )
{
GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
}
} }
} }
@@ -393,6 +394,12 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
GtkWidget *tool_pixmap = (GtkWidget *)NULL; GtkWidget *tool_pixmap = (GtkWidget *)NULL;
#ifdef __WXGTK20__
tool_pixmap = gtk_image_new();
tool->m_pixmap = tool_pixmap;
tool->SetPixmap(bitmap);
#else
GdkPixmap *pixmap = bitmap.GetPixmap(); GdkPixmap *pixmap = bitmap.GetPixmap();
GdkBitmap *mask = (GdkBitmap *)NULL; GdkBitmap *mask = (GdkBitmap *)NULL;
@@ -401,6 +408,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 );
@@ -548,16 +556,7 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
GtkWidget *item = tool->m_item; GtkWidget *item = tool->m_item;
if ( item && GTK_IS_TOGGLE_BUTTON(item) ) if ( item && GTK_IS_TOGGLE_BUTTON(item) )
{ {
wxBitmap bitmap = tool->GetBitmap(); tool->SetPixmap(tool->GetBitmap());
if ( bitmap.Ok() )
{
GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
}
m_blockEvent = TRUE; m_blockEvent = TRUE;

59
src/gtk1/tbargtk.cpp
View File

@@ -128,6 +128,25 @@ public:
} }
} }
void SetPixmap(const wxBitmap& bitmap)
{
if (bitmap.Ok())
{
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
#ifdef __WXGTK20__
if (bitmap.HasPixbuf())
gtk_image_set_from_pixbuf(GTK_IMAGE(m_pixmap),
bitmap.GetPixbuf());
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__
}
}
GtkWidget *m_item; GtkWidget *m_item;
GtkWidget *m_pixmap; GtkWidget *m_pixmap;
@@ -166,16 +185,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
{ {
tool->Toggle(); tool->Toggle();
wxBitmap bitmap = tool->GetBitmap(); tool->SetPixmap(tool->GetBitmap());
if ( bitmap.Ok() )
{
GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
}
if ( tool->IsRadio() && !tool->IsToggled() ) if ( tool->IsRadio() && !tool->IsToggled() )
{ {
@@ -189,16 +199,7 @@ static void gtk_toolbar_callback( GtkWidget *WXUNUSED(widget),
// revert back // revert back
tool->Toggle(); tool->Toggle();
wxBitmap bitmap = tool->GetBitmap(); tool->SetPixmap(tool->GetBitmap());
if ( bitmap.Ok() )
{
GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
}
} }
} }
@@ -393,6 +394,12 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
GtkWidget *tool_pixmap = (GtkWidget *)NULL; GtkWidget *tool_pixmap = (GtkWidget *)NULL;
#ifdef __WXGTK20__
tool_pixmap = gtk_image_new();
tool->m_pixmap = tool_pixmap;
tool->SetPixmap(bitmap);
#else
GdkPixmap *pixmap = bitmap.GetPixmap(); GdkPixmap *pixmap = bitmap.GetPixmap();
GdkBitmap *mask = (GdkBitmap *)NULL; GdkBitmap *mask = (GdkBitmap *)NULL;
@@ -401,6 +408,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 );
@@ -548,16 +556,7 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
GtkWidget *item = tool->m_item; GtkWidget *item = tool->m_item;
if ( item && GTK_IS_TOGGLE_BUTTON(item) ) if ( item && GTK_IS_TOGGLE_BUTTON(item) )
{ {
wxBitmap bitmap = tool->GetBitmap(); tool->SetPixmap(tool->GetBitmap());
if ( bitmap.Ok() )
{
GtkPixmap *pixmap = GTK_PIXMAP( tool->m_pixmap );
GdkBitmap *mask = bitmap.GetMask() ? bitmap.GetMask()->GetBitmap()
: (GdkBitmap *)NULL;
gtk_pixmap_set( pixmap, bitmap.GetPixmap(), mask );
}
m_blockEvent = TRUE; m_blockEvent = TRUE;