X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..e5156e154a0fb21570d954bf0b699553989bcd47:/src/generic/statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 00588ff0f6..3e8dc6024c 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "statusbr.h"
 #endif
 
@@ -80,18 +80,20 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
   if ( !wxWindow::Create(parent, id,
                          wxDefaultPosition, wxDefaultSize,
                          style | wxTAB_TRAVERSAL, name) )
-      return FALSE;
+      return false;
 
   // The status bar should have a themed background
-  SetThemeEnabled( TRUE );
+  SetThemeEnabled( true );
 
   // Don't wish this to be found as a child
 #ifndef __WXMAC__
   parent->GetChildren().DeleteObject(this);
 #endif
   InitColours();
-
-  SetFont(m_defaultStatusBarFont);
+  
+#ifdef __WXPM__
+  SetFont(*wxSMALL_FONT);
+#endif
 
   // Set the height according to the font and the border size
   wxClientDC dc(this);
@@ -102,9 +104,29 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
   int height = (int)( (11*y)/10 + 2*GetBorderY());
 
-  SetSize(-1, -1, -1, height);
+  SetSize(wxDefaultPosition.x, wxDefaultPosition.y, wxDefaultSize.x, height);
+
+  SetFieldsCount(1);
+
+  return true;
+}
+
+
+wxSize wxStatusBarGeneric::DoGetBestSize() const
+{
+    int width, height;
+
+    // best width is the width of the parent
+    GetParent()->GetClientSize(&width, NULL);
+
+    // best height is as calculated above in Create
+    wxClientDC dc((wxWindow*)this);
+    dc.SetFont(GetFont());
+    wxCoord y;
+    dc.GetTextExtent(_T("X"), NULL, &y );
+    height = (int)( (11*y)/10 + 2*GetBorderY());
 
-  return TRUE;
+    return wxSize(width, height);
 }
 
 void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
@@ -131,12 +153,16 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
     wxCHECK_RET( (number >= 0) && (number < m_nFields),
                  _T("invalid status bar field index") );
 
-    m_statusStrings[number] = text;
+    wxString oldText = m_statusStrings[number];
+    if (oldText != text)
+    {
+        m_statusStrings[number] = text;
 
-    wxRect rect;
-    GetFieldRect(number, rect);
+        wxRect rect;
+        GetFieldRect(number, rect);
 
-    Refresh( TRUE, &rect );
+        Refresh( true, &rect );
+    }
 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const
@@ -181,7 +207,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
     {
         int width, height;
         GetClientSize(&width, &height);
-        
+
         gtk_paint_resize_grip( m_widget->style,
                                GTK_PIZZA(m_wxwindow)->bin_window,
                                (GtkStateType) GTK_WIDGET_STATE (m_widget),
@@ -190,13 +216,13 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
                                "statusbar",
                                GDK_WINDOW_EDGE_SOUTH_EAST,
                                width-height-2, 1, height-2, height-3 );
-        
+
     }
 #endif
 
   if (GetFont().Ok())
         dc.SetFont(GetFont());
-    
+
   dc.SetBackgroundMode(wxTRANSPARENT);
 
 #ifdef __WXPM__
@@ -287,7 +313,7 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
   // Get the position and size of the field's internal bounding rectangle
 bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
 {
-    wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE,
+    wxCHECK_MSG( (n >= 0) && (n < m_nFields), false,
                  _T("invalid status bar field index") );
 
     // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ)
@@ -321,14 +347,14 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
     rect.width = m_widthsAbs[n] - 2*m_borderX;
     rect.height = height - 2*m_borderY;
 
-    return TRUE;
+    return true;
 }
 
 // Initialize colours
 void wxStatusBarGeneric::InitColours()
 {
     // Shadow colours
-#if defined(__WIN95__)
+#if defined(__WIN95__) || defined(__WXMAC__)
     wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
     m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
 
@@ -344,23 +370,16 @@ void wxStatusBarGeneric::InitColours()
     SetBackgroundColour(vColour);
     vColour.Set(wxString("BLACK"));
     SetForegroundColour(vColour);
-    m_defaultStatusBarFont = *wxSMALL_FONT;
 #else
     m_mediumShadowPen = wxPen("GREY", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
 #endif
-
-#ifndef __WXPM__
-    m_defaultStatusBarFont = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-#endif
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     InitColours();
-    Refresh();
 
     // Propagate the event to the non-top-level children
     wxWindow::OnSysColourChanged(event);
@@ -376,7 +395,7 @@ void wxStatusBarGeneric::SetMinHeight(int height)
 
     if ( height > (11*y)/10 )
     {
-        SetSize(-1, -1, -1, height + 2*m_borderY);
+        SetSize(wxDefaultPosition.x, wxDefaultPosition.y, wxDefaultSize.x, height + 2*m_borderY);
     }
 }
 
@@ -385,7 +404,7 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
 #ifdef __WXGTK20__
     int width, height;
     GetClientSize(&width, &height);
-    
+
     if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
@@ -402,16 +421,16 @@ void wxStatusBarGeneric::OnLeftDown(wxMouseEvent& event)
         gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
                                   GDK_WINDOW_EDGE_SOUTH_EAST,
                                   1,
-                                  org_x + event.GetX(), 
-                                  org_y + event.GetY(), 
+                                  org_x + event.GetX(),
+                                  org_y + event.GetY(),
                                   0);
     }
     else
     {
-        event.Skip( TRUE );
+        event.Skip( true );
     }
 #else
-    event.Skip( TRUE );
+    event.Skip( true );
 #endif
 }
 
@@ -420,7 +439,7 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
 #ifdef __WXGTK20__
     int width, height;
     GetClientSize(&width, &height);
-    
+
     if (HasFlag( wxST_SIZEGRIP ) && (event.GetX() > width-height))
     {
         GtkWidget *ancestor = gtk_widget_get_toplevel( m_widget );
@@ -433,19 +452,19 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event)
         int org_x = 0;
         int org_y = 0;
         gdk_window_get_origin( source, &org_x, &org_y );
-    
+
         gtk_window_begin_move_drag (GTK_WINDOW (ancestor),
                                 2,
-                                org_x + event.GetX(), 
-                                org_y + event.GetY(), 
+                                org_x + event.GetX(),
+                                org_y + event.GetY(),
                                 0);
     }
     else
     {
-        event.Skip( TRUE );
+        event.Skip( true );
     }
 #else
-    event.Skip( TRUE );
+    event.Skip( true );
 #endif
 }