added an error message if a bitmap can't be addedto the image list

[wxWidgets.git] / src / motif / bmpbuttn.cpp

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 9f8f221f7bdd0c09bc40eb68c1534317cbe56fc4..9d30cc7d6c047d38a9cdd119b05f2b4258ca0aa2 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -56,10 +56,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     m_marginX = 0;
     m_marginY = 0;
 
+/*
     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;
+*/
 
     if (id == -1)
         m_windowId = NewControlId();
@@ -90,6 +92,9 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
     m_mainWidget = (WXWidget) buttonWidget;
 
+    m_windowFont = parent->GetFont();
+    ChangeFont(FALSE);
+
     ChangeBackgroundColour ();
 
     DoSetBitmap();
@@ -100,9 +105,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
-    SetFont(* parent->GetFont());
-
-
     return TRUE;
 }