compatibility changes: WXWIN_COMPATIBILITY_EVENT_TYPES and DECLARE_EVENT_TABLE_ENTRY...

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index fdd415cfbcac7070c662bb691a34b07674f6c257..0908e667d57a038674b90cf4d8b559b963850a3b 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -55,6 +55,7 @@ public:
 
     wxDC*                           m_pSelectedInto;
     HPS                             m_hPresentationSpace;
+    LONG                            m_lId;
 
     // optional mask for transparent drawing
     wxMask*                         m_pBitmapMask;
@@ -132,6 +133,9 @@ public:
 
     virtual ~wxBitmap();
 
+    // get the given part of bitmap
+    wxBitmap GetSubBitmap(const wxRect& rRect) const;
+
     // copies the contents and mask of the given (colour) icon to the bitmap
     bool CopyFromIcon(const wxIcon& rIcon);
 
@@ -210,6 +214,10 @@ public:
     // 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();
@@ -217,11 +225,14 @@ protected:
     inline virtual wxGDIImageRefData* CreateData() const
         { return new wxBitmapRefData; }
 
+    // creates the bitmap from XPM data, supposed to be called from ctor
+    bool CreateFromXpm(const char **bits);
+
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
-};
+}; // end of CLASS wxBitmap
 
 // ----------------------------------------------------------------------------
 // wxMask: a mono bitmap used for drawing bitmaps transparently.
@@ -273,7 +284,7 @@ protected:
 private:
     HDC                             m_hDc;
     HPS                             m_hPs;
-};
+}; // end of wxMask
 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
@@ -306,6 +317,7 @@ public:
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
+                          ,HPS             hPs
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
@@ -325,6 +337,7 @@ public:
                        );
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
+                      ,HPS             hPs
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
@@ -335,7 +348,7 @@ public:
                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-};
+}; // end of wxBitmapHandler
 
 #endif
   // _WX_BITMAP_H_