// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#include "wx/generic/statusbr.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
-
-#ifdef DrawText
-#undef DrawText
-#endif
-
+#include "wx/msw/winundef.h"
#endif
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
- EVT_PAINT(wxStatusBar::OnPaint)
+ EVT_PAINT(wxStatusBar::OnPaint)
EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
END_EVENT_TABLE()
#endif
wxStatusBar::wxStatusBar(void)
{
- m_statusWidths = NULL;
- m_statusStrings = NULL;
+ m_statusWidths = (int *) NULL;
+ m_statusStrings = (wxString *) NULL;
m_nFields = 0;
m_borderX = wxTHICK_LINE_BORDER;
m_borderY = wxTHICK_LINE_BORDER;
wxStatusBar::~wxStatusBar(void)
{
- SetFont(wxNullFont);
-
- if ( m_statusWidths )
- delete[] m_statusWidths;
- if ( m_statusStrings )
- delete[] m_statusStrings;
+# ifdef __WXMSW__
+ SetFont(wxNullFont);
+# endif // MSW
+
+ if ( m_statusWidths )
+ delete[] m_statusWidths;
+ if ( m_statusStrings )
+ delete[] m_statusStrings;
}
-bool wxStatusBar::Create(wxWindow *parent, const wxWindowID id,
+bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
- const long style,
+ long style,
const wxString& name)
{
- m_statusWidths = NULL;
- m_statusStrings = NULL;
+ m_statusWidths = (int *) NULL;
+ m_statusStrings = (wxString *) NULL;
m_nFields = 0;
m_borderX = wxTHICK_LINE_BORDER;
m_borderY = wxTHICK_LINE_BORDER;
- bool success = wxWindow::Create(parent, id, pos, size, style, name);
+ bool success = wxWindow::Create(parent, id, pos, size, style | wxTAB_TRAVERSAL, name);
// Don't wish this to be found as a child
- parent->GetChildren()->DeleteObject(this);
+ parent->GetChildren().DeleteObject(this);
InitColours();
return success;
}
-void wxStatusBar::SetFieldsCount(const int number, const int *widths)
+void wxStatusBar::SetFieldsCount(int number, const int widths[])
{
m_nFields = number;
if ( m_statusWidths )
- delete[] m_statusWidths;
+ delete[] m_statusWidths;
if ( m_statusStrings )
- delete[] m_statusStrings;
+ delete[] m_statusStrings;
m_statusStrings = new wxString[number];
int i;
for (i = 0; i < number; i++)
- m_statusStrings[i] = "";
+ m_statusStrings[i] = "";
- if ( widths )
- SetStatusWidths(number, widths);
+ if ( widths )
+ SetStatusWidths(number, widths);
}
-void wxStatusBar::SetStatusText(const wxString& text, const int number)
+void wxStatusBar::SetStatusText(const wxString& text, int number)
{
if ((number < 0) || (number >= m_nFields))
return;
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// For some reason, this can cause major GDI problems - graphics
// all over the place. E.g. in print previewing.
// ::UpdateWindow((HWND) GetHWND());
#endif
}
-wxString wxStatusBar::GetStatusText(const int n) const
+wxString wxStatusBar::GetStatusText(int n) const
{
if ((n < 0) || (n >= m_nFields))
return wxString("");
return m_statusStrings[n];
}
-void wxStatusBar::SetStatusWidths(const int n, const int *widths_field)
+void wxStatusBar::SetStatusWidths(int n, const int widths_field[])
{
// only set status widths, when n == number of statuswindows
if (n == m_nFields)
wxPaintDC dc(this);
int i;
- if ( GetFont() )
- dc.SetFont(*GetFont());
+ if ( GetFont().Ok() )
+ dc.SetFont(GetFont());
dc.SetBackgroundMode(wxTRANSPARENT);
for ( i = 0; i < m_nFields; i ++ )
- DrawField(dc, i);
+ DrawField(dc, i);
+
+# ifdef __WXMSW__
+ dc.SetFont(wxNullFont);
+# endif // MSW
}
-void wxStatusBar::DrawFieldText(wxDC& dc, const int i)
+void wxStatusBar::DrawFieldText(wxDC& dc, int i)
{
int leftMargin = 2;
- wxRectangle rect;
+ wxRect rect;
GetFieldRect(i, rect);
wxString text(GetStatusText(i));
int xpos = rect.x + leftMargin;
int ypos = (int) (((rect.height - y) / 2 ) + rect.y + 0.5) ;
+
+#ifdef __WXGTK__
+ xpos++;
+ ypos++;
+#endif
dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
dc.DestroyClippingRegion();
}
-void wxStatusBar::DrawField(wxDC& dc, const int i)
+void wxStatusBar::DrawField(wxDC& dc, int i)
{
- wxRectangle rect;
+ wxRect rect;
GetFieldRect(i, rect);
// Draw border
// Inside this, left and top sides - dark grey. Bottom and right -
// white.
- dc.SetPen(m_hilightPen);
+ dc.SetPen(m_hilightPen);
// 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);
+ rect.x, rect.y + rect.height);
- dc.SetPen(m_mediumShadowPen);
+ dc.SetPen(m_mediumShadowPen);
// Left and top grey lines
dc.DrawLine(rect.x, rect.y + rect.height,
- rect.x, rect.y);
+ rect.x, rect.y);
dc.DrawLine(rect.x, rect.y,
- rect.x + rect.width, rect.y);
+ rect.x + rect.width, rect.y);
- DrawFieldText(dc, i);
+ DrawFieldText(dc, i);
}
// Get the position and size of the field's internal bounding rectangle
-bool wxStatusBar::GetFieldRect(const int n, wxRectangle& rect) const
+bool wxStatusBar::GetFieldRect(int n, wxRect& rect) const
{
if ((n < 0) || (n >= m_nFields))
return FALSE;
for (i = 0; i < m_nFields; i++)
{
fieldWidth = (int)(width/m_nFields);
- fieldPosition = i*fieldWidth;
- if ( i == n )
- break;
+ fieldPosition = i*fieldWidth;
+ if ( i == n )
+ break;
}
}
else // no_same_width
}
for (i = 0; i < m_nFields; i++)
{
- fieldWidth = tempwidth[i];
- fieldPosition = temppos;
+ fieldWidth = tempwidth[i];
+ fieldPosition = temppos;
- temppos += tempwidth[i];
+ temppos += tempwidth[i];
- if ( i == n )
- break;
+ if ( i == n )
+ break;
}
delete [] tempwidth;
}
rect.x = fieldPosition + wxTHICK_LINE_BORDER;
- rect.y = wxTHICK_LINE_BORDER;
+ rect.y = wxTHICK_LINE_BORDER;
- rect.width = fieldWidth - 2 * wxTHICK_LINE_BORDER ;
- rect.height = height - 2 * wxTHICK_LINE_BORDER ;
+ rect.width = fieldWidth - 2 * wxTHICK_LINE_BORDER ;
+ rect.height = height - 2 * wxTHICK_LINE_BORDER ;
- return TRUE;
+ return TRUE;
}
// Initialize colours
m_hilightPen = wxPen("WHITE", 1, wxSOLID);
#endif
- m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+ m_defaultStatusBarFont = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
}
projects / wxWidgets.git / blobdiff