X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc1efb1d9f4e4ce7d8f889dad3aaab7026b73058..a83ea9c15a7ac7bbdc6686164cfcbbc21ae5031a:/src/motif/statbmp.cpp?ds=sidebyside diff --git a/src/motif/statbmp.cpp b/src/motif/statbmp.cpp index 3d35638883..215a77c3d3 100644 --- a/src/motif/statbmp.cpp +++ b/src/motif/statbmp.cpp @@ -9,10 +9,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "statbmp.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/defs.h" + #include "wx/statbmp.h" #ifdef __VMS__ @@ -21,7 +26,6 @@ #include #include #include -#include #ifdef __VMS__ #pragma message enable nosimpint #endif @@ -41,18 +45,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, long style, const wxString& name) { - m_messageBitmap = bitmap; - SetName(name); - m_backgroundColour = parent->GetBackgroundColour(); - m_foregroundColour = parent->GetForegroundColour(); - if (parent) parent->AddChild(this); + if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator, + name ) ) + return false; - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - m_windowStyle = style; + m_messageBitmap = bitmap; + m_messageBitmapOriginal = bitmap; Widget parentWidget = (Widget) parent->GetClientWidget(); @@ -65,26 +63,22 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id, XmNalignment, XmALIGNMENT_BEGINNING, NULL); - XtVaSetValues ((Widget) m_mainWidget, - XmNlabelPixmap, (Pixmap) ((wxBitmap&)bitmap).GetLabelPixmap (m_mainWidget), - XmNlabelType, XmPIXMAP, - NULL); + ChangeBackgroundColour (); - m_font = parent->GetFont(); - ChangeFont(FALSE); + DoSetBitmap(); - SetCanAddEventHandler(TRUE); + ChangeFont(FALSE); wxSize actualSize(size); + // work around the cases where the bitmap is a wxNull(Icon/Bitmap) if (actualSize.x == -1) - actualSize.x = bitmap.GetWidth(); + actualSize.x = bitmap.Ok() ? bitmap.GetWidth() : 1; if (actualSize.y == -1) - actualSize.y = bitmap.GetHeight(); - AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, actualSize.x, actualSize.y); + actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1; + AttachWidget (parent, m_mainWidget, (WXWidget) NULL, + pos.x, pos.y, actualSize.x, actualSize.y); - ChangeBackgroundColour (); - - return TRUE; + return true; } wxStaticBitmap::~wxStaticBitmap() @@ -92,27 +86,46 @@ wxStaticBitmap::~wxStaticBitmap() SetBitmap(wxNullBitmap); } -void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) +void wxStaticBitmap::DoSetBitmap() { - m_messageBitmap = bitmap; - Widget widget = (Widget) m_mainWidget; - int x, y, w1, h1, w2, h2; - - GetPosition(&x, &y); + int w2, h2; - if (bitmap.Ok()) + if (m_messageBitmapOriginal.Ok()) { - w2 = bitmap.GetWidth(); - h2 = bitmap.GetHeight(); + w2 = m_messageBitmapOriginal.GetWidth(); + h2 = m_messageBitmapOriginal.GetHeight(); + + Pixmap pixmap; + + // Must re-make the bitmap to have its transparent areas drawn + // in the current widget background colour. + if (m_messageBitmapOriginal.GetMask()) + { + int backgroundPixel; + XtVaGetValues( widget, XmNbackground, &backgroundPixel, + NULL); + + wxColour col; + col.SetPixel(backgroundPixel); + + wxBitmap newBitmap = wxCreateMaskedBitmap(m_messageBitmapOriginal, col); + m_messageBitmap = newBitmap; + + pixmap = (Pixmap) m_messageBitmap.GetDrawable(); + } + else + { + m_bitmapCache.SetBitmap( m_messageBitmap ); + pixmap = (Pixmap)m_bitmapCache.GetLabelPixmap(widget); + } + XtVaSetValues (widget, - XmNlabelPixmap, ((wxBitmap&)bitmap).GetLabelPixmap (widget), + XmNlabelPixmap, pixmap, XmNlabelType, XmPIXMAP, NULL); - GetSize(&w1, &h1); - if (! (w1 == w2) && (h1 == h2)) - SetSize(x, y, w2, h2); + SetSize(w2, h2); } else { @@ -122,21 +135,29 @@ void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) XmNlabelType, XmSTRING, XmNlabelPixmap, XmUNSPECIFIED_PIXMAP, NULL); - } + } } -void wxStaticBitmap::ChangeFont(bool keepOriginalSize) +void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap) { - wxWindow::ChangeFont(keepOriginalSize); + m_messageBitmap = bitmap; + m_messageBitmapOriginal = bitmap; + + DoSetBitmap(); } void wxStaticBitmap::ChangeBackgroundColour() { wxWindow::ChangeBackgroundColour(); + + // must recalculate the background colour + m_bitmapCache.SetColoursChanged(); + DoSetBitmap(); } void wxStaticBitmap::ChangeForegroundColour() { + m_bitmapCache.SetColoursChanged(); wxWindow::ChangeForegroundColour(); }