added wxTE_BESTWRAP style (which is the default now); renamed wxTE_LINEWRAP to wxTE_C...

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index fdd415cfbcac7070c662bb691a34b07674f6c257..ca736176eaf8b1a09e9c5b2a47a721784a3e1e98 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -29,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


@@ -54,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


@@ -72,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[]


@@ -82,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


@@ -105,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)


@@ -132,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);
 


@@ -148,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


@@ -174,25 +188,12 @@ public:
 
     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; }
 
       { return m_refData != rBitmap.m_refData; }
 

-#if WXWIN_COMPATIBILITY_2
-    void SetOk(bool bIsOk);
-#endif // WXWIN_COMPATIBILITY_2
-
-#if WXWIN_COMPATIBILITY
-    inline wxPalette* GetColourMap() const
-      { return GetPalette(); }
-
-    inline void       SetColourMap(wxPalette* pCmap)
-      { SetPalette(*pCmap); };
-
-#endif // WXWIN_COMPATIBILITY
-

     // Implementation
 public:
     inline void SetHBITMAP(WXHBITMAP hBmp)
     // Implementation
 public:
     inline void SetHBITMAP(WXHBITMAP hBmp)


@@ -207,6 +208,8 @@ public:
     inline wxDC* GetSelectedInto() const
       { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : (wxDC*) NULL); }
 
     inline wxDC* GetSelectedInto() const
       { 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;
 


@@ -217,11 +220,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);
 

+    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.


@@ -270,10 +278,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


@@ -305,7 +310,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


@@ -324,7 +329,7 @@ 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


@@ -334,8 +339,16 @@ public:
                       ,int             lType
                      );
 private:
                       ,int             lType
                      );
 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_