added wxUSE_PRINTF_POS_PARAMS which can be used to force the use of built-in printf...

[wxWidgets.git] / src / xrc / xh_statbar.cpp

diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index 2bb2a51d0a8c20e566b4aec80d473ae37885e4f6..fc701a23f7933e5d54516df636a22f4842dd2bae 100644 (file)
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_statbar.cpp
+// Name:        src/xrc/xh_statbar.cpp
 // Purpose:     XRC resource for wxStatusBar
 // Author:      Brian Ravnsgaard Riis
 // Created:     2004/01/21
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_statbar.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,19 +15,21 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR
-
-#include "wx/frame.h"
-#include "wx/string.h"
-#include "wx/log.h"
+#if wxUSE_XRC && wxUSE_STATUSBAR
 
 #include "wx/xrc/xh_statbar.h"
-#include "wx/statusbr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/statusbr.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
 
-wxStatusBarXmlHandler::wxStatusBarXmlHandler() :
-        wxXmlResourceHandler()
+wxStatusBarXmlHandler::wxStatusBarXmlHandler()
+                      :wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxST_SIZEGRIP);
     AddWindowStyles();
@@ -66,7 +64,7 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource()
     else
         statbar->SetFieldsCount(fields);
 
-    if (!styles.IsEmpty())
+    if (!styles.empty())
     {
         int *style = new int[fields];
         for (int i = 0; i < fields; ++i)
@@ -81,7 +79,7 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource()
             else if (first == wxT("wxSB_RAISED"))
                 style[i] = wxSB_RAISED;
 
-            if (!first.IsEmpty())
+            if (!first.empty())
                 wxLogError(wxT("Error in resource, unknown statusbar field style: ") + first);
             if(styles.Find(wxT(',')))
                 styles.Remove(0, styles.Find(wxT(',')) + 1);
@@ -105,5 +103,4 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStatusBar"));
 }
 
-#endif // wxUSE_XML && wxUSE_XRC && wxUSE_STATUSBAR
-
+#endif // wxUSE_XRC && wxUSE_STATUSBAR