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

Fix wxGTK1 build after wxBitmapBundle changes in wxStaticBitmap

Browse Source 
This should have been done in 3abec9254f (Take wxBitmapBundle in
wxStaticBitmap::SetBitmap(), 2021-10-21) but was forgotten there.
This commit is contained in:
Vadim Zeitlin
2021-11-26 18:31:19 +01:00
parent 7ba71ecaa2
commit c5f023a829
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ public:
long style = 0, long style = 0,
const wxString& name = wxASCII_STR(wxStaticBitmapNameStr)); const wxString& name = wxASCII_STR(wxStaticBitmapNameStr));
virtual void SetBitmapBundle( const wxBitmapBundle& bitmap ); virtual void SetBitmap( const wxBitmapBundle& bitmap );
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

14
src/gtk1/statbmp.cpp
View File

@@ -51,14 +51,14 @@ bool wxStaticBitmap::Create( wxWindow *parent, wxWindowID id, const wxBitmapBund
return false; return false;
} }
m_bitmap = bitmap;
m_bitmapBundle = bitmap;
wxBitmap bmp(bitmap.IsOk() ? bitmap : wxBitmap(bogus_xpm));
m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);
if (bitmap.IsOk()) if (bitmap.IsOk())
SetBitmap(bitmap); {
m_bitmap = bitmap.GetBitmapFor(this);
m_bitmapBundle = bitmap;
}
wxBitmap bmp(m_bitmap.IsOk() ? m_bitmap : wxBitmap(bogus_xpm));
m_widget = gtk_pixmap_new(bmp.GetPixmap(), NULL);
PostCreation(size); PostCreation(size);
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );