don't use wxFileConfig to parse kdeglobals, it's not meant for such use. Fixes bug...

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

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 5d523be4ffd9fb8f72fc31d458580724b3acee00..09af143f46a4075e1f8a14d44f824cf8c54331d8 100644 (file)
--- a/src/os2/statbmp.cpp
+++ b/src/os2/statbmp.cpp
@@ -16,6 +16,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/dcclient.h"
 #include "wx/window.h"
 #include "wx/os2/private.h"
 
@@ -32,6 +33,10 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
+BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow)
+    EVT_PAINT(wxStaticBitmap::OnPaint)
+END_EVENT_TABLE()
+
 static wxGDIImage* ConvertImage(
   const wxGDIImage&                 rBitmap
 )
@@ -92,8 +97,6 @@ bool wxStaticBitmap::Create(
 
     int                             nX= rPos.x;
     int                             nY = rPos.y;
-    int                             nWidth = rSize.x;
-    int                             nHeight = rSize.y;
     char                            zId[16];
 
     m_windowStyle = lStyle;
@@ -105,9 +108,8 @@ bool wxStaticBitmap::Create(
     //
     int                             nWinstyle = SS_ICON;
 
-    sprintf(zId, "#%d", rBitmap.GetId());
     m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()
-                                       ,WC_STATIC
+                                       ,wxCanvasClassName
                                        ,zId
                                        ,nWinstyle | WS_VISIBLE
                                        ,0,0,0,0
@@ -129,6 +131,8 @@ bool wxStaticBitmap::Create(
 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
+    SetSize(nX, nY, m_pImage->GetWidth(), m_pImage->GetHeight());
+
     return(TRUE);
 } // end of wxStaticBitmap::Create
 
@@ -153,6 +157,29 @@ wxSize wxStaticBitmap::DoGetBestSize() const
     return wxWindow::DoGetBestSize();
 }
 
+void wxStaticBitmap::OnPaint (
+  wxPaintEvent&                     WXUNUSED(rEvent)
+)
+{
+    wxPaintDC                       vDc(this);
+    wxBitmap*                       pBitmap;
+
+    if (m_pImage->IsKindOf(CLASSINFO(wxIcon)))
+    {
+        wxIcon*                     pIcon;
+
+        pIcon = wxDynamicCast(m_pImage, wxIcon);
+        pBitmap = new wxBitmap(*pIcon);
+        vDc.DrawBitmap(*pBitmap, 0, 0);
+        delete pBitmap;
+    }
+    else
+    {
+        pBitmap = wxDynamicCast(m_pImage, wxBitmap);
+        vDc.DrawBitmap(*pBitmap, 0, 0);
+    }
+} // end of wxStaticBitmap::OnPaint
+
 void wxStaticBitmap::SetImage(
   const wxGDIImage&                 rBitmap
 )