Compilation fix for STL build in wxGtkCollatableString code.

[wxWidgets.git] / include / wx / xrc / xh_grid.h

diff --git a/include/wx/xrc/xh_grid.h b/include/wx/xrc/xh_grid.h
index 762ae2de1c957236425ae5908fb6270580307fcc..f4e07e14ddf9b9dceddf2ea21b1a3c38a43905cc 100644 (file)
--- a/include/wx/xrc/xh_grid.h
+++ b/include/wx/xrc/xh_grid.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_grid.h
-// Purpose:     XML resource handler for the grid control
+// Name:        wx/xrc/xh_grid.h
+// Purpose:     XML resource handler for wxGrid
 // Author:      Agron Selimaj
 // Created:     2005/08/11
 // RCS-ID:      $Id$
@@ -11,24 +11,21 @@
 #ifndef _WX_XH_GRD_H_
 #define _WX_XH_GRD_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_grid.cpp"
-#endif
-
 #include "wx/xrc/xmlres.h"
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_GRID
 
 class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
+
 public:
-       wxGridXmlHandler();
+    wxGridXmlHandler();
+
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
-#endif // wxUSE_XRC
-
+#endif // wxUSE_XRC && wxUSE_GRID
 
 #endif // _WX_XH_GRD_H_