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 215a77c3d333eb02383ef9f74f0254f95a6cb934..aef55fb64be83c53160dfcd21714fba30f80c0ec 100644 (file)
--- a/src/motif/statbmp.cpp
+++ b/src/motif/statbmp.cpp
@@ -1,23 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.cpp
+// Name:        src/motif/statbmp.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
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statbmp.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #include "wx/statbmp.h"
 
 #ifdef __VMS__
 #include "wx/statbmp.h"
 
 #ifdef __VMS__


@@ -32,8 +25,6 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-

 /*
  * wxStaticBitmap
  */
 /*
  * wxStaticBitmap
  */


@@ -48,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;


@@ -55,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 wxUSE_GADGETS

                     xmLabelGadgetClass, parentWidget,
 #else
                     xmLabelWidgetClass, parentWidget,
                     xmLabelGadgetClass, parentWidget,
 #else
                     xmLabelWidgetClass, parentWidget,


@@ -63,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.Ok() ? bitmap.GetWidth() : 1;
+        actualSize.x = bitmap.IsOk() ? bitmap.GetWidth() : 1;

     if (actualSize.y == -1)
     if (actualSize.y == -1)

-        actualSize.y = bitmap.Ok() ? 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);
 


@@ -91,7 +80,7 @@ void wxStaticBitmap::DoSetBitmap()
     Widget widget = (Widget) m_mainWidget;
     int w2, h2;
 
     Widget widget = (Widget) m_mainWidget;
     int w2, h2;
 

-    if (m_messageBitmapOriginal.Ok())
+    if (m_messageBitmapOriginal.IsOk())

     {
         w2 = m_messageBitmapOriginal.GetWidth();
         h2 = m_messageBitmapOriginal.GetHeight();
     {
         w2 = m_messageBitmapOriginal.GetWidth();
         h2 = m_messageBitmapOriginal.GetHeight();


@@ -102,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);
 


@@ -135,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)


@@ -160,4 +149,3 @@ void wxStaticBitmap::ChangeForegroundColour()
     m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }
     m_bitmapCache.SetColoursChanged();
     wxWindow::ChangeForegroundColour();
 }

-