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

compilation fix after incorrectly resolved conflict

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-16 21:59:02 +00:00
parent 7521ca7d84
commit d5e295970c
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/image.h
View File

@@ -154,33 +154,9 @@ public:
}; };
#endif #endif
//----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxBMPHandler // wxPNMHandler
//----------------------------------------------------------------------------- // ----------------------------------------------------------------------------
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
};
//-----------------------------------------------------------------------------
#if wxUSE_PNM #if wxUSE_PNM
class WXDLLEXPORT wxPNMHandler : public wxImageHandler class WXDLLEXPORT wxPNMHandler : public wxImageHandler