use "..." for wx includes instead of <...>

[wxWidgets.git] / include / wx / statusbr.h

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index adc1bf59467e0aea2420cf8c76f5a112272838d8..adafc8bfce155776c69178f5a830707212979998 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 
 #ifndef _WX_STATUSBR_H_BASE_
 #define _WX_STATUSBR_H_BASE_
 

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

     #pragma interface "statbar.h"
 #endif
 
     #pragma interface "statbar.h"
 #endif
 


@@ -20,6 +20,10 @@
 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR
 

+#include "wx/list.h"
+
+WX_DECLARE_LIST(wxString, wxListString);
+

 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------


@@ -45,6 +49,9 @@ public:
     virtual void SetStatusText(const wxString& text, int number = 0) = 0;
     virtual wxString GetStatusText(int number = 0) const = 0;
 
     virtual void SetStatusText(const wxString& text, int number = 0) = 0;
     virtual wxString GetStatusText(int number = 0) const = 0;
 

+    void PushStatusText(const wxString& text, int number = 0);
+    void PopStatusText(int number = 0);
+

     // fields widths
     // -------------
 
     // fields widths
     // -------------
 


@@ -82,15 +89,28 @@ protected:
     // reset the widths
     void ReinitWidths() { FreeWidths(); InitWidths(); }
 
     // reset the widths
     void ReinitWidths() { FreeWidths(); InitWidths(); }
 

+    // same, for text stacks
+    void InitStacks();
+    void FreeStacks();
+    void ReinitStacks() { FreeStacks(); InitStacks(); }
+

     // calculate the real field widths for the given total available size
     wxArrayInt CalculateAbsWidths(wxCoord widthTotal) const;
 
     // calculate the real field widths for the given total available size
     wxArrayInt CalculateAbsWidths(wxCoord widthTotal) const;
 

+    // use these functions to access the stacks of field strings
+    wxListString *GetStatusStack(int i) const;
+    wxListString *GetOrCreateStatusStack(int i);
+

     // the current number of fields
     int        m_nFields;
 
     // the widths of the fields in pixels if !NULL, all fields have the same
     // width otherwise
     int       *m_statusWidths;
     // the current number of fields
     int        m_nFields;
 
     // the widths of the fields in pixels if !NULL, all fields have the same
     // width otherwise
     int       *m_statusWidths;

+
+    // stacks of previous values for PushStatusText/PopStatusText
+    // this is created on demand, use GetStatusStack/GetOrCreateStatusStack
+    wxListString **m_statusTextStacks;

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------