wxStatusBarGeneric::wxStatusBarGeneric()
{
- m_statusWidths = (int *) NULL;
m_statusStrings = (wxString *) NULL;
- m_nFields = 0;
m_borderX = wxTHICK_LINE_BORDER;
m_borderY = wxTHICK_LINE_BORDER;
}
long style,
const wxString& name)
{
- m_statusWidths = (int *) NULL;
m_statusStrings = (wxString *) NULL;
- m_nFields = 0;
m_borderX = wxTHICK_LINE_BORDER;
m_borderY = wxTHICK_LINE_BORDER;
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);
m_statusStrings[number] = text;
-#ifdef __WXMAC__
- int major,minor;
- wxGetOsVersion( &major, &minor );
-
- if (major >= 10)
- {
- Refresh();
- return;
- }
-#endif
-
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();
- dc.SetFont(GetFont());
- DrawFieldText( dc, number );
+
+ Refresh( TRUE, &rect );
}
wxString wxStatusBarGeneric::GetStatusText(int n) const
// 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
- m_statusWidths = (int *)NULL;
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) )
wxColour vColour;
- vColour.Set(DawStr_CString("LIGHT GREY"));
+ vColour.Set(wxString("LIGHT GREY"));
SetBackgroundColour(vColour);
- vColour.Set(DawStr_CString("BLACK"));
+ vColour.Set(wxString("BLACK"));
SetForegroundColour(vColour);
m_defaultStatusBarFont = *wxSMALL_FONT;
#else