Added new stream tests to typetest.

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 5ad96f1a552723dfe9f7dcd62fbc0c2c1fbaac44..f5d99b666de8579ca8426408c63ecaa8cb4e0adb 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -16,6 +16,7 @@
     #pragma interface "bitmap.h"
 #endif
 
     #pragma interface "bitmap.h"
 #endif
 

+#include "wx/os2/private.h"

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


@@ -28,6 +29,7 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxControl;
 class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxControl;

+class WXDLLEXPORT wxImage;

 
 // ----------------------------------------------------------------------------
 // Bitmap data
 
 // ----------------------------------------------------------------------------
 // Bitmap data


@@ -53,11 +55,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


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

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

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


@@ -104,6 +106,9 @@ public:
              ,int nDepth = -1
             );
 
              ,int nDepth = -1
             );
 

+    wxBitmap( const wxImage& image, int depth = -1 )
+                         { (void)CreateFromImage(image, depth); }
+

     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
     inline wxBitmap(const wxIcon& rIcon)
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
     inline wxBitmap(const wxIcon& rIcon)


@@ -131,6 +136,11 @@ public:
 
     virtual ~wxBitmap();
 
 
     virtual ~wxBitmap();
 

+    wxImage ConvertToImage() const;
+
+    // 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);
 


@@ -159,17 +169,17 @@ public:
       { return (wxBitmapRefData *)m_refData; }
 
     inline int GetQuality() const
       { return (wxBitmapRefData *)m_refData; }
 
     inline int GetQuality() const

-      { return (GetBitmapData() ? GetBitmapData()->m_quality : 0); }
+      { return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); }

 
     void SetQuality(int nQ);
 
     wxPalette* GetPalette() const
 
     void SetQuality(int nQ);
 
     wxPalette* GetPalette() const

-      { return (GetBitmapData() ? (& GetBitmapData()->m_bitmapPalette) : (wxPalette*) NULL); }
+      { return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : (wxPalette*) NULL); }

 
     void       SetPalette(const wxPalette& rPalette);
 
     inline wxMask* GetMask() const
 
     void       SetPalette(const wxPalette& rPalette);
 
     inline wxMask* GetMask() const

-      { return (GetBitmapData() ? GetBitmapData()->m_bitmapMask : (wxMask*) NULL); }
+      { return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : (wxMask*) NULL); }

 
     void SetMask(wxMask* pMask) ;
 
 
     void SetMask(wxMask* pMask) ;
 


@@ -194,32 +204,25 @@ public:
 
     // Implementation
 public:
 
     // Implementation
 public:

-    inline void SetHBITMAP(WXHBITMAP hHmp)
-      { SetHandle((WXHANDLE)bmp); }
+    inline void SetHBITMAP(WXHBITMAP hBmp)
+      { SetHandle((WXHANDLE)hBmp); }

 
     inline WXHBITMAP GetHBITMAP() const
       { return (WXHBITMAP)GetHandle(); }
 
     inline void  SetSelectedInto(wxDC* pDc)
 
     inline WXHBITMAP GetHBITMAP() const
       { return (WXHBITMAP)GetHandle(); }
 
     inline void  SetSelectedInto(wxDC* pDc)

-      { if (GetBitmapData()) GetBitmapData()->m_selectedInto = pDc; }
+      { if (GetBitmapData()) GetBitmapData()->m_pSelectedInto = pDc; }

 
     inline wxDC* GetSelectedInto() const
 
     inline wxDC* GetSelectedInto() const

-      { return (GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC*) NULL); }
-
-    // Creates a bitmap that matches the device context's depth, from an
-    // arbitray bitmap. At present, the original bitmap must have an associated
-    // palette. (TODO: use a default palette if no palette exists.) This
-    // function is necessary for you to Blit an arbitrary bitmap (which may
-    // have the wrong depth). wxDC::SelectObject will compare the depth of the
-    // bitmap with the DC's depth, and create a new bitmap if the depths
-    // differ. Eventually we should perhaps make this a public API function so
-    // that an app can efficiently produce bitmaps of the correct depth. The
-    // Windows solution is to use SetDibBits to blit an arbotrary DIB directly
-    // to a DC, but this is too Windows-specific, hence this solution of
-    // quietly converting the wxBitmap. Contributed by Frederic Villeneuve
-    // <frederic.villeneuve@natinst.com>
+      { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
+
+    // An OS/2 version that probably doesn't do anything like the msw version

     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
     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();


@@ -227,11 +230,15 @@ 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 CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
 
     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.


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

-};
+}; // 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


@@ -313,6 +320,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


@@ -332,17 +340,18 @@ 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
                      );

-    virtual bool Save(wxGDIImage*     pImage
-                      const wxString& rName
-                      int             lType
+    virtual bool Save( wxGDIImage*     pImage
+                      ,const wxString& rName
+                      ,int             lType

                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
                      );
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)

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

 
 #endif
   // _WX_BITMAP_H_
 
 #endif
   // _WX_BITMAP_H_