Disable typemap for wxImage constructors

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

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index 2581c2285481354de83c6add659f7e2c5d6fcdc4..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"
 
 // 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"
 
 #include "wx/window.h"
 #include "wx/os2/private.h"
 


@@ -32,6 +33,38 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
 

+BEGIN_EVENT_TABLE(wxStaticBitmap, wxWindow)
+    EVT_PAINT(wxStaticBitmap::OnPaint)
+END_EVENT_TABLE()
+
+static wxGDIImage* ConvertImage(
+  const wxGDIImage&                 rBitmap
+)
+{
+    bool                            bIsIcon = rBitmap.IsKindOf( CLASSINFO(wxIcon) );
+
+    if(!bIsIcon )
+    {
+        wxASSERT_MSG( wxDynamicCast(&rBitmap, wxBitmap),
+                      _T("not an icon and not a bitmap?") );
+
+        const wxBitmap&             rBmp = (const wxBitmap&)rBitmap;
+        wxMask*                     pMask = rBmp.GetMask();
+
+        if (pMask && pMask->GetMaskBitmap())
+        {
+            wxIcon*                 pIcon = new wxIcon;
+
+            pIcon->CopyFromBitmap(rBmp);
+            return pIcon;
+        }
+        return new wxBitmap(rBmp);
+    }
+
+    // copying a bitmap is a cheap operation
+    return new wxIcon( (const wxIcon&)rBitmap );
+} // end of ConvertImage
+

 // ---------------------------------------------------------------------------
 //  wxStaticBitmap
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //  wxStaticBitmap
 // ---------------------------------------------------------------------------


@@ -46,15 +79,15 @@ bool wxStaticBitmap::Create(
 , const wxString&                   rName
 )
 {
 , const wxString&                   rName
 )
 {

+    ERRORID                         vError;
+    wxString                        sError;
+

     Init();
 
     SetName(rName);
     if (pParent)
         pParent->AddChild(this);
 
     Init();
 
     SetName(rName);
     if (pParent)
         pParent->AddChild(this);
 

-    m_backgroundColour = pParent->GetBackgroundColour() ;
-    m_foregroundColour = pParent->GetForegroundColour() ;
-

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


@@ -64,20 +97,20 @@ bool wxStaticBitmap::Create(
 
     int                             nX= rPos.x;
     int                             nY = rPos.y;
 
     int                             nX= rPos.x;
     int                             nY = rPos.y;

-    int                             nWidth = rSize.x;
-    int                             nHeight = rSize.y;
+    char                            zId[16];

 
     m_windowStyle = lStyle;
 
     m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon));
 
 
     m_windowStyle = lStyle;
 
     m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon));
 

-    // TODO: create static bitmap control
-    const wxChar*                   zClassname = wxT("WX_STATIC");
-    int                             nWinstyle = m_bIsIcon ? SS_ICON : SS_BITMAP;
+    //
+    // For now we only support an ICON
+    //
+    int                             nWinstyle = SS_ICON;

 
     m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()
 
     m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()

-                                       ,zClassname
-                                       ,wxT("")
+                                       ,wxCanvasClassName
+                                       ,zId

                                        ,nWinstyle | WS_VISIBLE
                                        ,0,0,0,0
                                        ,pParent->GetHWND()
                                        ,nWinstyle | WS_VISIBLE
                                        ,0,0,0,0
                                        ,pParent->GetHWND()


@@ -86,17 +119,22 @@ bool wxStaticBitmap::Create(
                                        ,NULL
                                        ,NULL
                                       );
                                        ,NULL
                                        ,NULL
                                       );

-
+    if (!m_hWnd)
+    {
+        vError = ::WinGetLastError(wxGetInstance());
+        sError = wxPMErrorToStr(vError);
+        return FALSE;
+    }

     wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
     wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );

-
-    SetImage(rBitmap);
+    m_pImage = ConvertImage(rBitmap);
+    m_pImage->SetHandle((WXHWND)::WinSendMsg(m_hWnd, SM_QUERYHANDLE, (MPARAM)0, (MPARAM)0));

 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);
 
     // Subclass again for purposes of dialog editing mode
     SubclassWin(m_hWnd);

-    SetFont(GetParent()->GetFont());
-    SetSize(nX, nY, nWidth, nHeight);
-    return(FALSE);
-}
+    SetSize(nX, nY, m_pImage->GetWidth(), m_pImage->GetHeight());
+
+    return(TRUE);
+} // end of wxStaticBitmap::Create

 
 bool wxStaticBitmap::ImageIsOk() const
 {
 
 bool wxStaticBitmap::ImageIsOk() const
 {


@@ -105,70 +143,78 @@ bool wxStaticBitmap::ImageIsOk() const
 
 void wxStaticBitmap::Free()
 {
 
 void wxStaticBitmap::Free()
 {

-    delete m_pImage;
+    if (m_pImage)
+        delete m_pImage;

     m_pImage = NULL;
     m_pImage = NULL;

-}
+} // end of wxStaticBitmap::Free

 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {
 
 wxSize wxStaticBitmap::DoGetBestSize() const
 {

-    // reuse the current size (as wxWindow does) instead of using some
+    //
+    // Reuse the current size (as wxWindow does) instead of using some

     // arbitrary default size (as wxControl, our immediate base class, does)
     // arbitrary default size (as wxControl, our immediate base class, does)

+    //

     return wxWindow::DoGetBestSize();
 }
 
     return wxWindow::DoGetBestSize();
 }
 

-void wxStaticBitmap::SetImage(
-  const wxGDIImage&                 rBitmap
+void wxStaticBitmap::OnPaint (
+  wxPaintEvent&                     WXUNUSED(rEvent)

 )
 {
 )
 {

-    Free();
+    wxPaintDC                       vDc(this);
+    wxBitmap*                       pBitmap;

 
 

-    m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon));
-    if (m_bIsIcon)
-        m_pImage = new wxIcon((const wxIcon&)rBitmap);
-    else
-        m_pImage = new wxBitmap((const wxBitmap &)rBitmap);
+    if (m_pImage->IsKindOf(CLASSINFO(wxIcon)))
+    {
+        wxIcon*                     pIcon;

 
 

-    int                             nX;
-    int                             nY;
-    int                             nW;
-    int                             nH;
+        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

 
 

-    GetPosition(&nX, &nY);
-    GetSize(&nW, &nH);
+void wxStaticBitmap::SetImage(
+  const wxGDIImage&                 rBitmap
+)
+{
+    int                             nX = 0;
+    int                             nY = 0;
+    int                             nWidth = 0;
+    int                             nHeight = 0;

 
 

+    Free();

     ::WinSendMsg( GetHwnd()
                  ,SM_SETHANDLE
     ::WinSendMsg( GetHwnd()
                  ,SM_SETHANDLE

-                 ,MPFROMHWND(m_pImage->GetHandle())
+                 ,MPFROMHWND(rBitmap.GetHandle())

                  ,NULL
                 );
                  ,NULL
                 );

-    if (ImageIsOk())
-    {
-        int                         nWidth = rBitmap.GetWidth();
-        int                         nHeight = rBitmap.GetHeight();
+    m_pImage = ConvertImage(rBitmap);

 
 

-        if (nWidth && nHeight)
-        {
-            nW = nWidth;
-            nW = nHeight;
-
-            ::WinSetWindowPos( GetHwnd()
-                              ,HWND_TOP
-                              ,nX
-                              ,nY
-                              ,nWidth
-                              ,nHeight
-                              ,SWP_SIZE | SWP_MOVE | SWP_SHOW
-                             );
-        }
-    }
+    GetPosition(&nX, &nY);
+    GetSize(&nWidth, &nHeight);

 
     RECTL                           vRect;
 
 
     RECTL                           vRect;
 

-    vRect.xLeft   = nW;
+    vRect.xLeft   = nX;

     vRect.yTop    = nY;
     vRect.yTop    = nY;

-    vRect.xRight  = nX + nW;
-    vRect.yBottom = nY + nH;
+    vRect.xRight  = nX + nWidth;
+    vRect.yBottom = nY + nHeight;

 
     ::WinInvalidateRect(GetHwndOf(GetParent()), &vRect, TRUE);
 }
 
 
     ::WinInvalidateRect(GetHwndOf(GetParent()), &vRect, TRUE);
 }
 

+MRESULT wxStaticBitmap::OS2WindowProc(
+  WXUINT                            uMsg
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)
+{
+    return wxWindow::OS2WindowProc(uMsg, wParam, lParam);
+} // end of wxStaticBitmap::OS2WindowProc