Fix history in wxWebViewIE when using a custom file scheme.

[wxWidgets.git] / src / xrc / xh_bmp.cpp

diff --git a/src/xrc/xh_bmp.cpp b/src/xrc/xh_bmp.cpp
index 1c6e18924df0b8d4eb69d304dd7443c2f8e7c363..aef57ea0f115d359da75edbbe3f0c274ea05c47b 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


@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // 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