wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index d31371c89185dcda7e0c5e037db002cfee08483a..90bcc1e7f382d521c472e6daf3e299c0bf7e7486 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -46,7 +46,7 @@ public:
     wxBitmap() { Init(); }
 
     // Copy constructors
     wxBitmap() { Init(); }
 
     // Copy constructors

-    wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
+    wxBitmap(const wxBitmap& bitmap) : wxGDIImage(bitmap) { Init(); Ref(bitmap); }

 
     // Initialize with raw data
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
     // Initialize with raw data
     wxBitmap(const char bits[], int width, int height, int depth = 1);


@@ -71,7 +71,7 @@ public:
     // Create a bitmap compatible with the given DC
     wxBitmap(int width, int height, const wxDC& dc);
 
     // Create a bitmap compatible with the given DC
     wxBitmap(int width, int height, const wxDC& dc);
 

-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && wxUSE_WXDIB

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


@@ -108,7 +108,7 @@ public:
 
     virtual ~wxBitmap();
 
 
     virtual ~wxBitmap();
 

-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && wxUSE_WXDIB

     wxImage ConvertToImage() const;
 #endif // wxUSE_IMAGE
 
     wxImage ConvertToImage() const;
 #endif // wxUSE_IMAGE
 


@@ -179,6 +179,7 @@ protected:
     void Init();
 
     virtual wxGDIImageRefData *CreateData() const;
     void Init();
 
     virtual wxGDIImageRefData *CreateData() const;

+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

 
     // creates the bitmap from XPM data, supposed to be called from ctor
     bool CreateFromXpm(const char **bits);
 
     // creates the bitmap from XPM data, supposed to be called from ctor
     bool CreateFromXpm(const char **bits);


@@ -186,7 +187,7 @@ protected:
     // creates an uninitialized bitmap, called from Create()s above
     bool DoCreate(int w, int h, int depth, WXHDC hdc);
 
     // creates an uninitialized bitmap, called from Create()s above
     bool DoCreate(int w, int h, int depth, WXHDC hdc);
 

-#if wxUSE_IMAGE
+#if wxUSE_IMAGE && wxUSE_WXDIB

     // creates the bitmap from wxImage, supposed to be called from ctor
     bool CreateFromImage(const wxImage& image, int depth);
 
     // creates the bitmap from wxImage, supposed to be called from ctor
     bool CreateFromImage(const wxImage& image, int depth);