projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxSpinCtrlDouble (slightly modified patch 1835864)
[wxWidgets.git]
/
src
/
xrc
/
xh_bmp.cpp
diff --git
a/src/xrc/xh_bmp.cpp
b/src/xrc/xh_bmp.cpp
index 47356ff0eddd2b3cb0696f4bf9bf6ad6abcb8740..a91318801b5307ebbd3a1e59abfac9d4cffad85c 100644
(file)
--- a/
src/xrc/xh_bmp.cpp
+++ b/
src/xrc/xh_bmp.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: xh_bmp.cpp
+// Name:
src/xrc/
xh_bmp.cpp
// Purpose: XRC resource for wxBitmap and wxIcon
// Author: Vaclav Slavik
// Created: 2000/09/09
// Purpose: XRC resource for wxBitmap and wxIcon
// Author: Vaclav Slavik
// Created: 2000/09/09
@@
-8,10
+8,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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"
@@
-22,18
+18,23
@@
#if wxUSE_XRC
#include "wx/xrc/xh_bmp.h"
#if wxUSE_XRC
#include "wx/xrc/xh_bmp.h"
-#include "wx/bitmap.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/bitmap.h"
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
wxBitmapXmlHandler::wxBitmapXmlHandler()
IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
wxBitmapXmlHandler::wxBitmapXmlHandler()
-
:
wxXmlResourceHandler()
+
:
wxXmlResourceHandler()
{
}
wxObject *wxBitmapXmlHandler::DoCreateResource()
{
{
}
wxObject *wxBitmapXmlHandler::DoCreateResource()
{
- return new wxBitmap(GetBitmap(wxT("")));
+ // NB: empty parameter name means "take directly from this node's next
+ // instead of from subnode with given name"
+ return new wxBitmap(GetBitmap(wxEmptyString));
}
bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
}
bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
@@
-50,7
+51,9
@@
wxIconXmlHandler::wxIconXmlHandler()
wxObject *wxIconXmlHandler::DoCreateResource()
{
wxObject *wxIconXmlHandler::DoCreateResource()
{
- return new wxIcon(GetIcon(wxT("")));
+ // NB: empty parameter name means "take directly from this node's next
+ // instead of from subnode with given name"
+ return new wxIcon(GetIcon(wxEmptyString));
}
bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
}
bool wxIconXmlHandler::CanHandle(wxXmlNode *node)