projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix recreating of wxBitmapComboBox using untyped client data.
[wxWidgets.git]
/
src
/
motif
/
statbmp.cpp
diff --git
a/src/motif/statbmp.cpp
b/src/motif/statbmp.cpp
index a226685b38fcb57425393d26ea69114cce43e885..aef55fb64be83c53160dfcd21714fba30f80c0ec 100644
(file)
--- a/
src/motif/statbmp.cpp
+++ b/
src/motif/statbmp.cpp
@@
-1,19
+1,15
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: statbmp.cpp
+// Name: s
rc/motif/s
tatbmp.cpp
// Purpose: wxStaticBitmap
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Purpose: wxStaticBitmap
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "statbmp.h"
-#endif
-
-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/statbmp.h"
#include "wx/statbmp.h"
@@
-29,8
+25,6
@@
#include "wx/motif/private.h"
#include "wx/motif/private.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
/*
* wxStaticBitmap
*/
/*
* wxStaticBitmap
*/
@@
-45,6
+39,7
@@
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator,
name ) )
return false;
if( !CreateControl( parent, id, pos, size, style, wxDefaultValidator,
name ) )
return false;
+ PreCreation();
m_messageBitmap = bitmap;
m_messageBitmapOriginal = bitmap;
m_messageBitmap = bitmap;
m_messageBitmapOriginal = bitmap;
@@
-52,7
+47,7
@@
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
Widget parentWidget = (Widget) parent->GetClientWidget();
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
Widget parentWidget = (Widget) parent->GetClientWidget();
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("staticBitmap",
-#if USE_GADGETS
+#if
wx
USE_GADGETS
xmLabelGadgetClass, parentWidget,
#else
xmLabelWidgetClass, parentWidget,
xmLabelGadgetClass, parentWidget,
#else
xmLabelWidgetClass, parentWidget,
@@
-60,18
+55,15
@@
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
XmNalignment, XmALIGNMENT_BEGINNING,
NULL);
XmNalignment, XmALIGNMENT_BEGINNING,
NULL);
- ChangeBackgroundColour ();
-
- DoSetBitmap();
-
- ChangeFont(FALSE);
-
wxSize actualSize(size);
// work around the cases where the bitmap is a wxNull(Icon/Bitmap)
if (actualSize.x == -1)
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.
IsOk
() ? bitmap.GetWidth() : 1;
if (actualSize.y == -1)
if (actualSize.y == -1)
- actualSize.y = bitmap.GetHeight() ? bitmap.GetHeight() : 1;
+ actualSize.y = bitmap.IsOk() ? bitmap.GetHeight() : 1;
+
+ PostCreation();
+ DoSetBitmap();
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, actualSize.x, actualSize.y);
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, actualSize.x, actualSize.y);
@@
-86,11
+78,9
@@
wxStaticBitmap::~wxStaticBitmap()
void wxStaticBitmap::DoSetBitmap()
{
Widget widget = (Widget) m_mainWidget;
void wxStaticBitmap::DoSetBitmap()
{
Widget widget = (Widget) m_mainWidget;
- int
x, y, w1, h1,
w2, h2;
+ int w2, h2;
- GetPosition(&x, &y);
-
- if (m_messageBitmapOriginal.Ok())
+ if (m_messageBitmapOriginal.IsOk())
{
w2 = m_messageBitmapOriginal.GetWidth();
h2 = m_messageBitmapOriginal.GetHeight();
{
w2 = m_messageBitmapOriginal.GetWidth();
h2 = m_messageBitmapOriginal.GetHeight();
@@
-101,7
+91,7
@@
void wxStaticBitmap::DoSetBitmap()
// in the current widget background colour.
if (m_messageBitmapOriginal.GetMask())
{
// in the current widget background colour.
if (m_messageBitmapOriginal.GetMask())
{
-
int
backgroundPixel;
+
WXPixel
backgroundPixel;
XtVaGetValues( widget, XmNbackground, &backgroundPixel,
NULL);
XtVaGetValues( widget, XmNbackground, &backgroundPixel,
NULL);
@@
-123,10
+113,8
@@
void wxStaticBitmap::DoSetBitmap()
XmNlabelPixmap, pixmap,
XmNlabelType, XmPIXMAP,
NULL);
XmNlabelPixmap, pixmap,
XmNlabelType, XmPIXMAP,
NULL);
- GetSize(&w1, &h1);
- if (! (w1 == w2) && (h1 == h2))
- SetSize(x, y, w2, h2);
+ SetSize(w2, h2);
}
else
{
}
else
{
@@
-136,7
+124,7
@@
void wxStaticBitmap::DoSetBitmap()
XmNlabelType, XmSTRING,
XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
NULL);
XmNlabelType, XmSTRING,
XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
NULL);
- }
+ }
}
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
}
void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
@@
-161,4
+149,3
@@
void wxStaticBitmap::ChangeForegroundColour()
m_bitmapCache.SetColoursChanged();
wxWindow::ChangeForegroundColour();
}
m_bitmapCache.SetColoursChanged();
wxWindow::ChangeForegroundColour();
}
-