Added some standard further identifiers to help with WinCE toolbars

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 6982b9fe85103bfd4b51a2d26783c31d21189eb7..d7e9c0c376cc4469552d9e4df0a49dcd9ad02d44 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


@@ -71,7 +74,7 @@ public:
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)

-      { Init(); Ref(rBitmap); }
+      { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }

 
     // Initialize with raw data
     wxBitmap( const char bits[]
 
     // Initialize with raw data
     wxBitmap( const char bits[]


@@ -81,15 +84,19 @@ 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 resource
+    wxBitmap( int             nId

              ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
             );
 
              ,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
     // New constructor for generalised creation from data
     wxBitmap( void* pData
              ,long  lType


@@ -104,6 +111,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 +141,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);
 


@@ -147,7 +162,7 @@ public:
                         ,int   nHeight
                         ,int   nDepth = 1
                        );
                         ,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
                           ,long            lType = wxBITMAP_TYPE_BMP_RESOURCE
                          );
     virtual bool SaveFile( const wxString&  rName


@@ -159,24 +174,24 @@ 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) ;
 

-    inline bool operator==(const wxBitmap& rBitmap)
+    inline bool operator==(const wxBitmap& rBitmap) const

       { return m_refData == rBitmap.m_refData; }
 
       { 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
       { return m_refData != rBitmap.m_refData; }
 
 #if WXWIN_COMPATIBILITY_2


@@ -194,17 +209,19 @@ 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); }
+      { 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;
 
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;


@@ -216,13 +233,16 @@ 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);
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);

-    HDC                             m_hDc;
-    HPS                             m_hPs;

 
 

+    bool                            m_bIsMono;

     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.


@@ -271,7 +291,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


@@ -303,7 +323,7 @@ public:
                         ,int       nDepth = 1
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                         ,int       nDepth = 1
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap

-                          ,const wxString& rName
+                          ,int             nId

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


@@ -322,18 +342,26 @@ public:
                         ,int         nDepth = 1
                        );
     virtual bool Load( wxGDIImage*     pImage
                         ,int         nDepth = 1
                        );
     virtual bool Load( wxGDIImage*     pImage

-                      ,const wxString& rName
+                      ,int             nId

                       ,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:
                      );
 private:

+    inline virtual bool Load( wxGDIImage*     pImage
+                             ,const wxString& rName
+                             ,HPS             hPs
+                             ,long            lFlags
+                             ,int             nDesiredWidth
+                             ,int             nDesiredHeight
+                            )
+    { return FALSE; }

     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)

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

 
 #endif
   // _WX_BITMAP_H_
 
 #endif
   // _WX_BITMAP_H_