EVT_MENU(DIALOGS_MULTI_CHOICE, MyFrame::MultiChoice)
#endif // wxUSE_CHOICEDLG
+#if wxUSE_REARRANGECTRL
EVT_MENU(DIALOGS_REARRANGE, MyFrame::Rearrange)
+#endif // wxUSE_REARRANGECTRL
#if wxUSE_FILEDLG
EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen)
EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg)
EVT_MENU(DIALOGS_CENTRE_SCREEN, MyFrame::DlgCenteredScreen)
EVT_MENU(DIALOGS_CENTRE_PARENT, MyFrame::DlgCenteredParent)
+#if wxUSE_MINIFRAME
EVT_MENU(DIALOGS_MINIFRAME, MyFrame::MiniFrame)
+#endif // wxUSE_MINIFRAME
EVT_MENU(DIALOGS_ONTOP, MyFrame::DlgOnTop)
#if wxUSE_STARTUP_TIPS
choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U"));
#endif // wxUSE_CHOICEDLG
+ #if wxUSE_REARRANGECTRL
choices_menu->Append(DIALOGS_REARRANGE, _T("&Rearrange dialog\tCtrl-R"));
+ #endif // wxUSE_REARRANGECTRL
#if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
choices_menu->AppendSeparator();
dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Mode&less dialog\tCtrl-Z"));
dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, _T("Centered on &screen\tShift-Ctrl-1"));
dialogs_menu->Append(DIALOGS_CENTRE_PARENT, _T("Centered on &parent\tShift-Ctrl-2"));
+#if wxUSE_MINIFRAME
dialogs_menu->Append(DIALOGS_MINIFRAME, _T("&Mini frame"));
+#endif // wxUSE_MINIFRAME
dialogs_menu->Append(DIALOGS_ONTOP, _T("Dialog staying on &top"));
menuDlg->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu);
};
wxArrayInt selections;
- size_t count = wxGetMultipleChoices(selections,
+ const int count = wxGetSelectedChoices(selections,
_T("This is a small sample\n")
_T("A multi-choice convenience dialog"),
_T("Please select a value"),
WXSIZEOF(choices), choices,
this);
- if ( count )
+ if ( count >= 0 )
{
wxString msg;
- msg.Printf(wxT("You selected %u items:\n"), (unsigned)count);
- for ( size_t n = 0; n < count; n++ )
+ if ( count == 0 )
+ {
+ msg = wxT("You did not select any items");
+ }
+ else
{
- msg += wxString::Format(wxT("\t%u: %u (%s)\n"),
- (unsigned)n, (unsigned)selections[n],
- choices[selections[n]].c_str());
+ msg.Printf(wxT("You selected %u items:\n"), (unsigned)count);
+ for ( int n = 0; n < count; n++ )
+ {
+ msg += wxString::Format(wxT("\t%u: %u (%s)\n"),
+ (unsigned)n, (unsigned)selections[n],
+ choices[selections[n]].c_str());
+ }
}
wxLogMessage(msg);
}
- //else: cancelled or nothing selected
+ //else: cancelled
}
#endif // wxUSE_CHOICEDLG
+#if wxUSE_REARRANGECTRL
// custom rearrange dialog: it adds the possibility to rename an item to the
// base class functionality
class MyRearrangeDialog : public wxRearrangeDialog
DoUpdateExtraControls(GetList()->GetSelection());
AddExtraControls(panel);
+
+
+ // another customization not directly supported by the dialog: add a
+ // custom button
+ wxWindow * const btnOk = FindWindow(wxID_OK);
+ wxCHECK_RET( btnOk, "no Ok button?" );
+
+ wxSizer * const sizerBtns = btnOk->GetContainingSizer();
+ wxCHECK_RET( sizerBtns, "no buttons sizer?" );
+
+ sizerBtns->Add(new wxButton(this, wxID_RESET, "&Reset all"),
+ wxSizerFlags().Border(wxLEFT));
}
// call this instead of ShowModal() to update order and labels array in
// case the dialog was not cancelled
bool Rearrange()
{
- if ( ShowModal() == wxID_CANCEL )
- return false;
+ switch ( ShowModal() )
+ {
+ case wxID_CANCEL:
+ return false;
- m_order = GetOrder();
+ case wxID_OK:
+ m_order = GetOrder();
+ break;
+
+ case wxID_RESET:
+ // order already reset
+ break;
+ }
return true;
}
GetList()->SetString(m_sel, m_labels[m_sel]);
}
+ void OnReset(wxCommandEvent& WXUNUSED(event))
+ {
+ // in a real program we should probably ask if the user really wants to
+ // do this but here we just go ahead and reset all columns labels and
+ // their order without confirmation
+ const unsigned count = m_order.size();
+ for ( unsigned n = 0; n < count; n++ )
+ {
+ m_order[n] = n;
+ m_labels[n] = m_labelsOrig[n];
+ }
+
+ EndModal(wxID_RESET);
+ }
+
bool CanRename() const
{
// only allow renaming if the user modified the currently selected item
wxTextCtrl *m_text;
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(MyRearrangeDialog)
+ wxDECLARE_NO_COPY_CLASS(MyRearrangeDialog);
};
BEGIN_EVENT_TABLE(MyRearrangeDialog, wxRearrangeDialog)
EVT_LISTBOX(wxID_ANY, MyRearrangeDialog::OnSelChange)
+
EVT_UPDATE_UI(wxID_APPLY, MyRearrangeDialog::OnUpdateUIRename)
- EVT_BUTTON(wxID_APPLY, MyRearrangeDialog::OnRename)
+
EVT_TEXT_ENTER(wxID_ANY, MyRearrangeDialog::OnRename)
+ EVT_BUTTON(wxID_APPLY, MyRearrangeDialog::OnRename)
+ EVT_BUTTON(wxID_RESET, MyRearrangeDialog::OnReset)
END_EVENT_TABLE()
void MyFrame::Rearrange(wxCommandEvent& WXUNUSED(event))
wxLogMessage("The columns order now is:%s", columns);
}
+#endif // wxUSE_REARRANGECTRL
#if wxUSE_FILEDLG
dlg.ShowModal();
}
+#if wxUSE_MINIFRAME
void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
{
wxFrame *frame = new wxMiniFrame(this, wxID_ANY, _T("Mini frame"),
frame->CentreOnParent();
frame->Show();
}
+#endif // wxUSE_MINIFRAME
void MyFrame::DlgOnTop(wxCommandEvent& WXUNUSED(event))
{
wxFlexGridSizer *grid_sizer = new wxFlexGridSizer( 2, 5, 5 );
+#if wxUSE_LISTBOX
wxListBox *listbox = new wxListBox( this, ID_LISTBOX );
listbox->Append( "String 1" );
listbox->Append( "String 2" );
listbox->Append( "String 3" );
listbox->Append( "String 4" );
grid_sizer->Add( listbox );
+#endif // wxUSE_LISTBOX
grid_sizer->Add( new wxCheckBox( this, ID_CATCH_LISTBOX_DCLICK, "Catch DoubleClick from wxListBox" ), 0, wxALIGN_CENTRE_VERTICAL );
wxAboutDialogInfo info;
InitAboutInfoMinimal(info);
- wxAboutBox(info);
+ wxAboutBox(info, this);
}
void MyFrame::ShowFancyAboutDialog(wxCommandEvent& WXUNUSED(event))
wxAboutDialogInfo info;
InitAboutInfoWebsite(info);
- wxAboutBox(info);
+ wxAboutBox(info, this);
}
void MyFrame::ShowFullAboutDialog(wxCommandEvent& WXUNUSED(event))
wxAboutDialogInfo info;
InitAboutInfoAll(info);
- wxAboutBox(info);
+ wxAboutBox(info, this);
}
// a trivial example of a custom dialog class
class MyAboutDialog : public wxGenericAboutDialog
{
public:
- MyAboutDialog(const wxAboutDialogInfo& info)
+ MyAboutDialog(const wxAboutDialogInfo& info, wxWindow* parent)
{
- Create(info);
+ Create(info, parent);
}
// add some custom controls
wxAboutDialogInfo info;
InitAboutInfoAll(info);
- MyAboutDialog dlg(info);
+ MyAboutDialog dlg(info, this);
dlg.ShowModal();
}
for ( int i = 0; i < 18; i++ )
{
- //wxUsleep(100);
+ wxMilliSleep(100);
wxTheApp->Yield();
}
m_btnModeless = new wxButton(this, wxID_ANY, _T("Mode&less dialog"));
m_btnDelete = new wxButton(this, wxID_ANY, _T("&Delete button"));
- wxButton *btnOk = new wxButton(this, wxID_CANCEL, _T("&Close"));
sizerTop->Add(m_btnModal, 0, wxALIGN_CENTER | wxALL, 5);
sizerTop->Add(m_btnModeless, 0, wxALIGN_CENTER | wxALL, 5);
sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5);
- sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5);
+ sizerTop->Add(new wxButton(this, wxID_CLOSE), 0, wxALIGN_CENTER | wxALL, 5);
SetSizerAndFit(sizerTop);
+ SetEscapeId(wxID_CLOSE);
+
m_btnModal->SetFocus();
m_btnModal->SetDefault();
}
// icon choice
const wxString icons[] = {
- "&Information", "&Question", "&Warning", "&Error"
+ "&None", "&Information", "&Question", "&Warning", "&Error"
};
- m_icons = new wxRadioBox(this, wxID_ANY, "&Icon:",
+ m_icons = new wxRadioBox(this, wxID_ANY, "&Icons",
wxDefaultPosition, wxDefaultSize,
WXSIZEOF(icons), icons);
+ // Make the 'Information' icon the default one:
+ m_icons->SetSelection(1);
sizerTop->Add(m_icons, wxSizerFlags().Expand().Border());
switch ( m_icons->GetSelection() )
{
- case 0: style |= wxICON_INFORMATION; break;
- case 1: style |= wxICON_QUESTION; break;
- case 2: style |= wxICON_WARNING; break;
- case 3: style |= wxICON_ERROR; break;
+ case 0: style |= wxICON_NONE; break;
+ case 1: style |= wxICON_INFORMATION; break;
+ case 2: style |= wxICON_QUESTION; break;
+ case 3: style |= wxICON_WARNING; break;
+ case 4: style |= wxICON_ERROR; break;
}
if ( m_chkCentre->IsChecked() )
projects / wxWidgets.git / blobdiff