[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp
index a67c55846579664d9442eb2c4d7d1d76207e5d56..ed401f97db67a139d73dfbffc3f2a87e2335ac1d 100644 (file)
--- a/src/os2/statbmp.cpp
+++ b/src/os2/statbmp.cpp
@@ -1,59 +1,220 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.cpp
 // Purpose:     wxStaticBitmap
 /////////////////////////////////////////////////////////////////////////////
 // Name:        statbmp.cpp
 // Purpose:     wxStaticBitmap

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     11/27/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "statbmp.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "statbmp.h"
 #endif
 

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

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
+#include "wx/dcclient.h"
+#include "wx/window.h"
+#include "wx/os2/private.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/icon.h"
+    #include "wx/statbmp.h"

 #endif
 
 #endif
 

-/*
- * wxStaticBitmap
- */
+#include <stdio.h>
+
+// ---------------------------------------------------------------------------
+// macors
+// ---------------------------------------------------------------------------
+
+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?") );

 
 

-bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap& bitmap,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+        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
+// ---------------------------------------------------------------------------
+
+bool wxStaticBitmap::Create(
+  wxWindow*                         pParent
+, wxWindowID                        nId
+, const wxGDIImage&                 rBitmap
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, long                              lStyle
+, const wxString&                   rName
+)

 {
 {

-    m_messageBitmap = bitmap;
-    SetName(name);
-    if (parent) parent->AddChild(this);
+    ERRORID                         vError;
+    wxString                        sError;

 
 

-    if ( id == -1 )
-           m_windowId = (int)NewControlId();
+    Init();
+
+    SetName(rName);
+    if (pParent)
+        pParent->AddChild(this);
+
+    if (nId == -1)
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = nId;
+
+    m_windowStyle = lStyle;
+
+    int                             nX= rPos.x;
+    int                             nY = rPos.y;
+    char                            zId[16];

 
 

-    m_windowStyle = style;
+    m_windowStyle = lStyle;

 
 

-    // TODO: create static bitmap control
-    return FALSE;
+    m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon));
+
+    //
+    // For now we only support an ICON
+    //
+    int                             nWinstyle = SS_ICON;
+
+    m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()
+                                       ,(PSZ)wxCanvasClassName
+                                       ,zId
+                                       ,nWinstyle | WS_VISIBLE
+                                       ,0,0,0,0
+                                       ,pParent->GetHWND()
+                                       ,HWND_TOP
+                                       ,m_windowId
+                                       ,NULL
+                                       ,NULL
+                                      );
+    if (!m_hWnd)
+    {
+        vError = ::WinGetLastError(wxGetInstance());
+        sError = wxPMErrorToStr(vError);
+        return FALSE;
+    }
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") );
+    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);
+    SetSize(nX, nY, m_pImage->GetWidth(), m_pImage->GetHeight());
+
+    return(TRUE);
+} // end of wxStaticBitmap::Create
+
+bool wxStaticBitmap::ImageIsOk() const
+{
+    return(m_pImage && m_pImage->Ok());

 }
 
 }
 

-void wxStaticBitmap::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxStaticBitmap::Free()
+{
+    if (m_pImage)
+        delete m_pImage;
+    m_pImage = NULL;
+} // end of wxStaticBitmap::Free
+
+wxSize wxStaticBitmap::DoGetBestSize() const

 {
 {

-    // TODO
+    //
+    // Reuse the current size (as wxWindow does) instead of using some
+    // arbitrary default size (as wxControl, our immediate base class, does)
+    //
+    return wxWindow::DoGetBestSize();

 }
 
 }
 

-void wxStaticBitmap::SetBitmap(const wxBitmap& bitmap)
+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
+)

 {
 {

-    m_messageBitmap = bitmap;
+    int                             nX = 0;
+    int                             nY = 0;
+    int                             nWidth = 0;
+    int                             nHeight = 0;
+
+    Free();
+    ::WinSendMsg( GetHwnd()
+                 ,SM_SETHANDLE
+                 ,MPFROMHWND(rBitmap.GetHandle())
+                 ,NULL
+                );
+    m_pImage = ConvertImage(rBitmap);

 
 

-    // TODO: redraw bitmap
+    GetPosition(&nX, &nY);
+    GetSize(&nWidth, &nHeight);
+
+    RECTL                           vRect;
+
+    vRect.xLeft   = nX;
+    vRect.yTop    = nY;
+    vRect.xRight  = nX + nWidth;
+    vRect.yBottom = nY + nHeight;
+
+    ::WinInvalidateRect(GetHwndOf(GetParent()), &vRect, TRUE);

 }
 
 }
 

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