improve best size calculation; notably account for wxDP_ALLOWNONE

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

diff --git a/include/wx/xrc/xh_sttxt.h b/include/wx/xrc/xh_sttxt.h
index 072c6bc9957a31fed1c38accbc290be6b1a11636..87d0d49a417319a9484593c5f934ca44d38c0f3a 100644 (file)
--- a/include/wx/xrc/xh_sttxt.h
+++ b/include/wx/xrc/xh_sttxt.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_sttxt.h
-// Purpose:     XML resource handler for wxStaticBitmap
+// Name:        wx/xrc/xh_sttxt.h
+// Purpose:     XML resource handler for wxStaticText
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // RCS-ID:      $Id$
@@ -11,21 +11,20 @@
 #ifndef _WX_XH_STTXT_H_
 #define _WX_XH_STTXT_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "xh_sttxt.h"
-#endif
-
 #include "wx/xrc/xmlres.h"
 
+#if wxUSE_XRC && wxUSE_STATTEXT
 
 class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
 {
-DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
+    DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
+
 public:
     wxStaticTextXmlHandler();
     virtual wxObject *DoCreateResource();
     virtual bool CanHandle(wxXmlNode *node);
 };
 
+#endif // wxUSE_XRC && wxUSE_STATTEXT
 
-#endif // _WX_XH_STBMP_H_
+#endif // _WX_XH_STTXT_H_