Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert last change, plus small cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-10-08 15:59:15 +00:00
parent a277deba22
commit cb62a16afb
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/msw/bitmap.h
View File

@@ -13,7 +13,6 @@
#define _WX_BITMAP_H_ #define _WX_BITMAP_H_
#include "wx/msw/gdiimage.h" #include "wx/msw/gdiimage.h"
#include "wx/gdicmn.h"
#include "wx/palette.h" #include "wx/palette.h"
class WXDLLEXPORT wxBitmap; class WXDLLEXPORT wxBitmap;
@@ -232,7 +231,7 @@ protected:
class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler class WXDLLEXPORT wxBitmapHandler : public wxGDIImageHandler
{ {
public: public:
wxBitmapHandler() { m_type = wxBITMAP_TYPE_INVALID; } wxBitmapHandler() { }
wxBitmapHandler(const wxString& name, const wxString& ext, long type) wxBitmapHandler(const wxString& name, const wxString& ext, long type)
: wxGDIImageHandler(name, ext, type) : wxGDIImageHandler(name, ext, type)
{ {
@@ -243,26 +242,15 @@ public:
virtual bool Create(wxBitmap *bitmap, virtual bool Create(wxBitmap *bitmap,
const void* data, const void* data,
long flags, long flags,
int width, int height, int depth = 1) int width, int height, int depth = 1);
{
return Create((wxGDIImage *)bitmap, data, flags, width, height, depth);
}
virtual bool LoadFile(wxBitmap *bitmap, virtual bool LoadFile(wxBitmap *bitmap,
const wxString& name, const wxString& name,
long flags, long flags,
int desiredWidth, int desiredHeight) int desiredWidth, int desiredHeight);
{
return Load(bitmap, name, flags, desiredWidth, desiredHeight);
}
virtual bool SaveFile(wxBitmap *bitmap, virtual bool SaveFile(wxBitmap *bitmap,
const wxString& name, const wxString& name,
int type, int type,
const wxPalette * WXUNUSED(palette) = NULL) const wxPalette *palette = NULL);
{
return Save(bitmap, name, type);
}
virtual bool Create(wxGDIImage *image, virtual bool Create(wxGDIImage *image,
const void* data, const void* data,