more threds fixes, more threads tests - seems to work ok for non GUI case

[wxWidgets.git] / src / os2 / statbmp.cpp

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 412e6511a39c58a628d176d75cf906481a947b73..bc19e866feb778aeb9c09fe1d7b54f194dfb82a8 100644 (file)
--- a/src/os2/statbmp.cpp
+++ b/src/os2/statbmp.cpp
@@ -41,10 +41,14 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-    m_messageBitmap = bitmap;
+    Init();
+

     SetName(name);
     if (parent) parent->AddChild(this);
 
     SetName(name);
     if (parent) parent->AddChild(this);
 

+    m_backgroundColour = parent->GetBackgroundColour() ;
+    m_foregroundColour = parent->GetForegroundColour() ;
+

     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else
     if ( id == -1 )
         m_windowId = (int)NewControlId();
     else


@@ -52,7 +56,27 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
 
     m_windowStyle = style;
 

+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;
+
+    m_windowStyle = style;
+
+    m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
+

     // TODO: create static bitmap control
     // TODO: create static bitmap control

+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
+
+    SetBitmap(bitmap);
+
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin(m_hWnd);
+
+    SetFont(GetParent()->GetFont());
+
+    SetSize(x, y, width, height);
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -76,7 +100,7 @@ void wxStaticBitmap::Free()
     m_image.icon = NULL;
 }
 
     m_image.icon = NULL;
 }
 

-wxSize wxStaticBitmap::DoGetBestSize()
+wxSize wxStaticBitmap::DoGetBestSize() const

 {
     // reuse the current size (as wxWindow does) instead of using some
     // arbitrary default size (as wxControl, our immediate base class, does)
 {
     // reuse the current size (as wxWindow does) instead of using some
     // arbitrary default size (as wxControl, our immediate base class, does)