From cb62a16afbc5706ef9834e7897c1afb42f5ce40e Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Sun, 8 Oct 2006 15:59:15 +0000
Subject: [PATCH] revert last change, plus small cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/msw/bitmap.h | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

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,
-- 
2.45.2