projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not add files in wxDebugReport::AddFile if copy failed
[wxWidgets.git]
/
src
/
xrc
/
xh_bmp.cpp
diff --git
a/src/xrc/xh_bmp.cpp
b/src/xrc/xh_bmp.cpp
index 181af55af3d8ac59c6e9414d49dbe42a8062fca8..aef57ea0f115d359da75edbbe3f0c274ea05c47b 100644
(file)
--- a/
src/xrc/xh_bmp.cpp
+++ b/
src/xrc/xh_bmp.cpp
@@
-1,16
+1,12
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_bmp.cpp
-// Purpose: X
ML
resource for wxBitmap and wxIcon
+// Name:
src/xrc/
xh_bmp.cpp
+// Purpose: X
RC
resource for wxBitmap and wxIcon
// Author: Vaclav Slavik
// Created: 2000/09/09
// RCS-ID: $Id$
// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Author: Vaclav Slavik
// Created: 2000/09/09
// RCS-ID: $Id$
// Copyright: (c) 2000 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#ifdef __GNUG__
-#pragma implementation "xh_bmp.h"
-#endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-19,42
+15,46
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#if wxUSE_XRC
+
#include "wx/xrc/xh_bmp.h"
#include "wx/xrc/xh_bmp.h"
-#include "wx/bitmap.h"
+#ifndef WX_PRECOMP
+ #include "wx/bitmap.h"
+#endif
-wxBitmapXmlHandler::wxBitmapXmlHandler()
-: wxXmlResourceHandler()
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
+
+wxBitmapXmlHandler::wxBitmapXmlHandler()
+ :wxXmlResourceHandler()
{
}
wxObject *wxBitmapXmlHandler::DoCreateResource()
{
}
wxObject *wxBitmapXmlHandler::DoCreateResource()
-{
- return new wxBitmap(GetBitmap(
wxT("")
));
+{
+ return new wxBitmap(GetBitmap(
m_node
));
}
}
-
-
bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxBitmap"));
}
bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxBitmap"));
}
+IMPLEMENT_DYNAMIC_CLASS(wxIconXmlHandler, wxXmlResourceHandler)
-wxIconXmlHandler::wxIconXmlHandler()
-: wxXmlResourceHandler()
+wxIconXmlHandler::wxIconXmlHandler()
+: wxXmlResourceHandler()
{
}
wxObject *wxIconXmlHandler::DoCreateResource()
{
}
wxObject *wxIconXmlHandler::DoCreateResource()
-{
- return new wxIcon(GetIcon(
wxT("")
));
+{
+ return new wxIcon(GetIcon(
m_node
));
}
}
-
-
bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxIcon"));
}
bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
{
return IsOfClass(node, wxT("wxIcon"));
}
+#endif // wxUSE_XRC