/////////////////////////////////////////////////////////////////////////////
-// Name: univ/statusbr.cpp
+// Name: src/univ/statusbr.cpp
// Purpose: wxStatusBar implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 14.10.01
// RCS-ID: $Id$
// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "univstatusbr.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_STATUSBAR
+#include "wx/statusbr.h"
+
#ifndef WX_PRECOMP
#include "wx/settings.h"
#include "wx/dcclient.h"
+ #include "wx/toplevel.h"
#endif
-#include "wx/statusbr.h"
-#include "wx/toplevel.h"
-
#include "wx/univ/renderer.h"
// ============================================================================
wxDefaultPosition, wxDefaultSize,
style, name) )
{
- return FALSE;
+ return false;
}
SetFieldsCount(1);
SetSize(DoGetBestSize());
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// do draw the fields
- int flags = IsEnabled() ? 0 : wxCONTROL_DISABLED;
+ int flags = IsEnabled() ? 0 : (int)wxCONTROL_DISABLED;
for ( int n = 0; n < m_nFields; n++ )
{
rect.width = m_widthsAbs[n];
flags |= wxCONTROL_ISDEFAULT;
}
- m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags);
+ int style;
+ if (m_statusStyles)
+ style = m_statusStyles[n];
+ else
+ style = wxSB_NORMAL;
+ m_renderer->DrawStatusField(dc, rect, m_statusText[n], flags, style);
}
rect.x += rect.width + borderBetweenFields;
wxString wxStatusBarUniv::GetStatusText(int number) const
{
- wxCHECK_MSG( number >= 0 && number < m_nFields, _T(""),
+ wxCHECK_MSG( number >= 0 && number < m_nFields, wxEmptyString,
_T("invalid status bar field index") );
return m_statusText[number];
bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
{
- wxCHECK_MSG( n >= 0 && n < m_nFields, FALSE,
+ wxCHECK_MSG( n >= 0 && n < m_nFields, false,
_T("invalid field index in GetFieldRect()") );
// this is a fix for a bug exhibited by the statbar sample: if
rect = DoGetFieldRect(n);
- return TRUE;
+ return true;
}
wxRect wxStatusBarUniv::DoGetFieldRect(int n) const
}
#endif // wxUSE_STATUSBAR
-