/////////////////////////////////////////////////////////////////////////////
-// Name: statusbr.cpp
-// Purpose: wxStatusBar class implementation
+// Name: generic/statusbr.cpp
+// Purpose: wxStatusBarGeneric class implementation
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma hdrstop
#endif
+//#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
+
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/frame.h"
#include "wx/dcclient.h"
#endif
-#include "wx/generic/statusbr.h"
-
-#ifdef __WXMSW__
-#include <windows.h>
+#include "wx/statusbr.h"
-#ifdef DrawText
-#undef DrawText
-#endif
+// with wxUSE_NATIVE_STATUSBAR it is not included from wx/statusbr.h
+#include "wx/generic/statusbr.h"
-#endif
+IMPLEMENT_DYNAMIC_CLASS(wxStatusBarGeneric, wxWindow)
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
+#if !defined(__WIN32__) || !wxUSE_NATIVE_STATUSBAR
+ IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBarGeneric)
+#endif // Win32 && wxUSE_NATIVE_STATUSBAR
-BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
- EVT_PAINT(wxStatusBar::OnPaint)
- EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow)
+ EVT_PAINT(wxStatusBarGeneric::OnPaint)
+ EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged)
END_EVENT_TABLE()
-#endif
// Default status border dimensions
#define wxTHICK_LINE_BORDER 2
#define wxTHICK_LINE_WIDTH 1
-wxStatusBar::wxStatusBar(void)
+wxStatusBarGeneric::wxStatusBarGeneric()
{
m_statusWidths = (int *) NULL;
m_statusStrings = (wxString *) NULL;
m_borderY = wxTHICK_LINE_BORDER;
}
-wxStatusBar::~wxStatusBar(void)
+wxStatusBarGeneric::~wxStatusBarGeneric()
{
# ifdef __WXMSW__
SetFont(wxNullFont);
delete[] m_statusStrings;
}
-bool wxStatusBar::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+bool wxStatusBarGeneric::Create(wxWindow *parent,
+ wxWindowID id,
+ long style,
+ const wxString& name)
{
m_statusWidths = (int *) NULL;
m_statusStrings = (wxString *) NULL;
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,
+ wxDefaultPosition, wxDefaultSize,
+ style | wxTAB_TRAVERSAL, name);
// Don't wish this to be found as a child
- parent->GetChildren()->DeleteObject(this);
-
+#ifndef __WXMAC__
+ parent->GetChildren().DeleteObject(this);
+#endif
InitColours();
SetFont(m_defaultStatusBarFont);
return success;
}
-void wxStatusBar::SetFieldsCount(int number, const int widths[])
+void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths)
{
- m_nFields = number;
-
- if ( m_statusWidths )
- delete[] m_statusWidths;
+ if ( number != m_nFields )
+ {
+ m_nFields = number;
- if ( m_statusStrings )
delete[] m_statusStrings;
+ m_statusStrings = new wxString[number];
- m_statusStrings = new wxString[number];
-
- int i;
- for (i = 0; i < number; i++)
- m_statusStrings[i] = "";
+#if 0 // VZ: what is this for?
+ int i;
+ for (i = 0; i < number; i++)
+ m_statusStrings[i] = "";
+#endif
+ }
- if ( widths )
- SetStatusWidths(number, widths);
+ SetStatusWidths(number, widths);
}
-void wxStatusBar::SetStatusText(const wxString& text, int number)
+void wxStatusBarGeneric::SetStatusText(const wxString& text, int number)
{
- if ((number < 0) || (number >= m_nFields))
- return;
+ wxCHECK_RET( (number >= 0) && (number < m_nFields),
+ _T("invalid status bar field index") );
- m_statusStrings[number] = text;
+ m_statusStrings[number] = text;
- Refresh();
-
-#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
+ Refresh();
}
-wxString wxStatusBar::GetStatusText(int n) const
+wxString wxStatusBarGeneric::GetStatusText(int n) const
{
- if ((n < 0) || (n >= m_nFields))
- return wxString("");
- else
+ wxCHECK_MSG( (n >= 0) && (n < m_nFields), wxEmptyString,
+ _T("invalid status bar field index") );
+
return m_statusStrings[n];
}
-void wxStatusBar::SetStatusWidths(int n, const int widths_field[])
+void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[])
{
- // only set status widths, when n == number of statuswindows
- if (n == m_nFields)
- {
- // only set status widths,
+ // only set status widths, when n == number of statuswindows
+ wxCHECK_RET( n == m_nFields, _T("status bar field count mismatch") );
+
+ // delete the old widths in any case - this function may be used to reset
+ // the widths to the default (all equal)
+ delete [] m_statusWidths;
+
+ if ( !widths_field )
+ {
+ // not an error, see the comment above
+ m_statusWidths = (int *)NULL;
+
+ 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;
- int i;
for (i = 0; i < m_nFields; i++)
{
- if (widths_field[i] <= 0) is_variable = TRUE;
+ if (widths_field[i] <= 0)
+ is_variable = TRUE;
}
-
- // if there are old widths, delete them
- if (m_statusWidths)
- delete [] m_statusWidths;
+#endif // 0
// set widths
m_statusWidths = new int[n];
for (i = 0; i < m_nFields; i++)
{
- m_statusWidths[i] = widths_field[i];
+ m_statusWidths[i] = widths_field[i];
}
- }
}
-void wxStatusBar::OnPaint(wxPaintEvent& WXUNUSED(event) )
+void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) )
{
wxPaintDC dc(this);
int i;
- if ( GetFont() )
- dc.SetFont(*GetFont());
+ if ( GetFont().Ok() )
+ dc.SetFont(GetFont());
dc.SetBackgroundMode(wxTRANSPARENT);
+ dc.SetTextForeground(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
for ( i = 0; i < m_nFields; i ++ )
DrawField(dc, i);
# endif // MSW
}
-void wxStatusBar::DrawFieldText(wxDC& dc, int i)
+void wxStatusBarGeneric::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) ;
+#if defined( __WXGTK__ ) || defined(__WXMAC__)
+ xpos++;
+ ypos++;
+#endif
+
dc.SetClippingRegion(rect.x, rect.y, rect.width, rect.height);
dc.DrawText(text, xpos, ypos);
dc.DestroyClippingRegion();
}
-void wxStatusBar::DrawField(wxDC& dc, int i)
+void wxStatusBarGeneric::DrawField(wxDC& dc, int i)
{
- wxRectangle rect;
+ wxRect rect;
GetFieldRect(i, rect);
// Draw border
}
// Get the position and size of the field's internal bounding rectangle
-bool wxStatusBar::GetFieldRect(int n, wxRectangle& rect) const
+bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const
{
- if ((n < 0) || (n >= m_nFields))
- return FALSE;
+ wxCHECK_MSG( (n >= 0) && (n < m_nFields), FALSE,
+ _T("invalid status bar field index") );
int width, height;
GetClientSize(&width, &height);
}
// Initialize colours
-void wxStatusBar::InitColours(void)
+void wxStatusBarGeneric::InitColours()
{
// Shadow colours
-#if defined(__WIN95__)
+#ifndef __WIN16__
wxColour mediumShadowColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DSHADOW));
m_mediumShadowPen = wxPen(mediumShadowColour, 1, wxSOLID);
}
// Responds to colour changes, and passes event on to children.
-void wxStatusBar::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxStatusBarGeneric::OnSysColourChanged(wxSysColourChangedEvent& event)
{
InitColours();
Refresh();
wxWindow::OnSysColourChanged(event);
}
+void wxStatusBarGeneric::SetMinHeight(int height)
+{
+ // check that this min height is not less than minimal height for the
+ // current font
+ wxClientDC dc(this);
+ wxCoord y;
+ dc.GetTextExtent( _T("X"), NULL, &y );
+
+ if ( height > (11*y)/10 )
+ {
+ SetSize(-1, -1, -1, height + 2*m_borderY);
+ }
+}
+
+//#endif // Win32 && wxUSE_NATIVE_STATUSBAR
projects / wxWidgets.git / blobdiff