From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Dec 1999 21:59:02 +0000 (+0000)
Subject: compilation fix after incorrectly resolved conflict
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d5e295970c3c7e0da478425c59cc176a5cfb71d8

compilation fix after incorrectly resolved conflict


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/image.h b/include/wx/image.h
index 8236f2bf44..93d16b3778 100644
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -154,33 +154,9 @@ public:
 };
 #endif
 
-//-----------------------------------------------------------------------------
-// wxBMPHandler
-//-----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxBMPHandler: public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxBMPHandler)
-
-public:
-
-  inline wxBMPHandler()
-  {
-      m_name = "BMP file";
-      m_extension = "bmp";
-      m_type = wxBITMAP_TYPE_BMP;
-      m_mime = "image/bmp";
-  };
-
-#if wxUSE_STREAMS
-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
-  virtual bool DoCanRead( wxInputStream& stream );
-#endif
-};
-
-
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxPNMHandler
+// ----------------------------------------------------------------------------
 
 #if wxUSE_PNM
 class WXDLLEXPORT wxPNMHandler : public wxImageHandler