X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd85921189610501e38fb501801b1eb6b9560fe7..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/os2/bitmap.h

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index ba920a1fac..d7e9c0c376 100644
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -74,7 +74,7 @@ public:
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)
-      { Init(); Ref(rBitmap); }
+      { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }
 
     // Initialize with raw data
     wxBitmap( const char bits[]
@@ -84,14 +84,19 @@ public:
             );
 
     // Initialize with XPM data
-    wxBitmap(const char** ppData);
-    wxBitmap(char** ppData);
+    wxBitmap(const char** ppData) { CreateFromXpm(ppData); }
+    wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); }
 
-    // Load a file or resource
-    wxBitmap( const wxString& rName
+    // Load a resource
+    wxBitmap( int             nId
              ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
             );
 
+    // For compatiability with other ports, under OS/2 does same as default ctor
+    inline wxBitmap( const wxString& WXUNUSED(rFilename)
+                    ,long            WXUNUSED(lType)
+                   )
+    { Init(); }
     // New constructor for generalised creation from data
     wxBitmap( void* pData
              ,long  lType
@@ -106,7 +111,7 @@ public:
              ,int nDepth = -1
             );
 
-    wxBitmap( const wxImage& image, int depth = -1 ) 
+    wxBitmap( const wxImage& image, int depth = -1 )
                          { (void)CreateFromImage(image, depth); }
 
     // we must have this, otherwise icons are silently copied into bitmaps using
@@ -136,7 +141,7 @@ public:
 
     virtual ~wxBitmap();
 
-    wxImage ConvertToImage() const;  
+    wxImage ConvertToImage() const;
 
     // get the given part of bitmap
     wxBitmap GetSubBitmap(const wxRect& rRect) const;
@@ -157,7 +162,7 @@ public:
                         ,int   nHeight
                         ,int   nDepth = 1
                        );
-    virtual bool LoadFile( const wxString& rName
+    virtual bool LoadFile( int             nId
                           ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
                          );
     virtual bool SaveFile( const wxString&  rName
@@ -183,10 +188,10 @@ public:
 
     void SetMask(wxMask* pMask) ;
 
-    inline bool operator==(const wxBitmap& rBitmap)
+    inline bool operator==(const wxBitmap& rBitmap) const
       { return m_refData == rBitmap.m_refData; }
 
-    inline bool operator!=(const wxBitmap& rBitmap)
+    inline bool operator!=(const wxBitmap& rBitmap) const
       { return m_refData != rBitmap.m_refData; }
 
 #if WXWIN_COMPATIBILITY_2
@@ -216,13 +221,11 @@ public:
     inline wxDC* GetSelectedInto() const
       { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
 
+    inline bool IsMono(void) const { return m_bIsMono; }
+
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
-//    inline LONG GetId() const
-//      { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
-
-
 protected:
     // common part of all ctors
     void Init();
@@ -231,12 +234,13 @@ protected:
         { return new wxBitmapRefData; }
 
     // creates the bitmap from XPM data, supposed to be called from ctor
-    bool CreateFromXpm(const char **bits);
+    bool CreateFromXpm(const char** ppData);
     bool CreateFromImage(const wxImage& image, int depth);
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
+    bool                            m_bIsMono;
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 }; // end of CLASS wxBitmap
 
@@ -319,8 +323,7 @@ public:
                         ,int       nDepth = 1
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
-                          ,const wxString& rName
-                          ,HPS             hPs
+                          ,int             nId
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
@@ -339,8 +342,7 @@ public:
                         ,int         nDepth = 1
                        );
     virtual bool Load( wxGDIImage*     pImage
-                      ,const wxString& rName
-                      ,HPS             hPs
+                      ,int             nId
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
@@ -350,6 +352,14 @@ public:
                       ,int             lType
                      );
 private:
+    inline virtual bool Load( wxGDIImage*     pImage
+                             ,const wxString& rName
+                             ,HPS             hPs
+                             ,long            lFlags
+                             ,int             nDesiredWidth
+                             ,int             nDesiredHeight
+                            )
+    { return FALSE; }
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 }; // end of CLASS wxBitmapHandler