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;
- Refresh();
+ wxRect rect;
+ GetFieldRect(number, rect);
+
+ 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];
- }
+ wxStatusBarBase::SetStatusWidths(n, widths_field);
}
void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
#ifdef __WXPM__
wxColour vColor;
- vColor.InitFromName("GREY");
+ vColor.InitFromName("LIGHT GREY");
::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
#endif
{
// Shadow colours
#if defined(__WIN95__)
- wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
+ wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
- wxColour hilightColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DHILIGHT));
+ 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("DARK GREY", 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
- m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+#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.