#pragma hdrstop
#endif
-//#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
+#if wxUSE_STATUSBAR
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/statusbr.h"
-// with wxUSE_NATIVE_STATUSBAR it is not included from wx/statusbr.h
-#include "wx/generic/statusbr.h"
+// we only have to do it here when we use wxStatusBarGeneric in addition to the
+// standard wxStatusBar class, if wxStatusBarGeneric is the same as
+// wxStatusBar, then the corresponding IMPLEMENT_DYNAMIC_CLASS is already in
+// common/statbar.cpp
+#if defined(__WXMAC__) || \
+ (defined(wxUSE_NATIVE_STATUSBAR) && wxUSE_NATIVE_STATUSBAR)
+ #include "wx/generic/statusbr.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
-
-#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
- IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBarGeneric)
-#endif // Win32 && wxUSE_NATIVE_STATUSBAR
+ IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
+#endif // wxUSE_NATIVE_STATUSBAR
BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
EVT_PAINT(wxStatusBarGeneric::OnPaint)
wxStatusBarGeneric::wxStatusBarGeneric()
{
- m_statusWidths = (int *) NULL;
m_statusStrings = (wxString *) NULL;
- m_nFields = 0;
m_borderX = wxTHICK_LINE_BORDER;
m_borderY = wxTHICK_LINE_BORDER;
}
SetFont(wxNullFont);
# endif // MSW
- if ( m_statusWidths )
- delete[] m_statusWidths;
if ( m_statusStrings )
delete[] m_statusStrings;
}
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);
SetFont(m_defaultStatusBarFont);
+ // Set the height according to the font and the border size
+ wxClientDC dc(this);
+ dc.SetFont(GetFont());
+
+ wxCoord y;
+ dc.GetTextExtent(_T("X"), NULL, &y );
+
+ int height = (int)( (11*y)/10 + 2*GetBorderY());
+
+ SetSize(-1, -1, -1, height);
+
return success;
}
delete[] m_statusStrings;
m_statusStrings = new wxString[number];
-
-#if 0 // VZ: what is this for?
- int i;
- for (i = 0; i < number; i++)
- m_statusStrings[i] = "";
-#endif
}
SetStatusWidths(number, widths);
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) )
{
wxPaintDC dc(this);
+
int i;
if ( GetFont().Ok() )
dc.SetFont(GetFont());
dc.SetBackgroundMode(wxTRANSPARENT);
- dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
+
+#ifdef __WXPM__
+ wxColour vColor;
+
+ vColor.InitFromName("LIGHT GREY");
+ ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
+#endif
for ( i = 0; i < m_nFields; i ++ )
DrawField(dc, i);
-# ifdef __WXMSW__
- dc.SetFont(wxNullFont);
-# endif // MSW
+#ifdef __WXMSW__
+ dc.SetFont(wxNullFont);
+#endif // MSW
}
void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
dc.SetPen(m_hilightPen);
+#ifndef __WXPM__
+
// Right and bottom white lines
dc.DrawLine(rect.x + rect.width, rect.y,
rect.x + rect.width, rect.y + rect.height);
rect.x, rect.y);
dc.DrawLine(rect.x, rect.y,
rect.x + rect.width, rect.y);
+#else
+ // Right
+ dc.DrawLine(rect.x + rect.width, rect.y,
+ rect.x + rect.width, rect.y + rect.height + 2);
+ 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);
+
+#endif
DrawFieldText(dc, i);
}
_T("invalid status bar field index") );
int width, height;
+#ifdef __WXPM__
+ GetSize(&width, &height);
+#else
GetClientSize(&width, &height);
+#endif
int i;
int sum_of_nonvar = 0;
void wxStatusBarGeneric::InitColours()
{
// Shadow colours
-#ifndef __WIN16__
- wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
+#if defined(__WIN95__)
+ 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("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.
}
}
-//#endif // Win32 && wxUSE_NATIVE_STATUSBAR
+#endif // wxUSE_STATUSBAR
projects / wxWidgets.git / blobdiff