Use "_x64" instead of "amd64" for x64 MSW makefile builds.

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 0206629798817811376f0b69c8a564d8908b2683..653dd9635a66aea007158ae92aa64d97f1b2d8b4 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -25,7 +25,6 @@ class WXDLLIMPEXP_FWD_CORE wxIcon;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxCursor;
 class WXDLLIMPEXP_FWD_CORE wxControl;
 class WXDLLIMPEXP_FWD_CORE wxMask;
 class WXDLLIMPEXP_FWD_CORE wxCursor;
 class WXDLLIMPEXP_FWD_CORE wxControl;

-class WXDLLIMPEXP_FWD_CORE wxImage;

 class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 // ----------------------------------------------------------------------------
 class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 // ----------------------------------------------------------------------------


@@ -114,7 +113,16 @@ public:
             );
 
     // If depth is omitted, will create a bitmap compatible with the display
             );
 
     // If depth is omitted, will create a bitmap compatible with the display

-    wxBitmap( int nWidth, int nHeight, int nDepth = -1 );
+    wxBitmap( int nWidth, int nHeight, int nDepth = -1 )
+    {
+        Init();
+        (void)Create(nWidth, nHeight, nDepth);
+    }
+    wxBitmap( const wxSize& sz, int nDepth = -1 )
+    {
+        Init();
+        (void)Create(sz, nDepth);
+    }

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


@@ -140,6 +148,7 @@ public:
     virtual ~wxBitmap();
 
     wxImage ConvertToImage() const;
     virtual ~wxBitmap();
 
     wxImage ConvertToImage() const;

+    wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;

 
     // get the given part of bitmap
     wxBitmap GetSubBitmap(const wxRect& rRect) const;
 
     // get the given part of bitmap
     wxBitmap GetSubBitmap(const wxRect& rRect) const;


@@ -152,8 +161,11 @@ public:
 
     virtual bool Create( int nWidth
                         ,int nHeight
 
     virtual bool Create( int nWidth
                         ,int nHeight

-                        ,int nDepth = -1
+                        ,int nDepth = wxBITMAP_SCREEN_DEPTH

                        );
                        );

+    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
+        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
+

     virtual bool Create( const void* pData
                         ,wxBitmapType lType
                         ,int   nWidth
     virtual bool Create( const void* pData
                         ,wxBitmapType lType
                         ,int   nWidth