AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. added support for bitmaps with alpha channel

Browse Source 
2. use GtkImage instead of deprecated GtkPixmap with GTK2
3. create bogus pixmap instead of GtkLabel in wxStaticBitmap with invalid bitmap


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2004-08-21 22:41:04 +00:00
parent b0bfd387ff
commit 4fab71288e
6 changed files with 120 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/statbmp.h
View File

@ -56,9 +56,6 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
private: private:
// creates the new pixmap widget
void CreatePixmapWidget();
wxBitmap m_bitmap; wxBitmap m_bitmap;
DECLARE_DYNAMIC_CLASS(wxStaticBitmap) DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

3
include/wx/gtk1/statbmp.h
View File

@ -56,9 +56,6 @@ public:
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
private: private:
// creates the new pixmap widget
void CreatePixmapWidget();
wxBitmap m_bitmap; wxBitmap m_bitmap;
DECLARE_DYNAMIC_CLASS(wxStaticBitmap) DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

22
src/gtk/bmpbuttn.cpp
View File

@ -236,14 +236,30 @@ void wxBitmapButton::OnSetBitmap()
if (child == NULL) if (child == NULL)
{ {
// initial bitmap // initial bitmap
GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); GtkWidget *pixmap;
#ifdef __WXGTK20__
if (the_one.HasPixbuf())
pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
else
pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
#else
pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
#endif
gtk_widget_show(pixmap); gtk_widget_show(pixmap);
gtk_container_add(GTK_CONTAINER(m_widget), pixmap); gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
} }
else else
{ // subsequent bitmaps { // subsequent bitmaps
GtkPixmap *g_pixmap = GTK_PIXMAP(child); #ifdef __WXGTK20__
gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask); GtkImage *pixmap = GTK_IMAGE(child);
if (the_one.HasPixbuf())
gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
else
gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
#else
GtkPixmap *pixmap = GTK_PIXMAP(child);
gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);
#endif
} }
} }

94
src/gtk/statbmp.cpp
View File

@ -38,24 +38,14 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
Create( parent, id, bitmap, pos, size, style, name ); Create( parent, id, bitmap, pos, size, style, name );
} }
void wxStaticBitmap::CreatePixmapWidget() #ifndef __WXGTK20__
{ // empty bitmap, so that we can create GtkPixmap widget:
wxCHECK_RET( m_bitmap.Ok(), wxT("should only be called if we have a bitmap") ); static char * bogus_xpm[] = {
"2 2 1 1",
GdkBitmap *mask = (GdkBitmap *) NULL; " c None",
if ( m_bitmap.GetMask() ) " ",
mask = m_bitmap.GetMask()->GetBitmap(); " "};
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask ); #endif
// insert GTK representation
(*m_parent->m_insertCallback)(m_parent, this);
gtk_widget_show( m_widget );
m_focusWidget = m_widget;
PostCreation(wxDefaultSize);
}
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
@ -66,52 +56,50 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{ {
wxFAIL_MSG( wxT("wxXX creation failed") ); wxFAIL_MSG( wxT("wxStaticBitmap creation failed") );
return FALSE; return false;
} }
m_bitmap = bitmap; m_bitmap = bitmap;
#ifdef __WXGTK20__
m_widget = gtk_image_new();
#else
wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm));
m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);
#endif
if (bitmap.Ok())
SetBitmap(bitmap);
PostCreation(size);
m_parent->DoAddChild( this );
return true;
}
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
{
m_bitmap = bitmap;
if (m_bitmap.Ok()) if (m_bitmap.Ok())
{ {
GdkBitmap *mask = (GdkBitmap *) NULL; GdkBitmap *mask = (GdkBitmap *) NULL;
if ( m_bitmap.GetMask() ) if (m_bitmap.GetMask())
mask = m_bitmap.GetMask()->GetBitmap(); mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
} #ifdef __WXGTK20__
else if (m_bitmap.HasPixbuf())
{
m_widget = gtk_label_new( "Bitmap" );
m_focusWidget = m_widget;
}
PostCreation(size);
m_parent->DoAddChild( this );
return TRUE;
}
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
{
bool hasWidget = m_bitmap.Ok();
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
if (!hasWidget)
{ {
gtk_widget_destroy( m_widget ); gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
m_bitmap.GetPixbuf());
/* recreate m_widget because we've created a label
and not a bitmap above */
CreatePixmapWidget();
} }
else else
{ gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),
GdkBitmap *mask = (GdkBitmap *) NULL; m_bitmap.GetPixmap(), mask);
if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); #else
gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
} #endif
InvalidateBestSize(); InvalidateBestSize();
SetSize(GetBestSize()); SetSize(GetBestSize());

22
src/gtk1/bmpbuttn.cpp
View File

@ -236,14 +236,30 @@ void wxBitmapButton::OnSetBitmap()
if (child == NULL) if (child == NULL)
{ {
// initial bitmap // initial bitmap
GtkWidget *pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask); GtkWidget *pixmap;
#ifdef __WXGTK20__
if (the_one.HasPixbuf())
pixmap = gtk_image_new_from_pixbuf(the_one.GetPixbuf());
else
pixmap = gtk_image_new_from_pixmap(the_one.GetPixmap(), mask);
#else
pixmap = gtk_pixmap_new(the_one.GetPixmap(), mask);
#endif
gtk_widget_show(pixmap); gtk_widget_show(pixmap);
gtk_container_add(GTK_CONTAINER(m_widget), pixmap); gtk_container_add(GTK_CONTAINER(m_widget), pixmap);
} }
else else
{ // subsequent bitmaps { // subsequent bitmaps
GtkPixmap *g_pixmap = GTK_PIXMAP(child); #ifdef __WXGTK20__
gtk_pixmap_set(g_pixmap, the_one.GetPixmap(), mask); GtkImage *pixmap = GTK_IMAGE(child);
if (the_one.HasPixbuf())
gtk_image_set_from_pixbuf(pixmap, the_one.GetPixbuf());
else
gtk_image_set_from_pixmap(pixmap, the_one.GetPixmap(), mask);
#else
GtkPixmap *pixmap = GTK_PIXMAP(child);
gtk_pixmap_set(pixmap, the_one.GetPixmap(), mask);
#endif
} }
} }

94
src/gtk1/statbmp.cpp
View File

@ -38,24 +38,14 @@ wxStaticBitmap::wxStaticBitmap( wxWindow *parent, wxWindowID id, const wxBitmap
Create( parent, id, bitmap, pos, size, style, name ); Create( parent, id, bitmap, pos, size, style, name );
} }
void wxStaticBitmap::CreatePixmapWidget() #ifndef __WXGTK20__
{ // empty bitmap, so that we can create GtkPixmap widget:
wxCHECK_RET( m_bitmap.Ok(), wxT("should only be called if we have a bitmap") ); static char * bogus_xpm[] = {
"2 2 1 1",
GdkBitmap *mask = (GdkBitmap *) NULL; " c None",
if ( m_bitmap.GetMask() ) " ",
mask = m_bitmap.GetMask()->GetBitmap(); " "};
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask ); #endif
// insert GTK representation
(*m_parent->m_insertCallback)(m_parent, this);
gtk_widget_show( m_widget );
m_focusWidget = m_widget;
PostCreation(wxDefaultSize);
}
bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos, const wxSize &size, const wxPoint &pos, const wxSize &size,
@ -66,52 +56,50 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bi
if (!PreCreation( parent, pos, size ) || if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{ {
wxFAIL_MSG( wxT("wxXX creation failed") ); wxFAIL_MSG( wxT("wxStaticBitmap creation failed") );
return FALSE; return false;
} }
m_bitmap = bitmap; m_bitmap = bitmap;
#ifdef __WXGTK20__
m_widget = gtk_image_new();
#else
wxBitmap bmp(bitmap.Ok() ? bitmap : wxBitmap(bogus_xpm));
m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);
#endif
if (bitmap.Ok())
SetBitmap(bitmap);
PostCreation(size);
m_parent->DoAddChild( this );
return true;
}
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
{
m_bitmap = bitmap;
if (m_bitmap.Ok()) if (m_bitmap.Ok())
{ {
GdkBitmap *mask = (GdkBitmap *) NULL; GdkBitmap *mask = (GdkBitmap *) NULL;
if ( m_bitmap.GetMask() ) if (m_bitmap.GetMask())
mask = m_bitmap.GetMask()->GetBitmap(); mask = m_bitmap.GetMask()->GetBitmap();
m_widget = gtk_pixmap_new( m_bitmap.GetPixmap(), mask );
} #ifdef __WXGTK20__
else if (m_bitmap.HasPixbuf())
{
m_widget = gtk_label_new( "Bitmap" );
m_focusWidget = m_widget;
}
PostCreation(size);
m_parent->DoAddChild( this );
return TRUE;
}
void wxStaticBitmap::SetBitmap( const wxBitmap &bitmap )
{
bool hasWidget = m_bitmap.Ok();
m_bitmap = bitmap;
if (m_bitmap.Ok())
{
if (!hasWidget)
{ {
gtk_widget_destroy( m_widget ); gtk_image_set_from_pixbuf(GTK_IMAGE(m_widget),
m_bitmap.GetPixbuf());
/* recreate m_widget because we've created a label
and not a bitmap above */
CreatePixmapWidget();
} }
else else
{ gtk_image_set_from_pixmap(GTK_IMAGE(m_widget),
GdkBitmap *mask = (GdkBitmap *) NULL; m_bitmap.GetPixmap(), mask);
if (m_bitmap.GetMask()) mask = m_bitmap.GetMask()->GetBitmap(); #else
gtk_pixmap_set( GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask ); gtk_pixmap_set(GTK_PIXMAP(m_widget), m_bitmap.GetPixmap(), mask);
} #endif
InvalidateBestSize(); InvalidateBestSize();
SetSize(GetBestSize()); SetSize(GetBestSize());