projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxUSE_TOOLTIPS and wxUSE_IMAGE furthur fixes
[wxWidgets.git]
/
src
/
x11
/
bitmap.cpp
diff --git
a/src/x11/bitmap.cpp
b/src/x11/bitmap.cpp
index 1b5cff4135e484ea5b0353a80fa5a3fdfb917cd6..d2901ad3b3db11b3d73439a1efddac5f17f2e505 100644
(file)
--- a/
src/x11/bitmap.cpp
+++ b/
src/x11/bitmap.cpp
@@
-1316,13
+1316,13
@@
IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandler, wxBitmapHandlerBase);
class wxXPMFileHandler : public wxBitmapHandler
{
class wxXPMFileHandler : public wxBitmapHandler
{
- DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
;
+ DECLARE_DYNAMIC_CLASS(wxXPMFileHandler)
public:
wxXPMFileHandler()
{
public:
wxXPMFileHandler()
{
-
m_name = wxT("XPM file"
);
-
m_extension = wxT("xpm"
);
-
m_type = wxBITMAP_TYPE_XPM
;
+
SetName( wxT("XPM file")
);
+
SetExtension( wxT("xpm")
);
+
SetType( wxBITMAP_TYPE_XPM )
;
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
@@
-1424,13
+1424,13
@@
bool wxXPMFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name,
class wxXPMDataHandler : public wxBitmapHandler
{
class wxXPMDataHandler : public wxBitmapHandler
{
- DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
;
+ DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
public:
wxXPMDataHandler()
{
public:
wxXPMDataHandler()
{
-
m_name = wxT("XPM data"
);
-
m_extension = wxT("xpm"
);
-
m_type = wxBITMAP_TYPE_XPM_DATA
;
+
SetName( wxT("XPM data")
);
+
SetExtension( wxT("xpm")
);
+
SetType( wxBITMAP_TYPE_XPM_DATA )
;
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
@@
-1529,9
+1529,9
@@
class WXDLLEXPORT wxXBMDataHandler: public wxBitmapHandler
public:
inline wxXBMDataHandler()
{
public:
inline wxXBMDataHandler()
{
-
m_name = wxT("XBM data"
);
-
m_extension = wxT("xbm"
);
-
m_type = wxBITMAP_TYPE_XBM_DATA
;
+
SetName( wxT("XBM data")
);
+
SetExtension( wxT("xbm")
);
+
SetType( wxBITMAP_TYPE_XBM_DATA )
;
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
};
virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,