/////////////////////////////////////////////////////////////////////////////
-// Name: generic/statusbr.cpp
+// Name: src/generic/statusbr.cpp
// Purpose: wxStatusBarGeneric class implementation
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "statusbr.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_STATUSBAR
+#include "wx/statusbr.h"
+
#ifndef WX_PRECOMP
-#include "wx/setup.h"
-#include "wx/frame.h"
-#include "wx/settings.h"
-#include "wx/dcclient.h"
+ #include "wx/settings.h"
+ #include "wx/dcclient.h"
#endif
#ifdef __WXGTK20__
-#include "wx/gtk/private.h"
-#include "wx/gtk/win_gtk.h"
+ #include <gtk/gtk.h>
+ #include "wx/gtk/win_gtk.h"
#endif
-#include "wx/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
// Default status border dimensions
#define wxTHICK_LINE_BORDER 2
-#define wxTHICK_LINE_WIDTH 1
void wxStatusBarGeneric::Init()
{
- m_borderX = wxTHICK_LINE_BORDER;
- m_borderY = wxTHICK_LINE_BORDER;
+ m_borderX = wxTHICK_LINE_BORDER;
+ m_borderY = wxTHICK_LINE_BORDER;
}
wxStatusBarGeneric::~wxStatusBarGeneric()
{
- // VZ: what is this for? please comment...
-#ifdef __WXMSW__
- SetFont(wxNullFont);
-#endif // MSW
}
bool wxStatusBarGeneric::Create(wxWindow *parent,
long style,
const wxString& name)
{
- if ( !wxWindow::Create(parent, id,
- wxDefaultPosition, wxDefaultSize,
- style | wxTAB_TRAVERSAL, name) )
- return FALSE;
+ style |= wxTAB_TRAVERSAL | wxFULL_REPAINT_ON_RESIZE;
+ if ( !wxWindow::Create(parent, id,
+ wxDefaultPosition, wxDefaultSize,
+ style, name) )
+ return false;
- // The status bar should have a themed background
- SetThemeEnabled( TRUE );
+ // 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);
-#endif
- InitColours();
+ InitColours();
- SetFont(m_defaultStatusBarFont);
+#ifdef __WXPM__
+ SetFont(*wxSMALL_FONT);
+#endif
- // Set the height according to the font and the border size
- wxClientDC dc(this);
- dc.SetFont(GetFont());
+ // 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 );
+ wxCoord y;
+ dc.GetTextExtent(_T("X"), NULL, &y );
- int height = (int)( (11*y)/10 + 2*GetBorderY());
+ int height = (int)( (11*y)/10 + 2*GetBorderY());
- SetSize(-1, -1, -1, height);
+ SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height);
- SetFieldsCount(1);
+ SetFieldsCount(1);
- return TRUE;
+ return true;
}
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)
wxRect rect;
GetFieldRect(number, rect);
- Refresh( TRUE, &rect );
+ Refresh(true, &rect);
+
+ // it's common to show some text in the status bar before starting a
+ // relatively lengthy operation, ensure that the text is shown to the
+ // user immediately and not after the lengthy operation end
+ Update();
}
}
}
#endif
- if (GetFont().Ok())
+ if (GetFont().Ok())
dc.SetFont(GetFont());
- dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetBackgroundMode(wxTRANSPARENT);
#ifdef __WXPM__
- wxColour vColor;
+ wxColour vColor;
- vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
- ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
+ vColor = wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR);
+ ::WinFillRect(dc.m_hPS, &dc.m_vRclPaint, vColor.GetPixel());
#endif
- for (int i = 0; i < m_nFields; i ++)
+ for (int i = 0; i < m_nFields; i ++)
DrawField(dc, i);
}
void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i)
{
- int leftMargin = 2;
+ int leftMargin = 2;
- wxRect rect;
- GetFieldRect(i, rect);
+ wxRect rect;
+ GetFieldRect(i, rect);
- wxString text(GetStatusText(i));
+ wxString text(GetStatusText(i));
- long x, y;
+ long x = 0, y = 0;
- dc.GetTextExtent(text, &x, &y);
+ dc.GetTextExtent(text, &x, &y);
- int xpos = rect.x + leftMargin;
- int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
+ int xpos = rect.x + leftMargin;
+ int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
#if defined( __WXGTK__ ) || defined(__WXMAC__)
- xpos++;
- ypos++;
+ xpos++;
+ ypos++;
#endif
- dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
+ dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
- dc.DrawText(text, xpos, ypos);
+ dc.DrawText(text, xpos, ypos);
- dc.DestroyClippingRegion();
+ dc.DestroyClippingRegion();
}
void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
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);
+ int style = wxSB_NORMAL;
+ if (m_statusStyles)
+ style = m_statusStyles[i];
-#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);
-
- // 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__) || defined(__WXMAC__)
+#if defined(__WXMSW__) || defined(__WXMAC__)
wxColour mediumShadowColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
m_hilightPen = wxPen(hilightColour, 1, wxSOLID);
#elif defined(__WXPM__)
m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID);
- m_hilightPen = wxPen("WHITE", 1, wxSOLID);
+ m_hilightPen = *wxWHITE_PEN;
- wxColour vColour;
-
- vColour.Set(wxString("LIGHT GREY"));
- SetBackgroundColour(vColour);
- vColour.Set(wxString("BLACK"));
- SetForegroundColour(vColour);
- m_defaultStatusBarFont = *wxSMALL_FONT;
+ SetBackgroundColour(*wxLIGHT_GREY);
+ SetForegroundColour(*wxBLACK);
#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_mediumShadowPen = *wxGREY_PEN;
+ m_hilightPen = *wxWHITE_PEN;
#endif
}
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
}
#endif // wxUSE_STATUSBAR
-
projects / wxWidgets.git / blobdiff