X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cfd8e74094ed631e68f7baf6e506611559362d81..eef1a0cc63093cdffdc0f718c80f413c33c0562d:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 9a2b830e43..b176f616e5 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -13,7 +13,6 @@ #define _WX_BITMAP_H_ #include "wx/msw/gdiimage.h" -#include "wx/gdicmn.h" #include "wx/palette.h" class WXDLLEXPORT wxBitmap; @@ -232,7 +231,7 @@ protected: class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler { public: - wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; } + wxBitmapHandler() { } wxBitmapHandler(const wxString& name, const wxString& ext, long type) : wxGDIImageHandler(name, ext, type) { @@ -243,26 +242,15 @@ public: virtual bool Create(wxBitmap *bitmap, const void* data, long flags, - int width, int height, int depth = 1) - { - return Create((wxGDIImage *)bitmap, data, flags, width, height, depth); - } - + int width, int height, int depth = 1); virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags, - int desiredWidth, int desiredHeight) - { - return Load(bitmap, name, flags, desiredWidth, desiredHeight); - } - + int desiredWidth, int desiredHeight); virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, - const wxPalette * WXUNUSED(palette) = NULL) - { - return Save(bitmap, name, type); - } + const wxPalette *palette = NULL); virtual bool Create(wxGDIImage *image, const void* data,