Applied rowspan patch #15276 (dghart)

[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 f42f3b828a4a7db2e9fa98f128fc92d35d044deb..f4e07e14ddf9b9dceddf2ea21b1a3c38a43905cc 100644 (file)
--- a/include/wx/xrc/xh_grid.h
+++ b/include/wx/xrc/xh_grid.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/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$
 // Author:      Agron Selimaj
 // Created:     2005/08/11
 // RCS-ID:      $Id$


@@ -11,24 +11,19 @@
 #ifndef _WX_XH_GRD_H_
 #define _WX_XH_GRD_H_
 
 #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 && wxUSE_GRID
 
 class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
 {
 #include "wx/xrc/xmlres.h"
 
 #if wxUSE_XRC && wxUSE_GRID
 
 class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
 {

+    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
+

 public:
     wxGridXmlHandler();
 
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 public:
     wxGridXmlHandler();
 
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);

-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)

 };
 
 #endif // wxUSE_XRC && wxUSE_GRID
 };
 
 #endif // wxUSE_XRC && wxUSE_GRID