projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.
[wxWidgets.git]
/
samples
/
widgets
/
radiobox.cpp
diff --git
a/samples/widgets/radiobox.cpp
b/samples/widgets/radiobox.cpp
index 91f5cc9fa9e38b256105ad99c258c73380c51e43..f7b0296772d41e74582e11352ca8d4ec0f7827b4 100644
(file)
--- a/
samples/widgets/radiobox.cpp
+++ b/
samples/widgets/radiobox.cpp
@@
-6,7
+6,7
@@
// Created: 15.04.01
// Id: $Id$
// Copyright: (c) 2001 Vadim Zeitlin
// Created: 15.04.01
// Id: $Id$
// Copyright: (c) 2001 Vadim Zeitlin
-// Licen
se: wxWindows licens
e
+// Licen
ce: wxWindows licenc
e
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-51,7
+51,7
@@
// control ids
enum
{
// control ids
enum
{
- RadioPage_Reset =
100
,
+ RadioPage_Reset =
wxID_HIGHEST
,
RadioPage_Update,
RadioPage_Selection,
RadioPage_Label,
RadioPage_Update,
RadioPage_Selection,
RadioPage_Label,
@@
-83,12
+83,15
@@
static const int TEST_BUTTON = 1;
class RadioWidgetsPage : public WidgetsPage
{
public:
class RadioWidgetsPage : public WidgetsPage
{
public:
- RadioWidgetsPage(
wxBookCtrlBase
*book, wxImageList *imaglist);
+ RadioWidgetsPage(
WidgetsBookCtrl
*book, wxImageList *imaglist);
virtual ~RadioWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_radio; }
virtual void RecreateWidget() { CreateRadio(); }
virtual ~RadioWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_radio; }
virtual void RecreateWidget() { CreateRadio(); }
+ // lazy creation of the content
+ virtual void CreateContent();
+
protected:
// event handlers
void OnCheckOrRadioBox(wxCommandEvent& event);
protected:
// event handlers
void OnCheckOrRadioBox(wxCommandEvent& event);
@@
-119,7
+122,7
@@
protected:
// ------------
// the check/radio boxes for styles
// ------------
// the check/radio boxes for styles
- wxCheckBox *m_chk
Vert
;
+ wxCheckBox *m_chk
SpecifyRows
;
wxCheckBox *m_chkEnableItem;
wxCheckBox *m_chkShowItem;
wxRadioBox *m_radioDir;
wxCheckBox *m_chkEnableItem;
wxCheckBox *m_chkShowItem;
wxRadioBox *m_radioDir;
@@
-173,16
+176,22
@@
END_EVENT_TABLE()
// implementation
// ============================================================================
// implementation
// ============================================================================
-IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, _T("Radio"));
+#if defined(__WXUNIVERSAL__)
+ #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+ #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(RadioWidgetsPage, wxT("Radio"),
+ FAMILY_CTRLS | WITH_ITEMS_CTRLS
+ );
-RadioWidgetsPage::RadioWidgetsPage(
wxBookCtrlBase
*book,
+RadioWidgetsPage::RadioWidgetsPage(
WidgetsBookCtrl
*book,
wxImageList *imaglist)
wxImageList *imaglist)
- : WidgetsPage(book)
+ : WidgetsPage(book
, imaglist, radio_xpm
)
{
{
- imaglist->Add(wxBitmap(radio_xpm));
-
// init everything
// init everything
- m_chk
Vert
= (wxCheckBox *)NULL;
+ m_chk
SpecifyRows
= (wxCheckBox *)NULL;
m_chkEnableItem = (wxCheckBox *)NULL;
m_chkShowItem = (wxCheckBox *)NULL;
m_chkEnableItem = (wxCheckBox *)NULL;
m_chkShowItem = (wxCheckBox *)NULL;
@@
-193,24
+202,31
@@
RadioWidgetsPage::RadioWidgetsPage(wxBookCtrlBase *book,
m_radio =
m_radioDir = (wxRadioBox *)NULL;
m_sizerRadio = (wxSizer *)NULL;
m_radio =
m_radioDir = (wxRadioBox *)NULL;
m_sizerRadio = (wxSizer *)NULL;
+}
+void RadioWidgetsPage::CreateContent()
+{
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
- wxStaticBox *box = new wxStaticBox(this, wxID_ANY,
_
T("&Set style"));
+ wxStaticBox *box = new wxStaticBox(this, wxID_ANY,
wx
T("&Set style"));
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
- m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical layout"));
+ m_chkSpecifyRows = CreateCheckBoxAndAddToSizer
+ (
+ sizerLeft,
+ "Major specifies &rows count"
+ );
static const wxString layoutDir[] =
{
static const wxString layoutDir[] =
{
-
_
T("default"),
-
_
T("left to right"),
-
_
T("top to bottom")
+
wx
T("default"),
+
wx
T("left to right"),
+
wx
T("top to bottom")
};
};
- m_radioDir = new wxRadioBox(this, wxID_ANY,
_
T("Numbering:"),
+ m_radioDir = new wxRadioBox(this, wxID_ANY,
wx
T("Numbering:"),
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(layoutDir), layoutDir,
1, wxRA_SPECIFY_COLS);
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(layoutDir), layoutDir,
1, wxRA_SPECIFY_COLS);
@@
-222,57
+238,57
@@
RadioWidgetsPage::RadioWidgetsPage(wxBookCtrlBase *book,
#endif // wxRA_LEFTTORIGHT
wxSizer *sizerRow;
#endif // wxRA_LEFTTORIGHT
wxSizer *sizerRow;
- sizerRow = CreateSizerWithTextAndLabel(
_
T("&Major dimension:"),
+ sizerRow = CreateSizerWithTextAndLabel(
wx
T("&Major dimension:"),
wxID_ANY,
&m_textMajorDim);
sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
wxID_ANY,
&m_textMajorDim);
sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
- sizerRow = CreateSizerWithTextAndLabel(
_
T("&Number of buttons:"),
+ sizerRow = CreateSizerWithTextAndLabel(
wx
T("&Number of buttons:"),
wxID_ANY,
&m_textNumBtns);
sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
wxButton *btn;
wxID_ANY,
&m_textNumBtns);
sizerLeft->Add(sizerRow, 0, wxGROW | wxALL, 5);
wxButton *btn;
- btn = new wxButton(this, RadioPage_Update,
_
T("&Update"));
+ btn = new wxButton(this, RadioPage_Update,
wx
T("&Update"));
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 5);
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 5);
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
- btn = new wxButton(this, RadioPage_Reset,
_
T("&Reset"));
+ btn = new wxButton(this, RadioPage_Reset,
wx
T("&Reset"));
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
- wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
_
T("&Change parameters"));
+ wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
wx
T("&Change parameters"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
- sizerRow = CreateSizerWithTextAndLabel(
_
T("Current selection:"),
+ sizerRow = CreateSizerWithTextAndLabel(
wx
T("Current selection:"),
wxID_ANY,
&m_textCurSel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,
wxID_ANY,
&m_textCurSel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_Selection,
-
_
T("&Change selection:"),
+
wx
T("&Change selection:"),
wxID_ANY,
&m_textSel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,
wxID_ANY,
&m_textSel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_Label,
-
_
T("&Label for box:"),
+
wx
T("&Label for box:"),
wxID_ANY,
&m_textLabel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,
wxID_ANY,
&m_textLabel);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
sizerRow = CreateSizerWithTextAndButton(RadioPage_LabelBtn,
-
_
T("&Label for buttons:"),
+
wx
T("&Label for buttons:"),
wxID_ANY,
&m_textLabelBtns);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
m_chkEnableItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
wxID_ANY,
&m_textLabelBtns);
sizerMiddle->Add(sizerRow, 0, wxGROW | wxALL, 5);
m_chkEnableItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
-
_
T("Disable &2nd item"),
+
wx
T("Disable &2nd item"),
RadioPage_EnableItem);
m_chkShowItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
RadioPage_EnableItem);
m_chkShowItem = CreateCheckBoxAndAddToSizer(sizerMiddle,
-
_
T("Hide 2nd &item"),
+
wx
T("Hide 2nd &item"),
RadioPage_ShowItem);
// right pane
RadioPage_ShowItem);
// right pane
@@
-290,8
+306,6
@@
RadioWidgetsPage::RadioWidgetsPage(wxBookCtrlBase *book,
// final initializations
SetSizer(sizerTop);
// final initializations
SetSizer(sizerTop);
-
- sizerTop->Fit(this);
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-300,12
+314,12
@@
RadioWidgetsPage::RadioWidgetsPage(wxBookCtrlBase *book,
void RadioWidgetsPage::Reset()
{
void RadioWidgetsPage::Reset()
{
- m_textMajorDim->SetValue(wxString::Format(
_
T("%u"), DEFAULT_MAJOR_DIM));
- m_textNumBtns->SetValue(wxString::Format(
_
T("%u"), DEFAULT_NUM_ENTRIES));
- m_textLabel->SetValue(
_
T("I'm a radiobox"));
- m_textLabelBtns->SetValue(
_
T("item"));
+ m_textMajorDim->SetValue(wxString::Format(
wx
T("%u"), DEFAULT_MAJOR_DIM));
+ m_textNumBtns->SetValue(wxString::Format(
wx
T("%u"), DEFAULT_NUM_ENTRIES));
+ m_textLabel->SetValue(
wx
T("I'm a radiobox"));
+ m_textLabelBtns->SetValue(
wx
T("item"));
- m_chk
Vert
->SetValue(false);
+ m_chk
SpecifyRows
->SetValue(false);
m_chkEnableItem->SetValue(true);
m_chkShowItem->SetValue(true);
m_radioDir->SetSelection(RadioDir_Default);
m_chkEnableItem->SetValue(true);
m_chkShowItem->SetValue(true);
m_radioDir->SetSelection(RadioDir_Default);
@@
-330,7
+344,7
@@
void RadioWidgetsPage::CreateRadio()
unsigned long count;
if ( !m_textNumBtns->GetValue().ToULong(&count) )
{
unsigned long count;
if ( !m_textNumBtns->GetValue().ToULong(&count) )
{
- wxLogWarning(
_
T("Should have a valid number for number of items."));
+ wxLogWarning(
wx
T("Should have a valid number for number of items."));
// fall back to default
count = DEFAULT_NUM_ENTRIES;
// fall back to default
count = DEFAULT_NUM_ENTRIES;
@@
-339,7
+353,7
@@
void RadioWidgetsPage::CreateRadio()
unsigned long majorDim;
if ( !m_textMajorDim->GetValue().ToULong(&majorDim) )
{
unsigned long majorDim;
if ( !m_textMajorDim->GetValue().ToULong(&majorDim) )
{
- wxLogWarning(
_
T("Should have a valid major dimension number."));
+ wxLogWarning(
wx
T("Should have a valid major dimension number."));
// fall back to default
majorDim = DEFAULT_MAJOR_DIM;
// fall back to default
majorDim = DEFAULT_MAJOR_DIM;
@@
-350,12
+364,12
@@
void RadioWidgetsPage::CreateRadio()
wxString labelBtn = m_textLabelBtns->GetValue();
for ( size_t n = 0; n < count; n++ )
{
wxString labelBtn = m_textLabelBtns->GetValue();
for ( size_t n = 0; n < count; n++ )
{
- items[n] = wxString::Format(
_
T("%s %lu"),
+ items[n] = wxString::Format(
wx
T("%s %lu"),
labelBtn.c_str(), (unsigned long)n + 1);
}
labelBtn.c_str(), (unsigned long)n + 1);
}
- int flags = m_chk
Vert->GetValue() ? wxRA_VERTICAL
-
: wxRA_HORIZONTAL
;
+ int flags = m_chk
SpecifyRows->GetValue() ? wxRA_SPECIFY_ROWS
+
: wxRA_SPECIFY_COLS
;
flags |= ms_defaultFlags;
flags |= ms_defaultFlags;
@@
-363,7
+377,7
@@
void RadioWidgetsPage::CreateRadio()
switch ( m_radioDir->GetSelection() )
{
default:
switch ( m_radioDir->GetSelection() )
{
default:
- wxFAIL_MSG(
_
T("unexpected wxRadioBox layout direction") );
+ wxFAIL_MSG(
wx
T("unexpected wxRadioBox layout direction") );
// fall through
case RadioDir_Default:
// fall through
case RadioDir_Default:
@@
-422,12
+436,12
@@
void RadioWidgetsPage::OnRadioBox(wxCommandEvent& event)
int event_sel = event.GetSelection();
wxUnusedVar(event_sel);
int event_sel = event.GetSelection();
wxUnusedVar(event_sel);
- wxLogMessage(
_
T("Radiobox selection changed, now %d"), sel);
+ wxLogMessage(
wx
T("Radiobox selection changed, now %d"), sel);
wxASSERT_MSG( sel == event_sel,
wxASSERT_MSG( sel == event_sel,
-
_
T("selection should be the same in event and radiobox") );
+
wx
T("selection should be the same in event and radiobox") );
- m_textCurSel->SetValue(wxString::Format(
_
T("%d"), sel));
+ m_textCurSel->SetValue(wxString::Format(
wx
T("%d"), sel));
}
void RadioWidgetsPage::OnButtonRecreate(wxCommandEvent& WXUNUSED(event))
}
void RadioWidgetsPage::OnButtonRecreate(wxCommandEvent& WXUNUSED(event))
@@
-446,7
+460,7
@@
void RadioWidgetsPage::OnButtonSelection(wxCommandEvent& WXUNUSED(event))
if ( !m_textSel->GetValue().ToULong(&sel) ||
(sel >= (size_t)m_radio->GetCount()) )
{
if ( !m_textSel->GetValue().ToULong(&sel) ||
(sel >= (size_t)m_radio->GetCount()) )
{
- wxLogWarning(
_
T("Invalid number specified as new selection."));
+ wxLogWarning(
wx
T("Invalid number specified as new selection."));
}
else
{
}
else
{
@@
-481,7
+495,7
@@
void RadioWidgetsPage::OnUpdateUISelection(wxUpdateUIEvent& event)
void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
{
// only enable it if something is not set to default
void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
{
// only enable it if something is not set to default
- bool enable = m_chk
Vert
->GetValue();
+ bool enable = m_chk
SpecifyRows
->GetValue();
if ( !enable )
{
if ( !enable )
{
@@
-504,14
+518,14
@@
void RadioWidgetsPage::OnUpdateUIReset(wxUpdateUIEvent& event)
void RadioWidgetsPage::OnUpdateUIEnableItem(wxUpdateUIEvent& event)
{
void RadioWidgetsPage::OnUpdateUIEnableItem(wxUpdateUIEvent& event)
{
- event.SetText(m_radio->IsItemEnabled(TEST_BUTTON) ?
_
T("Disable &2nd item")
- :
_
T("Enable &2nd item"));
+ event.SetText(m_radio->IsItemEnabled(TEST_BUTTON) ?
wx
T("Disable &2nd item")
+ :
wx
T("Enable &2nd item"));
}
void RadioWidgetsPage::OnUpdateUIShowItem(wxUpdateUIEvent& event)
{
}
void RadioWidgetsPage::OnUpdateUIShowItem(wxUpdateUIEvent& event)
{
- event.SetText(m_radio->IsItemShown(TEST_BUTTON) ?
_
T("Hide 2nd &item")
- :
_
T("Show 2nd &item"));
+ event.SetText(m_radio->IsItemShown(TEST_BUTTON) ?
wx
T("Hide 2nd &item")
+ :
wx
T("Show 2nd &item"));
}
#endif // wxUSE_RADIOBOX
}
#endif // wxUSE_RADIOBOX