X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..e143fb636d50d5802dcc8c7c2e9e8e2944afa467:/include/wx/statusbr.h diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h index f75d053720..66ec068c96 100644 --- a/include/wx/statusbr.h +++ b/include/wx/statusbr.h @@ -20,9 +20,7 @@ #include "wx/list.h" #include "wx/dynarray.h" -extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxStatusBarNameStr[]; - -WX_DECLARE_LIST(wxString, wxListString); +extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusBarNameStr[]; // ---------------------------------------------------------------------------- // wxStatusBar constants @@ -33,6 +31,29 @@ WX_DECLARE_LIST(wxString, wxListString); #define wxSB_FLAT 0x0001 #define wxSB_RAISED 0x0002 +// ---------------------------------------------------------------------------- +// wxStatusBarPane: an helper for wxStatusBar +// ---------------------------------------------------------------------------- + +class wxStatusBarPane +{ +public: + wxStatusBarPane(int style = wxSB_NORMAL, size_t width = 0) + : nStyle(style), nWidth(width) { arrStack.Add(wxEmptyString); } + + int nStyle; + int nWidth; // the width maybe negative, indicating a variable-width field + + // this is the array of the stacked strings of this pane; note that this + // stack does include also the string currently displayed in this pane + // as the version stored in the native status bar control is possibly + // ellipsized; note that arrStack.Last() is the top of the stack + // (i.e. the string shown in the status bar) + wxArrayString arrStack; +}; + +WX_DECLARE_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray); + // ---------------------------------------------------------------------------- // wxStatusBar: a window near the bottom of the frame used for status info // ---------------------------------------------------------------------------- @@ -50,13 +71,15 @@ public: // set the number of fields and call SetStatusWidths(widths) if widths are // given virtual void SetFieldsCount(int number = 1, const int *widths = NULL); - int GetFieldsCount() const { return m_nFields; } + int GetFieldsCount() const { return m_panes.GetCount(); } // field text // ---------- - 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) + { m_panes[number].arrStack.Last() = text; } + virtual wxString GetStatusText(int number = 0) const + { return m_panes[number].arrStack.Last(); } void PushStatusText(const wxString& text, int number = 0); void PopStatusText(int number = 0); @@ -102,47 +125,16 @@ public: protected: virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - // set the widths array to NULL - void InitWidths(); - - // free the status widths arrays - void FreeWidths(); - - // reset the widths - void ReinitWidths() { FreeWidths(); InitWidths(); } - - // same, for field styles - void InitStyles(); - void FreeStyles(); - void ReinitStyles() { FreeStyles(); InitStyles(); } - - // 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; - // 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 array with the pane infos: + wxStatusBarPaneArray m_panes; - // the styles of the fields - int *m_statusStyles; + // if true overrides the width info of the wxStatusBarPanes + bool m_bSameWidthForAllPanes; - // stacks of previous values for PushStatusText/PopStatusText - // this is created on demand, use GetStatusStack/GetOrCreateStatusStack - wxListString **m_statusTextStacks; - - DECLARE_NO_COPY_CLASS(wxStatusBarBase) + wxDECLARE_NO_COPY_CLASS(wxStatusBarBase); }; // ---------------------------------------------------------------------------- @@ -151,22 +143,18 @@ protected: #if defined(__WXUNIVERSAL__) #define wxStatusBarUniv wxStatusBar - #include "wx/univ/statusbr.h" #elif defined(__WXPALMOS__) #define wxStatusBarPalm wxStatusBar - #include "wx/palmos/statusbr.h" #elif defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR #include "wx/msw/statusbar.h" #elif defined(__WXMAC__) #define wxStatusBarMac wxStatusBar - #include "wx/generic/statusbr.h" - #include "wx/mac/statusbr.h" + #include "wx/osx/statusbr.h" #else #define wxStatusBarGeneric wxStatusBar - #include "wx/generic/statusbr.h" #endif