define WM_CONTEXTMENU if the standard headers don't

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

diff --git a/src/xrc/xh_panel.cpp b/src/xrc/xh_panel.cpp
index b4b4c82810db9bfc0f4b6be3d6d46a866462825a..d059aebba823114fbb809fd9c75f909ed63592cc 100644 (file)
--- a/src/xrc/xh_panel.cpp
+++ b/src/xrc/xh_panel.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_panel.h"
 #endif
 
 #pragma implementation "xh_panel.h"
 #endif
 


@@ -19,6 +19,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
 #include "wx/frame.h"  // to get wxNO_3D
 #include "wx/xrc/xh_panel.h"
 #include "wx/panel.h"
 #include "wx/frame.h"  // to get wxNO_3D


@@ -30,12 +32,12 @@ wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);

-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+    

     AddWindowStyles();
 }
 
 wxObject *wxPanelXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxPanelXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(panel, wxPanel)
 
     panel->Create(m_parentAsWindow,
     XRC_MAKE_INSTANCE(panel, wxPanel)
 
     panel->Create(m_parentAsWindow,


@@ -46,7 +48,7 @@ wxObject *wxPanelXmlHandler::DoCreateResource()
 
     SetupWindow(panel);
     CreateChildren(panel);
 
     SetupWindow(panel);
     CreateChildren(panel);

-    
+

     return panel;
 }
 
     return panel;
 }
 


@@ -54,3 +56,5 @@ bool wxPanelXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxPanel"));
 }
 {
     return IsOfClass(node, wxT("wxPanel"));
 }

+
+#endif // wxUSE_XRC