Applied patch [ 587454 ] CW-related wx/wxchar.h fix

[wxWidgets.git] / src / generic / statusbr.cpp

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index fa7a9f0690346de7f07b2628f90c018f75aef7bf..24f273375d81058090674a4374210eb1c89ad402 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -53,9 +53,6 @@ END_EVENT_TABLE()
 
 wxStatusBarGeneric::wxStatusBarGeneric()
 {
 
 wxStatusBarGeneric::wxStatusBarGeneric()
 {

-  m_statusWidths = (int *) NULL;
-  m_statusStrings = (wxString *) NULL;
-  m_nFields = 0;

   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 }
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 }


@@ -65,19 +62,17 @@ wxStatusBarGeneric::~wxStatusBarGeneric()
 #   ifdef __WXMSW__
         SetFont(wxNullFont);
 #   endif // MSW
 #   ifdef __WXMSW__
         SetFont(wxNullFont);
 #   endif // MSW

-
-    if ( m_statusStrings )
-        delete[] m_statusStrings;

 }
 
 bool wxStatusBarGeneric::Create(wxWindow *parent,
 }
 
 bool wxStatusBarGeneric::Create(wxWindow *parent,

-                         wxWindowID id,
-                         long style,
-                         const wxString& name)
+                                wxWindowID id,
+                                long style,
+                                const wxString& name)

 {
 {

-  m_statusWidths = (int *) NULL;
-  m_statusStrings = (wxString *) NULL;
-  m_nFields = 0;
+    // If create is ever meant to be re-entrant over the life of
+    // an object we should:
+    // m_statusStrings.Empty();
+

   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 
   m_borderX = wxTHICK_LINE_BORDER;
   m_borderY = wxTHICK_LINE_BORDER;
 


@@ -85,6 +80,9 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
                                   wxDefaultPosition, wxDefaultSize,
                                   style | wxTAB_TRAVERSAL, name);
 
                                   wxDefaultPosition, wxDefaultSize,
                                   style | wxTAB_TRAVERSAL, name);
 

+  // The status bar should have a themed background
+  SetThemeEnabled( TRUE );
+

   // Don't wish this to be found as a child
 #ifndef __WXMAC__
   parent->GetChildren().DeleteObject(this);
   // Don't wish this to be found as a child
 #ifndef __WXMAC__
   parent->GetChildren().DeleteObject(this);


@@ -109,13 +107,24 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
 void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {
 
 void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
 {

-    if ( number != m_nFields )
-    {
-        m_nFields = number;
+    wxASSERT_MSG( number >= 0,
+                  _T("Yes, number should be a size_t and less than no fields is silly.") );

 
 

-        delete[] m_statusStrings;
-        m_statusStrings = new wxString[number];
-    }
+    // if( number > m_nFields )
+
+    int i;
+    for(i = m_nFields; i < number; ++i)
+        m_statusStrings.Add( wxEmptyString );
+
+    // if( number < m_nFields )
+
+    for (i = m_nFields - 1; i >= number; --i)
+        m_statusStrings.Remove(i);
+
+    m_nFields = number;
+
+    wxASSERT_MSG( m_nFields == (int)m_statusStrings.GetCount(),
+                  _T("This really should never happen, can we do away with m_nFields here?") );

 
     SetStatusWidths(number, widths);
 }
 
     SetStatusWidths(number, widths);
 }


@@ -127,27 +136,10 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
 
     m_statusStrings[number] = text;
 
 
     m_statusStrings[number] = text;
 

-#ifdef __WXMAC__
-    int major,minor;
-    wxGetOsVersion( &major, &minor );
-    
-    if (major >= 10)
-    {
-        Refresh();
-        return;
-    }
-#endif
-

     wxRect rect;
     GetFieldRect(number, rect);
     wxRect rect;
     GetFieldRect(number, rect);

-    wxClientDC dc(this);

 
 

-    dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) );
-    dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 );
-    dc.Clear();
-    dc.DestroyClippingRegion();
-
-    DrawFieldText( dc, number );
+    Refresh( TRUE, &rect );

 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const
 }
 
 wxString wxStatusBarGeneric::GetStatusText(int n) const


@@ -165,36 +157,18 @@ void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
 
     // delete the old widths in any case - this function may be used to reset
     // the widths to the default (all equal)
 
     // delete the old widths in any case - this function may be used to reset
     // the widths to the default (all equal)

-    delete [] m_statusWidths;
+    // MBN: this is incompatible with at least wxMSW and wxMAC and not
+    //      documented, but let's keep it for now
+    ReinitWidths();

 
     if ( !widths_field )
     {
         // not an error, see the comment above
 
     if ( !widths_field )
     {
         // not an error, see the comment above

-        m_statusWidths = (int *)NULL;

         Refresh();
         return;
     }
 
         Refresh();
         return;
     }
 

-    int i;
-
-    // VZ: this doesn't do anything as is_variable is unused later
-#if 0
-    // when one window (minimum) is variable (width <= 0)
-    bool is_variable = FALSE;
-    for (i = 0; i < m_nFields; i++)
-    {
-        if (widths_field[i] <= 0)
-            is_variable = TRUE;
-    }
-#endif // 0
-
-    // set widths
-    m_statusWidths = new int[n];
-    for (i = 0; i < m_nFields; i++)
-    {
-        m_statusWidths[i] = widths_field[i];
-    }
-    Refresh();
+    wxStatusBarBase::SetStatusWidths(n, widths_field);

 }
 
 void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 }
 
 void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )


@@ -210,7 +184,7 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
 #ifdef __WXPM__
   wxColour                          vColor;
 
 #ifdef __WXPM__
   wxColour                          vColor;
 

-  vColor.InitFromName("GREY");
+  vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);

   ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 
   ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
 #endif
 


@@ -279,22 +253,17 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
     dc.DrawLine(rect.x, rect.y,
         rect.x + rect.width, rect.y);
 #else
     dc.DrawLine(rect.x, rect.y,
         rect.x + rect.width, rect.y);
 #else

-    // Right
+
+    dc.DrawLine(rect.x + rect.width, rect.height + 2,
+                rect.x, rect.height + 2);

     dc.DrawLine(rect.x + rect.width, rect.y,
     dc.DrawLine(rect.x + rect.width, rect.y,

-                rect.x + rect.width, rect.y + rect.height + 2);
+                rect.x + rect.width, rect.y + rect.height);
+

     dc.SetPen(m_mediumShadowPen);
     dc.SetPen(m_mediumShadowPen);

-    dc.DrawLine(rect.x + rect.width + 1, rect.y,
-                rect.x + rect.width + 1, rect.y + rect.height + 2);
-    dc.DrawLine(rect.x + rect.width + 2, rect.y,
-                rect.x + rect.width + 2, rect.y + rect.height + 2);
-    // Top
-    dc.DrawLine(rect.x + rect.width + 2, rect.y,
-                rect.x - 2, rect.y);
-    dc.DrawLine(rect.x + rect.width + 1, rect.y - 1,
-                rect.x - 2, rect.y - 1);
-    dc.SetPen(m_hilightPen);
-    dc.DrawLine(rect.x + rect.width, rect.y - 2,
-                rect.x - 2, rect.y - 2);
+    dc.DrawLine(rect.x, rect.y,
+                rect.x + rect.width, rect.y);
+    dc.DrawLine(rect.x, rect.y + rect.height,
+                rect.x, rect.y);

 
 #endif
 
 
 #endif
 


@@ -386,15 +355,25 @@ void wxStatusBarGeneric::InitColours()
     wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 #elif defined(__WXPM__)
     wxColour hilightColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT));
     m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
 #elif defined(__WXPM__)

-    m_mediumShadowPen = wxPen("LIGHT GREY", 1, wxSOLID);
+    m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);

     m_hilightPen = wxPen("WHITE", 1, wxSOLID);
     m_hilightPen = wxPen("WHITE", 1, wxSOLID);

+
+    wxColour                        vColour;
+
+    vColour.Set(wxString("LIGHT GREY"));
+    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
 
 #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));
     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.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -422,3 +401,5 @@ void wxStatusBarGeneric::SetMinHeight(int height)
 }
 
 #endif // wxUSE_STATUSBAR
 }
 
 #endif // wxUSE_STATUSBAR

+
+// vi:sts=4:sw=4:et