Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index d059aebba823114fbb809fd9c75f909ed63592cc..04a21ddfbd9b2bf21099321ae0770b9c6ee00357 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_panel.cpp
+// Name:        src/xrc/xh_panel.cpp

 // Purpose:     XRC resource for panels
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // Purpose:     XRC resource for panels
 // Author:      Vaclav Slavik
 // Created:     2000/03/05


@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xh_panel.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,17 +18,22 @@
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_panel.h"
 #if wxUSE_XRC
 
 #include "wx/xrc/xh_panel.h"

-#include "wx/panel.h"
-#include "wx/frame.h"  // to get wxNO_3D
+
+#ifndef WX_PRECOMP
+    #include "wx/panel.h"
+    #include "wx/frame.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
 {
 
 IMPLEMENT_DYNAMIC_CLASS(wxPanelXmlHandler, wxXmlResourceHandler)
 
 wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
 {

+#if WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxNO_3D);

+#endif // WXWIN_COMPATIBILITY_2_6

     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);

-    
+

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }