X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50528a1dbe6bbf00682be6684297e08fb10402a5..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/statbmp.cpp?ds=sidebyside diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index 3d18ef8976..dd3aff2163 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbmp.cpp +// Name: src/os2/statbmp.cpp // Purpose: wxStaticBitmap // Author: David Webster // Modified by: @@ -9,26 +9,23 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbmp.h" -#endif - // 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/statbmp.h" #ifndef WX_PRECOMP #include "wx/icon.h" - #include "wx/statbmp.h" + #include "wx/window.h" + #include "wx/dcclient.h" #endif +#include "wx/os2/private.h" + #include // --------------------------------------------------------------------------- -// macors +// macros // --------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl) @@ -69,15 +66,13 @@ static wxGDIImage* 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; @@ -97,8 +92,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; @@ -111,7 +104,7 @@ bool wxStaticBitmap::Create( int nWinstyle = SS_ICON; m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND() - ,wxCanvasClassName + ,(PSZ)wxCanvasClassName ,zId ,nWinstyle | WS_VISIBLE ,0,0,0,0 @@ -125,17 +118,20 @@ bool wxStaticBitmap::Create( { vError = ::WinGetLastError(wxGetInstance()); sError = wxPMErrorToStr(vError); - return FALSE; + return false; } - wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create static bitmap") ); + 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)); + ::WinSendMsg( m_hWnd, + SM_SETHANDLE, + MPFROMHWND(rBitmap.GetHandle()), + (MPARAM)0); // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); SetSize(nX, nY, m_pImage->GetWidth(), m_pImage->GetHeight()); - return(TRUE); + return true; } // end of wxStaticBitmap::Create bool wxStaticBitmap::ImageIsOk() const @@ -159,13 +155,10 @@ wxSize wxStaticBitmap::DoGetBestSize() const return wxWindow::DoGetBestSize(); } -void wxStaticBitmap::OnPaint ( - wxPaintEvent& WXUNUSED(rEvent) -) +void wxStaticBitmap::OnPaint ( wxPaintEvent& WXUNUSED(rEvent) ) { - wxPaintDC vDc(this); - int i; - wxBitmap* pBitmap; + wxPaintDC vDc(this); + wxBitmap* pBitmap; if (m_pImage->IsKindOf(CLASSINFO(wxIcon))) { @@ -183,14 +176,12 @@ void wxStaticBitmap::OnPaint ( } } // end of wxStaticBitmap::OnPaint -void wxStaticBitmap::SetImage( - const wxGDIImage& rBitmap -) +void wxStaticBitmap::SetImage( const wxGDIImage& rBitmap ) { - int nX = 0; - int nY = 0; - int nWidth = 0; - int nHeight = 0; + int nX = 0; + int nY = 0; + int nWidth = 0; + int nHeight = 0; Free(); ::WinSendMsg( GetHwnd() @@ -202,13 +193,15 @@ void wxStaticBitmap::SetImage( GetPosition(&nX, &nY); GetSize(&nWidth, &nHeight); + // Convert to OS/2 coordinate system + nY = wxWindow::GetOS2ParentHeight(GetParent()) - nY - nHeight; RECTL vRect; vRect.xLeft = nX; - vRect.yTop = nY; + vRect.yTop = nY + nHeight; vRect.xRight = nX + nWidth; - vRect.yBottom = nY + nHeight; + vRect.yBottom = nY; ::WinInvalidateRect(GetHwndOf(GetParent()), &vRect, TRUE); }