Rename wxEllipsizeFlags elements to avoid confusion with wxEllipsizeMode.

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

diff --git a/include/wx/xrc/xh_stbox.h b/include/wx/xrc/xh_stbox.h
index a5ed46c8b7bc5713c9f47b3f6368dfd491b0f4b1..fb7b4845219849becd1d3cce7a148397f22365ee 100644 (file)
--- a/include/wx/xrc/xh_stbox.h
+++ b/include/wx/xrc/xh_stbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_stbox.h
+// Name:        wx/xrc/xh_stbox.h

 // Purpose:     XML resource handler for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/00
 // Purpose:     XML resource handler for wxStaticBox
 // Author:      Brian Gavin
 // Created:     2000/09/00


@@ -11,21 +11,20 @@
 #ifndef _WX_XH_STBOX_H_
 #define _WX_XH_STBOX_H_
 
 #ifndef _WX_XH_STBOX_H_
 #define _WX_XH_STBOX_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xh_stbox.h"
-#endif
-

 #include "wx/xrc/xmlres.h"
 
 #include "wx/xrc/xmlres.h"
 

+#if wxUSE_XRC && wxUSE_STATBOX

 
 

-class WXXMLDLLEXPORT wxStaticBoxXmlHandler : public wxXmlResourceHandler
+class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler

 {
 {

-DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
+

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

+#endif // wxUSE_XRC && wxUSE_STATBOX

 
 #endif // _WX_XH_STBOX_H_
 
 #endif // _WX_XH_STBOX_H_