added a call for invalidating the dc setup on mac explicitely (needed in case of...

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index e3fbd510690e39f438ce1e5a460b03536bc9d829..baacd60aa824cc23c1539fc2b97fa9b38d10ce34 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -54,11 +54,12 @@ public:
     // ------------
 
     wxDC*                           m_pSelectedInto;
     // ------------
 
     wxDC*                           m_pSelectedInto;

-    HPS                             m_hPresentationSpace;

 
 

-    // optional mask for transparent drawing
+    //
+    // Optional mask for transparent drawing
+    //

     wxMask*                         m_pBitmapMask;
     wxMask*                         m_pBitmapMask;

-};
+}; // end of CLASS wxBitmapRefData

 
 // ----------------------------------------------------------------------------
 // wxBitmap: a mono or colour bitmap
 
 // ----------------------------------------------------------------------------
 // wxBitmap: a mono or colour bitmap


@@ -82,9 +83,8 @@ public:
             );
 
     // Initialize with XPM data
             );
 
     // Initialize with XPM data

-    wxBitmap( char**     ppData
-             ,wxControl* pAnItem = NULL
-            );
+    wxBitmap(const char** ppData);
+    wxBitmap(char** ppData);

 
     // Load a file or resource
     wxBitmap( const wxString& rName
 
     // Load a file or resource
     wxBitmap( const wxString& rName


@@ -132,6 +132,9 @@ public:
 
     virtual ~wxBitmap();
 
 
     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);
 
     // copies the contents and mask of the given (colour) icon to the bitmap
     bool CopyFromIcon(const wxIcon& rIcon);
 


@@ -210,6 +213,10 @@ public:
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
     // 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();
 protected:
     // common part of all ctors
     void Init();


@@ -217,13 +224,14 @@ 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 **bits);
+

 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);

-    HDC                             m_hDc;
-    HPS                             m_hPs;

 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)

-};
+}; // end of CLASS wxBitmap

 
 // ----------------------------------------------------------------------------
 // wxMask: a mono bitmap used for drawing bitmaps transparently.
 
 // ----------------------------------------------------------------------------
 // wxMask: a mono bitmap used for drawing bitmaps transparently.


@@ -272,10 +280,7 @@ public:
 protected:
     WXHBITMAP                       m_hMaskBitmap;
     DECLARE_DYNAMIC_CLASS(wxMask)
 protected:
     WXHBITMAP                       m_hMaskBitmap;
     DECLARE_DYNAMIC_CLASS(wxMask)

-private:
-    HDC                             m_hDc;
-    HPS                             m_hPs;
-};
+}; // end of CLASS wxMask

 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler is a class which knows how to load/save bitmaps to/from file


@@ -308,6 +313,7 @@ public:
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName

+                          ,HPS             hPs

                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight


@@ -327,6 +333,7 @@ public:
                        );
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
                        );
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName

+                      ,HPS             hPs

                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight


@@ -337,7 +344,7 @@ public:
                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)

-};
+}; // end of CLASS wxBitmapHandler

 
 #endif
   // _WX_BITMAP_H_
 
 #endif
   // _WX_BITMAP_H_