projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WXUNUSED is our coding standard.
[wxWidgets.git]
/
src
/
univ
/
statusbr.cpp
diff --git
a/src/univ/statusbr.cpp
b/src/univ/statusbr.cpp
index 85fca9f03fafef8a21abb0722c89e7887caede56..6773264e022a35c1038fcf2889e4d995eee2c739 100644
(file)
--- a/
src/univ/statusbr.cpp
+++ b/
src/univ/statusbr.cpp
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "univstatusbr.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
@@
-68,16
+64,16
@@
bool wxStatusBarUniv::Create(wxWindow *parent,
wxDefaultPosition, wxDefaultSize,
style, name) )
{
wxDefaultPosition, wxDefaultSize,
style, name) )
{
- return
FALSE
;
+ return
false
;
}
SetFieldsCount(1);
}
SetFieldsCount(1);
-
+
CreateInputHandler(wxINP_HANDLER_STATUSBAR);
SetSize(DoGetBestSize());
CreateInputHandler(wxINP_HANDLER_STATUSBAR);
SetSize(DoGetBestSize());
- return
TRUE
;
+ return
true
;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-116,7
+112,7
@@
void wxStatusBarUniv::DoDraw(wxControlRenderer *renderer)
dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
// do draw the fields
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];
for ( int n = 0; n < m_nFields; n++ )
{
rect.width = m_widthsAbs[n];
@@
-183,7
+179,7
@@
void wxStatusBarUniv::SetStatusText(const wxString& text, int number)
wxString wxStatusBarUniv::GetStatusText(int number) const
{
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];
_T("invalid status bar field index") );
return m_statusText[number];
@@
-254,7
+250,7
@@
void wxStatusBarUniv::OnSize(wxSizeEvent& event)
bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
{
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
_T("invalid field index in GetFieldRect()") );
// this is a fix for a bug exhibited by the statbar sample: if
@@
-265,7
+261,7
@@
bool wxStatusBarUniv::GetFieldRect(int n, wxRect& rect) const
rect = DoGetFieldRect(n);
rect = DoGetFieldRect(n);
- return
TRUE
;
+ return
true
;
}
wxRect wxStatusBarUniv::DoGetFieldRect(int n) const
}
wxRect wxStatusBarUniv::DoGetFieldRect(int n) const