long -> wxCoord

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

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 47a6cdd53ca30c309c73cba243de85dfa593b9b9..2d7a3fc799f6a204147935360603498f455577b3 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+    #pragma implementation "bitmap.h"
+#endif
+

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


@@ -34,12 +38,10 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -129,10 +131,6 @@ bool wxBitmap::CopyFromIcon(
     if (!rIcon.Ok())
         return(FALSE);
 
     if (!rIcon.Ok())
         return(FALSE);
 

-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-

     return CopyFromIconOrCursor(rIcon);
 }
 
     return CopyFromIconOrCursor(rIcon);
 }
 


@@ -187,9 +185,6 @@ wxBitmap::wxBitmap(
         wxLogLastError("GpiCreatePS Failure");
     }
 
         wxLogLastError("GpiCreatePS Failure");
     }
 

-    m_hDc = hDc;
-    m_hPs = hPs;
-

     m_refData = pRefData;
 
     pRefData->m_nWidth = nTheWidth;
     m_refData = pRefData;
 
     pRefData->m_nWidth = nTheWidth;


@@ -345,6 +340,8 @@ bool wxBitmap::LoadFile(
 , long                              lType
 )
 {
 , long                              lType
 )
 {

+    HPS                             hPs = NULLHANDLE;
+

     UnRef();
 
     wxBitmapHandler*                pHandler = wxDynamicCast( FindHandler(lType)
     UnRef();
 
     wxBitmapHandler*                pHandler = wxDynamicCast( FindHandler(lType)


@@ -357,6 +354,7 @@ bool wxBitmap::LoadFile(
 
         return(pHandler->LoadFile( this
                                   ,rFilename
 
         return(pHandler->LoadFile( this
                                   ,rFilename

+                                  ,hPs

                                   ,lType
                                   , -1
                                   , -1
                                   ,lType
                                   , -1
                                   , -1


@@ -744,6 +742,7 @@ bool wxBitmapHandler::Create(
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage
 , const wxString&                   rName
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage
 , const wxString&                   rName

+, HPS                               hPs

 , long                              lFlags
 , int                               nWidth
 , int                               nHeight
 , long                              lFlags
 , int                               nWidth
 , int                               nHeight


@@ -755,6 +754,7 @@ bool wxBitmapHandler::Load(
 
     return(pBitmap ? LoadFile( pBitmap
                               ,rName
 
     return(pBitmap ? LoadFile( pBitmap
                               ,rName

+                              ,hPs

                               ,lFlags
                               ,nWidth
                               ,nHeight
                               ,lFlags
                               ,nWidth
                               ,nHeight


@@ -792,6 +792,7 @@ bool wxBitmapHandler::Create(
 bool wxBitmapHandler::LoadFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const wxString&                   WXUNUSED(rName)
 bool wxBitmapHandler::LoadFile(
   wxBitmap*                         WXUNUSED(pBitmap)
 , const wxString&                   WXUNUSED(rName)

+, HPS                               WXUNUSED(hPs)

 , long                              WXUNUSED(lType)
 , int                               WXUNUSED(nDesiredWidth)
 , int                               WXUNUSED(nDesiredHeight)
 , long                              WXUNUSED(lType)
 , int                               WXUNUSED(nDesiredWidth)
 , int                               WXUNUSED(nDesiredHeight)