projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
respect wxBU_NOTEXT style in wxButton
[wxWidgets.git]
/
src
/
univ
/
radiobut.cpp
diff --git
a/src/univ/radiobut.cpp
b/src/univ/radiobut.cpp
index de57e5f3fcb07d66c59da43c6fda9d8aff1ca8c3..41958ea77957f440bcc332b6fb0e59d1b2caa737 100644
(file)
--- a/
src/univ/radiobut.cpp
+++ b/
src/univ/radiobut.cpp
@@
-1,12
+1,12
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: univ/radiobut.cpp
+// Name:
src/
univ/radiobut.cpp
// Purpose: wxRadioButton implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 10.09.00
// RCS-ID: $Id$
// Purpose: wxRadioButton implementation
// Author: Vadim Zeitlin
// Modified by:
// Created: 10.09.00
// RCS-ID: $Id$
-// Copyright: (c) 2000
Vadim Zeitlin
-// Licence: wxWindows licen
s
e
+// Copyright: (c) 2000
SciTech Software, Inc. (www.scitechsoft.com)
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "univradiobut.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
@@
-29,9
+25,10
@@
#if wxUSE_RADIOBTN
#if wxUSE_RADIOBTN
+#include "wx/radiobut.h"
+
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
- #include "wx/radiobut.h"
#include "wx/validate.h"
#endif
#include "wx/validate.h"
#endif
@@
-60,12
+57,12
@@
bool wxRadioButton::Create(wxWindow *parent,
const wxString &name)
{
if ( !wxCheckBox::Create(parent, id, label, pos, size, style,
const wxString &name)
{
if ( !wxCheckBox::Create(parent, id, label, pos, size, style,
-
wxDefaultV
alidator, name) )
+
v
alidator, name) )
{
{
- return
FALSE
;
+ return
false
;
}
}
- return
TRUE
;
+ return
true
;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-78,7
+75,7
@@
void wxRadioButton::OnCheck()
// find the radio button which is the first in the group, i.e. the one
// with wxRB_GROUP style
const wxWindowList& siblings = GetParent()->GetChildren();
// find the radio button which is the first in the group, i.e. the one
// with wxRB_GROUP style
const wxWindowList& siblings = GetParent()->GetChildren();
- wxWindowList::
Node *
nodeStart = siblings.Find(this);
+ wxWindowList::
compatibility_iterator
nodeStart = siblings.Find(this);
while ( nodeStart )
{
// stop if we found a radio button with wxRB_GROUP style or it we
while ( nodeStart )
{
// stop if we found a radio button with wxRB_GROUP style or it we
@@
-134,7
+131,7
@@
void wxRadioButton::ClearValue()
{
if ( IsChecked() )
{
{
if ( IsChecked() )
{
- SetValue(
FALSE
);
+ SetValue(
false
);
}
}
}
}
@@
-180,4
+177,3
@@
void wxRadioButton::DoDraw(wxControlRenderer *renderer)
}
#endif // wxUSE_RADIOBTN
}
#endif // wxUSE_RADIOBTN
-