compilation fix: only us-ascii is safe in sources

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

diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index 60e1a894fef76591fbb44633c56d6f802b00212f..5dead981daf36bcad541aa2fe593744259958946 100644 (file)
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -19,10 +19,11 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_STATUSBAR
+

 #include "wx/frame.h"
 #include "wx/string.h"
 #include "wx/frame.h"
 #include "wx/string.h"

-
-#if wxUSE_STATUSBAR
+#include "wx/log.h"

 
 #include "wx/xrc/xh_statbar.h"
 #include "wx/statusbr.h"
 
 #include "wx/xrc/xh_statbar.h"
 #include "wx/statusbr.h"


@@ -47,6 +48,7 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource()
 
     int fields = GetLong(wxT("fields"), 1);
     wxString widths = GetParamValue(wxT("widths"));
 
     int fields = GetLong(wxT("fields"), 1);
     wxString widths = GetParamValue(wxT("widths"));

+    wxString styles = GetParamValue(wxT("styles"));

 
     if (fields > 1 && !widths.IsEmpty())
     {
 
     if (fields > 1 && !widths.IsEmpty())
     {


@@ -61,6 +63,32 @@ wxObject *wxStatusBarXmlHandler::DoCreateResource()
         statbar->SetFieldsCount(fields, width);
         delete[] width;
     }
         statbar->SetFieldsCount(fields, width);
         delete[] width;
     }

+    else
+        statbar->SetFieldsCount(fields);
+
+    if (!styles.IsEmpty())
+    {
+        int *style = new int[fields];
+        for (int i = 0; i < fields; ++i)
+        {
+            style[i] = wxSB_NORMAL;
+
+            wxString first = styles.BeforeFirst(wxT(','));
+            if (first == wxT("wxSB_NORMAL"))
+                style[i] = wxSB_NORMAL;
+            else if (first == wxT("wxSB_FLAT"))
+                style[i] = wxSB_FLAT;
+            else if (first == wxT("wxSB_RAISED"))
+                style[i] = wxSB_RAISED;
+
+            if (!first.IsEmpty())
+                wxLogError(wxT("Error in resource, unknown statusbar field style: ") + first);
+            if(styles.Find(wxT(',')))
+                styles.Remove(0, styles.Find(wxT(',')) + 1);
+        }
+        statbar->SetStatusStyles(fields, style);
+        delete [] style;
+    }

 
     if (m_parentAsWindow)
     {
 
     if (m_parentAsWindow)
     {


@@ -77,5 +105,5 @@ bool wxStatusBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxStatusBar"));
 }
 
     return IsOfClass(node, wxT("wxStatusBar"));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_STATUSBAR