Beginning of bitmap updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index fa4b750192edb3386de29b8dc68ade28c3e627fe..0908e667d57a038674b90cf4d8b559b963850a3b 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -133,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);
 
@@ -222,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.
@@ -278,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
@@ -342,7 +348,7 @@ public:
                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-};
+}; // end of wxBitmapHandler
 
 #endif
   // _WX_BITMAP_H_

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 2d7a3fc799f6a204147935360603498f455577b3..782ba34e621f26e69c9c55bf24c9cb2c42ab30a4 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -57,7 +57,8 @@ wxBitmapRefData::wxBitmapRefData()
     m_pSelectedInto = NULL;
     m_nNumColors    = 0;
     m_pBitmapMask   = NULL;
-}
+    m_hBitmap = (WXHBITMAP) NULL;
+} // end of wxBitmapRefData::wxBitmapRefData
 
 void wxBitmapRefData::Free()
 {
@@ -74,7 +75,7 @@ void wxBitmapRefData::Free()
 
     delete m_pBitmapMask;
     m_pBitmapMask = NULL;
-}
+} // end of wxBitmapRefData::Free
 
 // ----------------------------------------------------------------------------
 // wxBitmap creation