projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly reject the use of wxTE_PASSWORD in generic wxSpinCtrl.
[wxWidgets.git]
/
src
/
univ
/
radiobox.cpp
diff --git
a/src/univ/radiobox.cpp
b/src/univ/radiobox.cpp
index b51b63aecbfb78bfaa2eb10fac70288885f91bd8..ac606d1cd3bcf011dab6861d5b6adafe5c408a81 100644
(file)
--- a/
src/univ/radiobox.cpp
+++ b/
src/univ/radiobox.cpp
@@
-25,9
+25,10
@@
#if wxUSE_RADIOBOX
#if wxUSE_RADIOBOX
+#include "wx/radiobox.h"
+
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
- #include "wx/radiobox.h"
#include "wx/radiobut.h"
#include "wx/validate.h"
#include "wx/arrstr.h"
#include "wx/radiobut.h"
#include "wx/validate.h"
#include "wx/arrstr.h"
@@
-146,20
+147,20
@@
bool wxRadioBox::Create(wxWindow *parent,
if ( !(style & (wxRA_LEFTTORIGHT | wxRA_TOPTOBOTTOM)) )
{
// horizontal radiobox use left to right layout
if ( !(style & (wxRA_LEFTTORIGHT | wxRA_TOPTOBOTTOM)) )
{
// horizontal radiobox use left to right layout
- if ( style & wxRA_
HORIZONTAL
)
+ if ( style & wxRA_
SPECIFY_COLS
)
{
style |= wxRA_LEFTTORIGHT;
}
{
style |= wxRA_LEFTTORIGHT;
}
- else if ( style & wxRA_
VERTICAL
)
+ else if ( style & wxRA_
SPECIFY_ROWS
)
{
style |= wxRA_TOPTOBOTTOM;
}
else
{
{
style |= wxRA_TOPTOBOTTOM;
}
else
{
- wxFAIL_MSG(
_
T("you must specify wxRA_XXX style!") );
+ wxFAIL_MSG(
wx
T("you must specify wxRA_XXX style!") );
// use default
// use default
- style = wxRA_
HORIZONTAL
| wxRA_LEFTTORIGHT;
+ style = wxRA_
SPECIFY_COLS
| wxRA_LEFTTORIGHT;
}
}
}
}
@@
-238,7
+239,7
@@
void wxRadioBox::Append(int count, const wxString *choices)
void wxRadioBox::SetSelection(int n)
{
void wxRadioBox::SetSelection(int n)
{
- wxCHECK_RET( IsValid(n),
_
T("invalid index in wxRadioBox::SetSelection") );
+ wxCHECK_RET( IsValid(n),
wx
T("invalid index in wxRadioBox::SetSelection") );
m_selection = n;
m_selection = n;
@@
-258,7
+259,7
@@
int wxRadioBox::GetSelection() const
void wxRadioBox::SendRadioEvent()
{
void wxRadioBox::SendRadioEvent()
{
- wxCHECK_RET( m_selection != -1,
_
T("no active radio button") );
+ wxCHECK_RET( m_selection != -1,
wx
T("no active radio button") );
wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, GetId());
InitCommandEvent(event);
wxCommandEvent event(wxEVT_COMMAND_RADIOBOX_SELECTED, GetId());
InitCommandEvent(event);
@@
-271,7
+272,7
@@
void wxRadioBox::SendRadioEvent()
void wxRadioBox::OnRadioButton(wxEvent& event)
{
int n = m_buttons.Index((wxRadioButton *)event.GetEventObject());
void wxRadioBox::OnRadioButton(wxEvent& event)
{
int n = m_buttons.Index((wxRadioButton *)event.GetEventObject());
- wxCHECK_RET( n != wxNOT_FOUND,
_
T("click from alien radio button") );
+ wxCHECK_RET( n != wxNOT_FOUND,
wx
T("click from alien radio button") );
m_selection = n;
m_selection = n;
@@
-285,42
+286,42
@@
void wxRadioBox::OnRadioButton(wxEvent& event)
wxString wxRadioBox::GetString(unsigned int n) const
{
wxCHECK_MSG( IsValid(n), wxEmptyString,
wxString wxRadioBox::GetString(unsigned int n) const
{
wxCHECK_MSG( IsValid(n), wxEmptyString,
-
_
T("invalid index in wxRadioBox::GetString") );
+
wx
T("invalid index in wxRadioBox::GetString") );
return m_buttons[n]->GetLabel();
}
void wxRadioBox::SetString(unsigned int n, const wxString& label)
{
return m_buttons[n]->GetLabel();
}
void wxRadioBox::SetString(unsigned int n, const wxString& label)
{
- wxCHECK_RET( IsValid(n),
_
T("invalid index in wxRadioBox::SetString") );
+ wxCHECK_RET( IsValid(n),
wx
T("invalid index in wxRadioBox::SetString") );
m_buttons[n]->SetLabel(label);
}
bool wxRadioBox::Enable(unsigned int n, bool enable)
{
m_buttons[n]->SetLabel(label);
}
bool wxRadioBox::Enable(unsigned int n, bool enable)
{
- wxCHECK_MSG( IsValid(n), false,
_
T("invalid index in wxRadioBox::Enable") );
+ wxCHECK_MSG( IsValid(n), false,
wx
T("invalid index in wxRadioBox::Enable") );
return m_buttons[n]->Enable(enable);
}
bool wxRadioBox::IsItemEnabled(unsigned int n) const
{
return m_buttons[n]->Enable(enable);
}
bool wxRadioBox::IsItemEnabled(unsigned int n) const
{
- wxCHECK_MSG( IsValid(n), false,
_
T("invalid index in wxRadioBox::IsItemEnabled") );
+ wxCHECK_MSG( IsValid(n), false,
wx
T("invalid index in wxRadioBox::IsItemEnabled") );
return m_buttons[n]->IsEnabled();
}
bool wxRadioBox::Show(unsigned int n, bool show)
{
return m_buttons[n]->IsEnabled();
}
bool wxRadioBox::Show(unsigned int n, bool show)
{
- wxCHECK_MSG( IsValid(n), false,
_
T("invalid index in wxRadioBox::Show") );
+ wxCHECK_MSG( IsValid(n), false,
wx
T("invalid index in wxRadioBox::Show") );
return m_buttons[n]->Show(show);
}
bool wxRadioBox::IsItemShown(unsigned int n) const
{
return m_buttons[n]->Show(show);
}
bool wxRadioBox::IsItemShown(unsigned int n) const
{
- wxCHECK_MSG( IsValid(n), false,
_
T("invalid index in wxRadioBox::IsItemShown") );
+ wxCHECK_MSG( IsValid(n), false,
wx
T("invalid index in wxRadioBox::IsItemShown") );
return m_buttons[n]->IsShown();
}
return m_buttons[n]->IsShown();
}