X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b9e3455225b670d30ee0fb67f8821ada9640f6d..7dd40b6f4b31e6bc9c7f626f1461aff8adf7714c:/src/os2/statbmp.cpp diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index a04f0547cd..47a890f2ae 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -12,6 +12,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" @@ -26,55 +27,84 @@ // macors // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) -#endif + +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 // --------------------------------------------------------------------------- -bool wxStaticBitmap::Create( - wxWindow* pParent -, wxWindowID nId -, const wxGDIImage& rBitmap -, const wxPoint& rPos -, const wxSize& rSize -, long lStyle -, const wxString& rName -) +bool wxStaticBitmap::Create( wxWindow* pParent, + wxWindowID nId, + const wxGDIImage& rBitmap, + const wxPoint& rPos, + const wxSize& WXUNUSED(rSize), + long lStyle, + const wxString& rName ) { + ERRORID vError; + wxString sError; + Init(); SetName(rName); - if (pParent) parent->AddChild(this); - - m_backgroundColour = parent->GetBackgroundColour() ; - m_foregroundColour = parent->GetForegroundColour() ; + if (pParent) + pParent->AddChild(this); - if ( id == -1 ) + if (nId == -1) m_windowId = (int)NewControlId(); else m_windowId = nId; m_windowStyle = lStyle; - int nX= pos.x; - int nY = pos.y; - int nWidth = size.x; - int nHeight = size.y; + int nX= rPos.x; + int nY = rPos.y; + char zId[16]; m_windowStyle = lStyle; m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon)); - // TODO: create static bitmap control - const wxChar* zClassname = wxT("WX_STATIC"); - int nWinstyle ? SS_ICON : SS_BITMAP; + // + // For now we only support an ICON + // + int nWinstyle = SS_ICON; - m_hWnd = (WXWHND)::WinCreateWindow( pParent->GetHWND() - ,zClassname - ,wxT("") + m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND() + ,(PSZ)wxCanvasClassName + ,zId ,nWinstyle | WS_VISIBLE ,0,0,0,0 ,pParent->GetHWND() @@ -83,89 +113,102 @@ bool wxStaticBitmap::Create( ,NULL ,NULL ); - + if (!m_hWnd) + { + vError = ::WinGetLastError(wxGetInstance()); + sError = wxPMErrorToStr(vError); + return false; + } 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); - 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 { - return(m_pImage ** m_pImage->Ok()); + return(m_pImage && m_pImage->Ok()); } void wxStaticBitmap::Free() { - delete m_pImage; + if (m_pImage) + delete m_pImage; m_pImage = NULL; -} +} // end of wxStaticBitmap::Free 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) + // 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, &nHh); +void wxStaticBitmap::SetImage( + const wxGDIImage& rBitmap +) +{ + int nX = 0; + int nY = 0; + int nWidth = 0; + int nHeight = 0; + Free(); ::WinSendMsg( GetHwnd() ,SM_SETHANDLE - ,MPFROMHWND(m_pImage->GetHandle()) + ,MPFROMHWND(rBitmap.GetHandle()) ,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; - vRect.xLeft = nW; + vRect.xLeft = nX; vRect.yTop = nY; - vRect.xRight = nX + nW; - vRect.yBottom = nY + nH; + 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