check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

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

diff --git a/src/xrc/xh_statbar.cpp b/src/xrc/xh_statbar.cpp
index d69735c63b31ce698341baa6d523c669bd4e93b0..61b421a0d458896e258c1b640bedd4c68417f1c0 100644 (file)
--- a/src/xrc/xh_statbar.cpp
+++ b/src/xrc/xh_statbar.cpp
@@ -3,12 +3,12 @@
 // Purpose:     XRC resource for wxStatusBar
 // Author:      Brian Ravnsgaard Riis
 // Created:     2004/01/21
 // Purpose:     XRC resource for wxStatusBar
 // Author:      Brian Ravnsgaard Riis
 // Created:     2004/01/21

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   (c) 2004 Brian Ravnsgaard Riis
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 2004 Brian Ravnsgaard Riis
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "xh_statbar.h"
 #endif
 
 #pragma implementation "xh_statbar.h"
 #endif
 


@@ -19,15 +19,18 @@
     #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"
 

-wxStatusBarXmlHandler::wxStatusBarXmlHandler() : 
+IMPLEMENT_DYNAMIC_CLASS(wxStatusBarXmlHandler, wxXmlResourceHandler)
+
+wxStatusBarXmlHandler::wxStatusBarXmlHandler() :

         wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxST_SIZEGRIP);
         wxXmlResourceHandler()
 {
     XRC_ADD_STYLE(wxST_SIZEGRIP);


@@ -45,12 +48,13 @@ 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)
+    if (fields > 1 && !widths.IsEmpty())

     {
         int *width = new int[fields];
     {
         int *width = new int[fields];

-  
-        for (unsigned int i = 0; i < fields; ++i)
+
+        for (int i = 0; i < fields; ++i)

         {
             width[i] = wxAtoi(widths.BeforeFirst(wxT(',')));
             if(widths.Find(wxT(',')))
         {
             width[i] = wxAtoi(widths.BeforeFirst(wxT(',')));
             if(widths.Find(wxT(',')))


@@ -59,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)
     {


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

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