#include <Xm/Xm.h>
#include <Xm/Label.h>
#include <Xm/LabelG.h>
-#include <Xm/RowColumn.h>
#ifdef __VMS__
#pragma message enable nosimpint
#endif
long style,
const wxString& name)
{
+ if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator,
+ name ) )
+ return false;
+
m_messageBitmap = bitmap;
m_messageBitmapOriginal = bitmap;
- SetName(name);
- m_backgroundColour = parent->GetBackgroundColour();
- m_foregroundColour = parent->GetForegroundColour();
- if (parent) parent->AddChild(this);
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- m_windowStyle = style;
Widget parentWidget = (Widget) parent->GetClientWidget();
DoSetBitmap();
- m_font = parent->GetFont();
ChangeFont(FALSE);
- SetCanAddEventHandler(TRUE);
-
wxSize actualSize(size);
// work around the cases where the bitmap is a wxNull(Icon/Bitmap)
if (actualSize.x == -1)
- actualSize.x = bitmap.GetWidth() ? bitmap.GetWidth() : 1;
+ actualSize.x = bitmap.Ok() ? bitmap.GetWidth() : 1;
if (actualSize.y == -1)
- actualSize.y = bitmap.GetHeight() ? bitmap.GetHeight() : 1;
- 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);
- return TRUE;
+ return true;
}
wxStaticBitmap::~wxStaticBitmap()
void wxStaticBitmap::DoSetBitmap()
{
Widget widget = (Widget) m_mainWidget;
- int x, y, w1, h1, w2, h2;
-
- GetPosition(&x, &y);
+ int w2, h2;
if (m_messageBitmapOriginal.Ok())
{
wxBitmap newBitmap = wxCreateMaskedBitmap(m_messageBitmapOriginal, col);
m_messageBitmap = newBitmap;
- pixmap = (Pixmap) m_messageBitmap.GetPixmap();
+ pixmap = (Pixmap) m_messageBitmap.GetDrawable();
}
else
- pixmap = (Pixmap) m_messageBitmap.GetLabelPixmap(widget);
+ {
+ m_bitmapCache.SetBitmap( m_messageBitmap );
+ pixmap = (Pixmap)m_bitmapCache.GetLabelPixmap(widget);
+ }
XtVaSetValues (widget,
XmNlabelPixmap, pixmap,
XmNlabelType, XmPIXMAP,
NULL);
- GetSize(&w1, &h1);
- if (! (w1 == w2) && (h1 == h2))
- SetSize(x, y, w2, h2);
+ SetSize(w2, h2);
}
else
{
DoSetBitmap();
}
-void wxStaticBitmap::ChangeFont(bool keepOriginalSize)
-{
- wxWindow::ChangeFont(keepOriginalSize);
-}
-
void wxStaticBitmap::ChangeBackgroundColour()
{
wxWindow::ChangeBackgroundColour();
// must recalculate the background colour
+ m_bitmapCache.SetColoursChanged();
DoSetBitmap();
}
void wxStaticBitmap::ChangeForegroundColour()
{
+ m_bitmapCache.SetColoursChanged();
wxWindow::ChangeForegroundColour();
}