guard grid XRC handler by #if wxUSE_GRID

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/xrc/xh_grid.h b/include/wx/xrc/xh_grid.h
index 762ae2de1c957236425ae5908fb6270580307fcc..f42f3b828a4a7db2e9fa98f128fc92d35d044deb 100644 (file)
--- a/include/wx/xrc/xh_grid.h
+++ b/include/wx/xrc/xh_grid.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_grid.h
+// Name:        wx/xh_grid.h

 // Purpose:     XML resource handler for the grid control
 // Author:      Agron Selimaj
 // Created:     2005/08/11
 // Purpose:     XML resource handler for the grid control
 // Author:      Agron Selimaj
 // Created:     2005/08/11


@@ -17,18 +17,20 @@
 
 #include "wx/xrc/xmlres.h"
 
 
 #include "wx/xrc/xmlres.h"
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_GRID

 
 class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
 {
 
 class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
 {

-DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)

 public:
 public:

-       wxGridXmlHandler();
+    wxGridXmlHandler();
+

     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);

-};

 
 

-#endif // wxUSE_XRC
+private:
+    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
+};

 
 

+#endif // wxUSE_XRC && wxUSE_GRID

 
 #endif // _WX_XH_GRD_H_
 
 #endif // _WX_XH_GRD_H_

diff --git a/src/xrc/xh_grid.cpp b/src/xrc/xh_grid.cpp
index a5cea99ad762650119dee05708cb8393171a612a..e3031ee27f14ca3c43f67f8260dc797be3658371 100644 (file)
--- a/src/xrc/xh_grid.cpp
+++ b/src/xrc/xh_grid.cpp
@@ -15,7 +15,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_GRID

 
 #include "wx/xrc/xh_grid.h"
 #include "wx/grid.h"
 
 #include "wx/xrc/xh_grid.h"
 #include "wx/grid.h"


@@ -23,7 +23,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGridXmlHandler, wxXmlResourceHandler)
 
 wxGridXmlHandler::wxGridXmlHandler()
 IMPLEMENT_DYNAMIC_CLASS(wxGridXmlHandler, wxXmlResourceHandler)
 
 wxGridXmlHandler::wxGridXmlHandler()

-: wxXmlResourceHandler()
+                : wxXmlResourceHandler()

 {
     AddWindowStyles();
 }
 {
     AddWindowStyles();
 }


@@ -48,4 +48,4 @@ bool wxGridXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxGrid"));
 }
 
     return IsOfClass(node, wxT("wxGrid"));
 }
 

-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_GRID