wxCoordRound() -> wxRound()

[wxWidgets.git] / include / wx / os2 / bitmap.h

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 555184acc83c71aa2c0a473ae856a885d170eca7..a809df37ad622bda7bc2028ee88e6efb6669d6d9 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 

-#ifdef __GNUG__
-    #pragma interface "bitmap.h"
-#endif
-

 #include "wx/os2/private.h"
 #include "wx/os2/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/os2/private.h"
 #include "wx/os2/gdiimage.h"
 #include "wx/gdicmn.h"


@@ -74,7 +70,11 @@ public:
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)

-      { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }
+        : wxGDIImage(rBitmap)
+    {
+        Init();
+        SetHandle(rBitmap.GetHandle());
+    }

 
     // Initialize with raw data
     wxBitmap( const char bits[]
 
     // Initialize with raw data
     wxBitmap( const char bits[]


@@ -84,8 +84,7 @@ public:
             );
 
     // Initialize with XPM data
             );
 
     // Initialize with XPM data

-    wxBitmap(const char** ppData) { CreateFromXpm(ppData); }
-    wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); }
+    wxBitmap(const char* const* bits);

 
     // Load a resource
     wxBitmap( int             nId
 
     // Load a resource
     wxBitmap( int             nId


@@ -98,7 +97,7 @@ public:
                    )
     { Init(); }
     // New constructor for generalised creation from data
                    )
     { Init(); }
     // New constructor for generalised creation from data

-    wxBitmap( void* pData
+    wxBitmap( const void* pData

              ,long  lType
              ,int   nWidth
              ,int   nHeight
              ,long  lType
              ,int   nWidth
              ,int   nHeight


@@ -116,13 +115,6 @@ public:
     inline wxBitmap(const wxIcon& rIcon)
       { Init(); CopyFromIcon(rIcon); }
 
     inline wxBitmap(const wxIcon& rIcon)
       { Init(); CopyFromIcon(rIcon); }
 

-    wxBitmap& operator=(const wxBitmap& rBitmap)
-    {
-        if ( m_refData != rBitmap.m_refData )
-            Ref(rBitmap);
-        return(*this);
-    }
-

     wxBitmap& operator=(const wxIcon& rIcon)
     {
         (void)CopyFromIcon(rIcon);
     wxBitmap& operator=(const wxIcon& rIcon)
     {
         (void)CopyFromIcon(rIcon);


@@ -153,7 +145,7 @@ public:
                         ,int nHeight
                         ,int nDepth = -1
                        );
                         ,int nHeight
                         ,int nDepth = -1
                        );

-    virtual bool Create( void* pData
+    virtual bool Create( const void* pData

                         ,long  lType
                         ,int   nWidth
                         ,int   nHeight
                         ,long  lType
                         ,int   nWidth
                         ,int   nHeight


@@ -162,6 +154,9 @@ public:
     virtual bool LoadFile( int             nId
                           ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
                          );
     virtual bool LoadFile( int             nId
                           ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
                          );

+    virtual bool LoadFile( const wxString& rName
+                          ,long            lType = wxBITMAP_TYPE_XPM
+                         );

     virtual bool SaveFile( const wxString&  rName
                           ,int              lType
                           ,const wxPalette* pCmap = NULL
     virtual bool SaveFile( const wxString&  rName
                           ,int              lType
                           ,const wxPalette* pCmap = NULL


@@ -217,8 +212,6 @@ protected:
     inline virtual wxGDIImageRefData* CreateData() const
         { return new wxBitmapRefData; }
 
     inline virtual wxGDIImageRefData* CreateData() const
         { return new wxBitmapRefData; }
 

-    // creates the bitmap from XPM data, supposed to be called from ctor
-    bool CreateFromXpm(const char** ppData);

     bool CreateFromImage(const wxImage& image, int depth);
 
 private:
     bool CreateFromImage(const wxImage& image, int depth);
 
 private:


@@ -300,7 +293,7 @@ public:
     // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
     // old class which worked only with bitmaps
     virtual bool Create( wxBitmap* pBitmap
     // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
     // old class which worked only with bitmaps
     virtual bool Create( wxBitmap* pBitmap

-                        ,void*     pData
+                        ,const void* pData

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


@@ -312,6 +305,12 @@ public:
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                          );

+    virtual bool LoadFile( wxBitmap*       pBitmap
+                          ,const wxString& rName
+                          ,long            lFlags
+                          ,int             nDesiredWidth
+                          ,int             nDesiredHeight
+                         );

     virtual bool SaveFile( wxBitmap*        pBitmap
                           ,const wxString&  rName
                           ,int              lType
     virtual bool SaveFile( wxBitmap*        pBitmap
                           ,const wxString&  rName
                           ,int              lType


@@ -319,7 +318,7 @@ public:
                          );
 
     virtual bool Create( wxGDIImage* pImage
                          );
 
     virtual bool Create( wxGDIImage* pImage

-                        ,void*       pData
+                        ,const void* pData

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