// 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
wxStatusBarGeneric::~wxStatusBarGeneric()
{
- // VZ: what is this for? please comment...
-#ifdef __WXMSW__
- SetFont(wxNullFont);
-#endif // MSW
}
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);
int height = (int)( (11*y)/10 + 2*GetBorderY());
- SetSize(-1, -1, -1, height);
+ SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
SetFieldsCount(1);
- return TRUE;
+ 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 wxSize(width, height);
}
void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
for (i = m_nFields - 1; i >= number; --i)
m_statusStrings.RemoveAt(i);
- m_nFields = number;
+ // forget the old cached pixel widths
+ m_widthsAbs.Empty();
+
+ wxStatusBarBase::SetFieldsCount(number, widths);
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);
}
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
wxRect rect;
GetFieldRect(i, rect);
- // Draw border
- // Have grey background, plus 3-d border -
- // One black rectangle.
- // Inside this, left and top sides - dark grey. Bottom and right -
- // white.
-
- 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);
- dc.DrawLine(rect.x + rect.width, rect.y + rect.height,
- rect.x, rect.y + rect.height);
-
- dc.SetPen(m_mediumShadowPen);
+ int style = wxSB_NORMAL;
+ if (m_statusStyles)
+ style = m_statusStyles[i];
- // Left and top grey lines
- dc.DrawLine(rect.x, rect.y + rect.height,
- rect.x, rect.y);
- dc.DrawLine(rect.x, rect.y,
- rect.x + rect.width, rect.y);
-#else
-
- dc.DrawLine(rect.x + rect.width, rect.height + 2,
- rect.x, rect.height + 2);
- dc.DrawLine(rect.x + rect.width, rect.y,
- rect.x + rect.width, rect.y + rect.height);
-
- dc.SetPen(m_mediumShadowPen);
- dc.DrawLine(rect.x, rect.y,
- rect.x + rect.width, rect.y);
- dc.DrawLine(rect.x, rect.y + rect.height,
- rect.x, rect.y);
+ if (style != wxSB_FLAT)
+ {
+ // Draw border
+ // For wxSB_NORMAL:
+ // Have grey background, plus 3-d border -
+ // One black rectangle.
+ // Inside this, left and top sides - dark grey. Bottom and right -
+ // white.
+ // Reverse it for wxSB_RAISED
+
+ dc.SetPen((style == wxSB_RAISED) ? m_mediumShadowPen : m_hilightPen);
+
+ #ifndef __WXPM__
+
+ // Right and bottom lines
+ dc.DrawLine(rect.x + rect.width, rect.y,
+ rect.x + rect.width, rect.y + rect.height);
+ dc.DrawLine(rect.x + rect.width, rect.y + rect.height,
+ rect.x, rect.y + rect.height);
+
+ dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen);
+
+ // Left and top lines
+ dc.DrawLine(rect.x, rect.y + rect.height,
+ rect.x, rect.y);
+ dc.DrawLine(rect.x, rect.y,
+ rect.x + rect.width, rect.y);
+ #else
+
+ dc.DrawLine(rect.x + rect.width, rect.height + 2,
+ rect.x, rect.height + 2);
+ dc.DrawLine(rect.x + rect.width, rect.y,
+ rect.x + rect.width, rect.y + rect.height);
+
+ dc.SetPen((style == wxSB_RAISED) ? m_hilightPen : m_mediumShadowPen);
+ 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
+ }
DrawFieldText(dc, 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)
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);
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);
if ( height > (11*y)/10 )
{
- SetSize(-1, -1, -1, height + 2*m_borderY);
+ SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY);
}
}
}
else
{
- event.Skip( TRUE );
+ event.Skip( true );
}
#else
- event.Skip( TRUE );
+ event.Skip( true );
#endif
}
}
else
{
- event.Skip( TRUE );
+ event.Skip( true );
}
#else
- event.Skip( TRUE );
+ event.Skip( true );
#endif
}
projects / wxWidgets.git / blobdiff