Use wxGetTranslation() instead of _() in the public headers.

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 6b49e345d78ac27d694bba9cf963f4d60f9244de..bff20807e3a19a9b00b5681de444e848016b6b5d 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -81,7 +80,7 @@ protected:
     virtual void InitColours();
 
     // true if the status bar shows the size grip: for this it must have
     virtual void InitColours();
 
     // true if the status bar shows the size grip: for this it must have

-    // wxSTB_SIZEGRIP style and the window it is attached to must be resizeable
+    // wxSTB_SIZEGRIP style and the window it is attached to must be resizable

     // and not maximized
     bool ShowsSizeGrip() const;
 
     // and not maximized
     bool ShowsSizeGrip() const;
 


@@ -91,8 +90,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 +106,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)
 };