Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 7d54f17010ab4009e6dae9acdf358b7f3be1cc3d..a27eaf6dad9c2b94938b3d370260845b2e4dada9 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -91,8 +91,9 @@ protected:
     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();
 

-    // the last known height of the client rect
-    int               m_lastClientHeight;
+    // the last known size, fields widths must be updated whenever it's out of
+    // date
+    wxSize m_lastClientSize;

 
     // the absolute widths of the status bar panes in pixels
     wxArrayInt        m_widthsAbs;
 
     // the absolute widths of the status bar panes in pixels
     wxArrayInt        m_widthsAbs;


@@ -106,6 +107,9 @@ protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private:

+    // Update m_lastClientSize and m_widthsAbs from the current size.
+    void DoUpdateFieldWidths();
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBarGeneric)
 };