// Name: dialogs.cpp
// Purpose: Common dialogs demo
// Author: Julian Smart
-// Modified by:
+// Modified by: ABX (2004) - adjustements for conditional building + new menu
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma implementation
#pragma interface
#endif
#include "wx/wx.h"
#endif
-#include "wx/colordlg.h"
-#include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/fontdlg.h"
-#include "wx/choicdlg.h"
-#include "wx/tipdlg.h"
-#include "wx/progdlg.h"
-#include "wx/fdrepdlg.h"
-#include "wx/busyinfo.h"
-
-#define wxTEST_GENERIC_DIALOGS_IN_MSW 0
-
-#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
-#include "wx/generic/colrdlgg.h"
-#include "wx/generic/fontdlgg.h"
-#endif
+#include "wx/datetime.h"
+#include "wx/image.h"
-#define wxUSE_DIRDLGG 0
+#if wxUSE_COLOURDLG
+ #include "wx/colordlg.h"
+#endif // wxUSE_COLOURDLG
-#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
-#include "wx/generic/dirdlgg.h"
-#endif
+#if wxUSE_CHOICEDLG
+ #include "wx/choicdlg.h"
+#endif // wxUSE_CHOICEDLG
+
+#if wxUSE_STARTUP_TIPS
+ #include "wx/tipdlg.h"
+#endif // wxUSE_STARTUP_TIPS
+
+#if wxUSE_PROGRESSDLG
+ #include "wx/progdlg.h"
+#endif // wxUSE_PROGRESSDLG
+
+#if wxUSE_BUSYINFO
+ #include "wx/busyinfo.h"
+#endif // wxUSE_BUSYINFO
+
+#if wxUSE_NUMBERDLG
+ #include "wx/numdlg.h"
+#endif // wxUSE_NUMBERDLG
+
+#if wxUSE_FILEDLG
+ #include "wx/filedlg.h"
+#endif // wxUSE_FILEDLG
+
+#if wxUSE_DIRDLG
+ #include "wx/dirdlg.h"
+#endif // wxUSE_DIRDLG
+
+#if wxUSE_FONTDLG
+ #include "wx/fontdlg.h"
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_FINDREPLDLG
+ #include "wx/fdrepdlg.h"
+#endif // wxUSE_FINDREPLDLG
#include "dialogs.h"
+#if USE_COLOURDLG_GENERIC
+ #include "wx/generic/colrdlgg.h"
+#endif // USE_COLOURDLG_GENERIC
+
+#if USE_DIRDLG_GENERIC
+ #include "wx/generic/dirdlgg.h"
+#endif // USE_DIRDLG_GENERIC
+
+#if USE_FILEDLG_GENERIC
+ #include "wx/generic/filedlgg.h"
+#endif // USE_FILEDLG_GENERIC
+
+#if USE_FONTDLG_GENERIC
+ #include "wx/generic/fontdlgg.h"
+#endif // USE_FONTDLG_GENERIC
+
IMPLEMENT_APP(MyApp)
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_PAINT(MyCanvas::OnPaint)
END_EVENT_TABLE()
+
+
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+ EVT_MENU(DIALOGS_MESSAGE_BOX, MyFrame::MessageBox)
+
+#if wxUSE_COLOURDLG
EVT_MENU(DIALOGS_CHOOSE_COLOUR, MyFrame::ChooseColour)
+#endif // wxUSE_COLOURDLG
+
+#if wxUSE_FONTDLG
EVT_MENU(DIALOGS_CHOOSE_FONT, MyFrame::ChooseFont)
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_LOG_DIALOG
EVT_MENU(DIALOGS_LOG_DIALOG, MyFrame::LogDialog)
- EVT_MENU(DIALOGS_MESSAGE_BOX, MyFrame::MessageBox)
+#endif // wxUSE_LOG_DIALOG
+
+#if wxUSE_TEXTDLG
EVT_MENU(DIALOGS_TEXT_ENTRY, MyFrame::TextEntry)
EVT_MENU(DIALOGS_PASSWORD_ENTRY, MyFrame::PasswordEntry)
+#endif // wxUSE_TEXTDLG
+
+#if wxUSE_NUMBERDLG
EVT_MENU(DIALOGS_NUM_ENTRY, MyFrame::NumericEntry)
+#endif // wxUSE_NUMBERDLG
+
+#if wxUSE_CHOICEDLG
EVT_MENU(DIALOGS_SINGLE_CHOICE, MyFrame::SingleChoice)
EVT_MENU(DIALOGS_MULTI_CHOICE, MyFrame::MultiChoice)
+#endif // wxUSE_CHOICEDLG
+
+#if wxUSE_FILEDLG
EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen)
EVT_MENU(DIALOGS_FILE_OPEN2, MyFrame::FileOpen2)
EVT_MENU(DIALOGS_FILES_OPEN, MyFrame::FilesOpen)
EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave)
+#endif // wxUSE_FILEDLG
+
+#if USE_FILEDLG_GENERIC
+ EVT_MENU(DIALOGS_FILE_OPEN_GENERIC, MyFrame::FileOpenGeneric)
+ EVT_MENU(DIALOGS_FILES_OPEN_GENERIC, MyFrame::FilesOpenGeneric)
+ EVT_MENU(DIALOGS_FILE_SAVE_GENERIC, MyFrame::FileSaveGeneric)
+#endif // USE_FILEDLG_GENERIC
+
+#if wxUSE_DIRDLG
EVT_MENU(DIALOGS_DIR_CHOOSE, MyFrame::DirChoose)
- EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE, MyFrame::GenericDirChoose)
+ EVT_MENU(DIALOGS_DIRNEW_CHOOSE, MyFrame::DirChooseNew)
+#endif // wxUSE_DIRDLG
+
+#if USE_MODAL_PRESENTATION
EVT_MENU(DIALOGS_MODAL, MyFrame::ModalDlg)
EVT_MENU(DIALOGS_MODELESS, MyFrame::ModelessDlg)
+#endif // USE_MODAL
+
+#if wxUSE_STARTUP_TIPS
EVT_MENU(DIALOGS_TIP, MyFrame::ShowTip)
-#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
- EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric)
+#endif // wxUSE_STARTUP_TIPS
+
+#if USE_FONTDLG_GENERIC
EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC, MyFrame::ChooseFontGeneric)
-#endif
+#endif // USE_FONTDLG_GENERIC
+
+#if USE_DIRDLG_GENERIC
+ EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE, MyFrame::GenericDirChoose)
+#endif // wxMSW || wxMAC
+
+#if USE_COLOURDLG_GENERIC
+ EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric)
+#endif // USE_COLOURDLG_GENERIC
#if wxUSE_PROGRESSDLG
EVT_MENU(DIALOGS_PROGRESS, MyFrame::ShowProgress)
EVT_MENU(DIALOGS_FIND, MyFrame::ShowFindDialog)
EVT_MENU(DIALOGS_REPLACE, MyFrame::ShowReplaceDialog)
- EVT_FIND(-1, MyFrame::OnFindDialog)
- EVT_FIND_NEXT(-1, MyFrame::OnFindDialog)
- EVT_FIND_REPLACE(-1, MyFrame::OnFindDialog)
- EVT_FIND_REPLACE_ALL(-1, MyFrame::OnFindDialog)
- EVT_FIND_CLOSE(-1, MyFrame::OnFindDialog)
+ EVT_FIND(wxID_ANY, MyFrame::OnFindDialog)
+ EVT_FIND_NEXT(wxID_ANY, MyFrame::OnFindDialog)
+ EVT_FIND_REPLACE(wxID_ANY, MyFrame::OnFindDialog)
+ EVT_FIND_REPLACE_ALL(wxID_ANY, MyFrame::OnFindDialog)
+ EVT_FIND_CLOSE(wxID_ANY, MyFrame::OnFindDialog)
#endif // wxUSE_FINDREPLDLG
+
EVT_MENU(wxID_EXIT, MyFrame::OnExit)
END_EVENT_TABLE()
-BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
- EVT_BUTTON(-1, MyModalDialog::OnButton)
-END_EVENT_TABLE()
+#if USE_MODAL_PRESENTATION
-BEGIN_EVENT_TABLE(MyModelessDialog, wxDialog)
- EVT_BUTTON(DIALOGS_MODELESS_BTN, MyModelessDialog::OnButton)
+ BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
+ EVT_BUTTON(wxID_ANY, MyModalDialog::OnButton)
+ END_EVENT_TABLE()
- EVT_CLOSE(MyModelessDialog::OnClose)
-END_EVENT_TABLE()
+ BEGIN_EVENT_TABLE(MyModelessDialog, wxDialog)
+ EVT_BUTTON(DIALOGS_MODELESS_BTN, MyModelessDialog::OnButton)
+ EVT_CLOSE(MyModelessDialog::OnClose)
+ END_EVENT_TABLE()
+
+#endif // USE_MODAL_PRESENTATION
MyCanvas *myCanvas = (MyCanvas *) NULL;
// `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit()
{
+#if wxUSE_IMAGE
+ wxInitAllImageHandlers();
+#endif
+
#if defined(__WXGTK__) && defined(wxUSE_UNICODE)
- wxConvCurrent = &wxConvLibc;
+ wxConvCurrent = &wxConvLibc;
#endif
- m_canvasTextColour = wxColour("BLACK");
- m_canvasFont = *wxNORMAL_FONT;
+ m_canvasTextColour = wxColour(_T("BLACK"));
+ m_canvasFont = *wxNORMAL_FONT;
- // Create the main frame window
- MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows dialogs example", wxPoint(20, 20), wxSize(400, 300));
+ // Create the main frame window
+ MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets dialogs example"));
- // Make a menubar
- wxMenu *file_menu = new wxMenu;
+ // Make a menubar
+ wxMenu *file_menu = new wxMenu;
- file_menu->Append(DIALOGS_CHOOSE_COLOUR, "&Choose colour");
+ file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M"));
-#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
- file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "Choose colour (&generic)");
-#endif
- file_menu->AppendSeparator();
- file_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font");
+ #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
-#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
- file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose f&ont (generic)");
+ wxMenu *choices_menu = new wxMenu;
-#endif
- file_menu->AppendSeparator();
- file_menu->Append(DIALOGS_LOG_DIALOG, "&Log dialog\tCtrl-L");
- file_menu->Append(DIALOGS_MESSAGE_BOX, "&Message box\tCtrl-M");
- file_menu->Append(DIALOGS_TEXT_ENTRY, "Text &entry\tCtrl-E");
- file_menu->Append(DIALOGS_PASSWORD_ENTRY, "&Password entry\tCtrl-P");
- file_menu->Append(DIALOGS_NUM_ENTRY, "&Numeric entry\tCtrl-N");
- file_menu->Append(DIALOGS_SINGLE_CHOICE, "&Single choice\tCtrl-C");
- file_menu->Append(DIALOGS_MULTI_CHOICE, "M&ultiple choice\tCtrl-U");
- file_menu->AppendSeparator();
- file_menu->Append(DIALOGS_TIP, "&Tip of the day\tCtrl-T");
- file_menu->AppendSeparator();
- file_menu->Append(DIALOGS_FILE_OPEN, "&Open file\tCtrl-O");
- file_menu->Append(DIALOGS_FILE_OPEN2, "&Second open file\tCtrl-2");
- file_menu->Append(DIALOGS_FILES_OPEN, "Open &files\tCtrl-Q");
- file_menu->Append(DIALOGS_FILE_SAVE, "Sa&ve file\tCtrl-S");
- file_menu->Append(DIALOGS_DIR_CHOOSE, "&Choose a directory\tCtrl-D");
- file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, "&Choose a directory (generic implementation)");
-#if wxUSE_PROGRESSDLG
- file_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G");
-#endif // wxUSE_PROGRESSDLG
-#if wxUSE_BUSYINFO
- file_menu->Append(DIALOGS_BUSYINFO, "&Busy info dialog\tCtrl-B");
-#endif // wxUSE_BUSYINFO
-#if wxUSE_FINDREPLDLG
- file_menu->Append(DIALOGS_FIND, "&Find dialog\tCtrl-F", "", TRUE);
- file_menu->Append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", TRUE);
-#endif // wxUSE_FINDREPLDLG
- file_menu->AppendSeparator();
- file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-D");
- file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE);
- file_menu->AppendSeparator();
- file_menu->Append(wxID_EXIT, "E&xit\tAlt-X");
- wxMenuBar *menu_bar = new wxMenuBar;
- menu_bar->Append(file_menu, "&File");
- frame->SetMenuBar(menu_bar);
+ #if wxUSE_COLOURDLG
+ choices_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
+ #endif // wxUSE_COLOURDLG
+
+ #if wxUSE_FONTDLG
+ choices_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font"));
+ #endif // wxUSE_FONTDLG
+
+ #if wxUSE_CHOICEDLG
+ choices_menu->Append(DIALOGS_SINGLE_CHOICE, _T("&Single choice\tCtrl-C"));
+ choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U"));
+ #endif // wxUSE_CHOICEDLG
+
+ #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
+ choices_menu->AppendSeparator();
+ #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
+
+ #if USE_COLOURDLG_GENERIC
+ choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("&Choose colour (generic)"));
+ #endif // USE_COLOURDLG_GENERIC
+
+ #if USE_FONTDLG_GENERIC
+ choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)"));
+ #endif // USE_FONTDLG_GENERIC
+
+ file_menu->Append(wxID_ANY,_T("Choices and selectors"),choices_menu);
+
+ #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
+
+
+ #if wxUSE_TEXTDLG || wxUSE_NUMBERDLG
+
+ wxMenu *entry_menu = new wxMenu;
+
+ #if wxUSE_TEXTDLG
+ entry_menu->Append(DIALOGS_TEXT_ENTRY, _T("Text &entry\tCtrl-E"));
+ entry_menu->Append(DIALOGS_PASSWORD_ENTRY, _T("&Password entry\tCtrl-P"));
+ #endif // wxUSE_TEXTDLG
+
+ #if wxUSE_NUMBERDLG
+ entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N"));
+ #endif // wxUSE_NUMBERDLG
+
+ file_menu->Append(wxID_ANY,_T("Entry dialogs"),entry_menu);
+
+ #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG
+
+
+ #if wxUSE_FILEDLG
+
+ wxMenu *filedlg_menu = new wxMenu;
+ filedlg_menu->Append(DIALOGS_FILE_OPEN, _T("&Open file\tCtrl-O"));
+ filedlg_menu->Append(DIALOGS_FILE_OPEN2, _T("&Second open file\tCtrl-2"));
+ filedlg_menu->Append(DIALOGS_FILES_OPEN, _T("Open &files\tCtrl-Q"));
+ filedlg_menu->Append(DIALOGS_FILE_SAVE, _T("Sa&ve file\tCtrl-S"));
+
+ #if USE_FILEDLG_GENERIC
+ filedlg_menu->AppendSeparator();
+ filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, _T("&Open file (generic)"));
+ filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, _T("Open &files (generic)"));
+ filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, _T("Sa&ve file (generic)"));
+ #endif // USE_FILEDLG_GENERIC
+
+ file_menu->Append(wxID_ANY,_T("File operations"),filedlg_menu);
+
+ #endif // wxUSE_FILEDLG
+
+ #if wxUSE_DIRDLG
+ wxMenu *dir_menu = new wxMenu;
+
+ dir_menu->Append(DIALOGS_DIR_CHOOSE, _T("&Choose a directory\tCtrl-D"));
+ dir_menu->Append(DIALOGS_DIRNEW_CHOOSE, _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D"));
+ file_menu->Append(wxID_ANY,_T("Directory operations"),dir_menu);
+
+ #if USE_DIRDLG_GENERIC
+ dir_menu->AppendSeparator();
+ dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, _T("&Choose a directory (generic)"));
+ #endif // USE_DIRDLG_GENERIC
- myCanvas = new MyCanvas(frame);
- myCanvas->SetBackgroundColour(*wxWHITE);
+ #endif // wxUSE_DIRDLG
- frame->Centre(wxBOTH);
- // Show the frame
- frame->Show(TRUE);
+ #if wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG
- SetTopWindow(frame);
+ wxMenu *info_menu = new wxMenu;
- return TRUE;
+ #if wxUSE_STARTUP_TIPS
+ info_menu->Append(DIALOGS_TIP, _T("&Tip of the day\tCtrl-T"));
+ #endif // wxUSE_STARTUP_TIPS
+
+ #if wxUSE_PROGRESSDLG
+ info_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G"));
+ #endif // wxUSE_PROGRESSDLG
+
+ #if wxUSE_BUSYINFO
+ info_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B"));
+ #endif // wxUSE_BUSYINFO
+
+ #if wxUSE_LOG_DIALOG
+ info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L"));
+ #endif // wxUSE_LOG_DIALOG
+
+ file_menu->Append(wxID_ANY,_T("Informative dialogs"),info_menu);
+
+ #endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG
+
+
+ #if wxUSE_FINDREPLDLG
+ wxMenu *find_menu = new wxMenu;
+ find_menu->AppendCheckItem(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"));
+ find_menu->AppendCheckItem(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"));
+ file_menu->Append(wxID_ANY,_T("Searching"),find_menu);
+ #endif // wxUSE_FINDREPLDLG
+
+ #if USE_MODAL_PRESENTATION
+ wxMenu *modal_menu = new wxMenu;
+ modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
+ modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"));
+ file_menu->Append(wxID_ANY,_T("Modal/Modeless"),modal_menu);
+ #endif // USE_MODAL_PRESENTATION
+
+ file_menu->AppendSeparator();
+ file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X"));
+
+ wxMenuBar *menu_bar = new wxMenuBar;
+ menu_bar->Append(file_menu, _T("&File"));
+ frame->SetMenuBar(menu_bar);
+
+ myCanvas = new MyCanvas(frame);
+ myCanvas->SetBackgroundColour(*wxWHITE);
+
+ frame->Centre(wxBOTH);
+
+ // Show the frame
+ frame->Show(true);
+
+ SetTopWindow(frame);
+
+ return true;
}
// My frame constructor
MyFrame::MyFrame(wxWindow *parent,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size)
- : wxFrame(parent, -1, title, pos, size)
+ const wxString& title)
+ : wxFrame(parent, wxID_ANY, title)
{
+#if USE_MODAL_PRESENTATION
m_dialog = (MyModelessDialog *)NULL;
+#endif // USE_MODAL_PRESENTATION
#if wxUSE_FINDREPLDLG
m_dlgFind =
m_dlgReplace = NULL;
#endif
-
+
+#if wxUSE_COLOURDLG
+ m_clrData.SetChooseFull(true);
+ for (int i = 0; i < 16; i++)
+ {
+ m_clrData.SetCustomColour(i, wxColour(i*16, i*16, i*16));
+ }
+#endif // wxUSE_COLOURDLG
+
+#if wxUSE_STATUSBAR
CreateStatusBar();
+#endif // wxUSE_STATUSBAR
}
+#if wxUSE_COLOURDLG
void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
{
- wxColour col = myCanvas->GetBackgroundColour();
-
- wxColourData data;
- data.SetColour(col);
- data.SetChooseFull(TRUE);
- for (int i = 0; i < 16; i++)
- {
- wxColour colour(i*16, i*16, i*16);
- data.SetCustomColour(i, colour);
- }
+ m_clrData.SetColour(myCanvas->GetBackgroundColour());
- wxColourDialog dialog(this, &data);
- dialog.SetTitle("Choose the background colour");
+ wxColourDialog dialog(this, &m_clrData);
+ dialog.SetTitle(_T("Choose the background colour"));
if (dialog.ShowModal() == wxID_OK)
{
- wxColourData retData = dialog.GetColourData();
- col = retData.GetColour();
- myCanvas->SetBackgroundColour(col);
- myCanvas->Clear();
+ m_clrData = dialog.GetColourData();
+ myCanvas->SetBackgroundColour(m_clrData.GetColour());
+ myCanvas->ClearBackground();
myCanvas->Refresh();
}
}
+#endif // wxUSE_COLOURDLG
+#if wxUSE_FONTDLG
void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
{
- wxFontData data;
- data.SetInitialFont(wxGetApp().m_canvasFont);
- data.SetColour(wxGetApp().m_canvasTextColour);
+ wxFontData data;
+ data.SetInitialFont(wxGetApp().m_canvasFont);
+ data.SetColour(wxGetApp().m_canvasTextColour);
- wxFontDialog *dialog = new wxFontDialog(this, &data);
- if (dialog->ShowModal() == wxID_OK)
- {
- wxFontData retData = dialog->GetFontData();
+ // you might also do this:
+ //
+ // wxFontDialog dialog;
+ // if ( !dialog.Create(this, data) { ... error ... }
+ //
+ wxFontDialog dialog(this, data);
+
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ wxFontData retData = dialog.GetFontData();
wxGetApp().m_canvasFont = retData.GetChosenFont();
wxGetApp().m_canvasTextColour = retData.GetColour();
myCanvas->Refresh();
- }
- dialog->Destroy();
+ }
+ //else: cancelled by the user, don't change the font
}
+#endif // wxUSE_FONTDLG
-#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
+#if USE_COLOURDLG_GENERIC
void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
{
- wxColourData data;
- data.SetChooseFull(TRUE);
- for (int i = 0; i < 16; i++)
- {
+ wxColourData data;
+ data.SetChooseFull(true);
+ for (int i = 0; i < 16; i++)
+ {
wxColour colour(i*16, i*16, i*16);
data.SetCustomColour(i, colour);
- }
+ }
- wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &data);
- if (dialog->ShowModal() == wxID_OK)
- {
+ wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &data);
+ if (dialog->ShowModal() == wxID_OK)
+ {
wxColourData retData = dialog->GetColourData();
wxColour col = retData.GetColour();
// wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID);
myCanvas->SetBackgroundColour(col);
- myCanvas->Clear();
+ myCanvas->ClearBackground();
myCanvas->Refresh();
- }
- dialog->Destroy();
+ }
+ dialog->Destroy();
}
+#endif // USE_COLOURDLG_GENERIC
+#if USE_FONTDLG_GENERIC
void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
{
- wxFontData data;
- data.SetInitialFont(wxGetApp().m_canvasFont);
- data.SetColour(wxGetApp().m_canvasTextColour);
+ wxFontData data;
+ data.SetInitialFont(wxGetApp().m_canvasFont);
+ data.SetColour(wxGetApp().m_canvasTextColour);
- wxGenericFontDialog *dialog = new wxGenericFontDialog(this, &data);
- if (dialog->ShowModal() == wxID_OK)
- {
+ wxGenericFontDialog *dialog = new wxGenericFontDialog(this, &data);
+ if (dialog->ShowModal() == wxID_OK)
+ {
wxFontData retData = dialog->GetFontData();
wxGetApp().m_canvasFont = retData.GetChosenFont();
wxGetApp().m_canvasTextColour = retData.GetColour();
myCanvas->Refresh();
- }
- dialog->Destroy();
+ }
+ dialog->Destroy();
}
-#endif // wxTEST_GENERIC_DIALOGS_IN_MSW
+#endif // USE_FONTDLG_GENERIC
-void MyFrame::LogDialog(wxCommandEvent& event)
+#if wxUSE_LOG_DIALOG
+void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
{
// calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages
// being flushed -- test it
wxLogMessage(wxT("And this is the same dialog but with only one message."));
}
+#endif // wxUSE_LOG_DIALOG
void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
{
- wxMessageDialog dialog( NULL, "This is a message box\nA long, long string to test out the message box properly",
- "Message box text", wxYES_NO|wxCANCEL|wxICON_INFORMATION);
+ wxMessageDialog dialog( NULL, _T("This is a message box\nA long, long string to test out the message box properly"),
+ _T("Message box text"), wxNO_DEFAULT|wxYES_NO|wxCANCEL|wxICON_INFORMATION);
- dialog.ShowModal();
+ switch ( dialog.ShowModal() )
+ {
+ case wxID_YES:
+ wxLogStatus(wxT("You pressed \"Yes\""));
+ break;
+
+ case wxID_NO:
+ wxLogStatus(wxT("You pressed \"No\""));
+ break;
+
+ case wxID_CANCEL:
+ wxLogStatus(wxT("You pressed \"Cancel\""));
+ break;
+
+ default:
+ wxLogError(wxT("Unexpected wxMessageDialog return code!"));
+ }
}
+#if wxUSE_NUMBERDLG
void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) )
{
- long res = wxGetNumberFromUser( "This is some text, actually a lot of text.\n"
- "Even two rows of text.",
- "Enter a number:", "Numeric input test",
+ long res = wxGetNumberFromUser( _T("This is some text, actually a lot of text.\n")
+ _T("Even two rows of text."),
+ _T("Enter a number:"), _T("Numeric input test"),
50, 0, 100, this );
wxString msg;
int icon;
if ( res == -1 )
{
- msg = "Invalid number entered or dialog cancelled.";
+ msg = _T("Invalid number entered or dialog cancelled.");
icon = wxICON_HAND;
}
else
icon = wxICON_INFORMATION;
}
- wxMessageBox(msg, "Numeric test result", wxOK | icon, this);
+ wxMessageBox(msg, _T("Numeric test result"), wxOK | icon, this);
}
+#endif // wxUSE_NUMBERDLG
+#if wxUSE_TEXTDLG
void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
{
- wxString pwd = wxGetPasswordFromUser("Enter password:",
- "Password entry dialog",
- "",
+ wxString pwd = wxGetPasswordFromUser(_T("Enter password:"),
+ _T("Password entry dialog"),
+ wxEmptyString,
this);
if ( !!pwd )
{
wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()),
- "Got password", wxOK | wxICON_INFORMATION, this);
+ _T("Got password"), wxOK | wxICON_INFORMATION, this);
}
}
void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
{
- wxTextEntryDialog dialog(this,
- "This is a small sample\n"
- "A long, long string to test out the text entrybox",
- "Please enter a string",
- "Default value",
- wxOK | wxCANCEL);
+ wxTextEntryDialog dialog(this,
+ _T("This is a small sample\n")
+ _T("A long, long string to test out the text entrybox"),
+ _T("Please enter a string"),
+ _T("Default value"),
+ wxOK | wxCANCEL);
- if (dialog.ShowModal() == wxID_OK)
- {
- wxMessageDialog dialog2(this, dialog.GetValue(), "Got string");
- dialog2.ShowModal();
- }
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ wxMessageBox(dialog.GetValue(), _T("Got string"), wxOK | wxICON_INFORMATION, this);
+ }
}
+#endif // wxUSE_TEXTDLG
+#if wxUSE_CHOICEDLG
void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
{
- const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ;
+ const wxString choices[] = { _T("One"), _T("Two"), _T("Three"), _T("Four"), _T("Five") } ;
wxSingleChoiceDialog dialog(this,
- "This is a small sample\n"
- "A single-choice convenience dialog",
- "Please select a value",
+ _T("This is a small sample\n")
+ _T("A single-choice convenience dialog"),
+ _T("Please select a value"),
WXSIZEOF(choices), choices);
dialog.SetSelection(2);
if (dialog.ShowModal() == wxID_OK)
{
- wxMessageDialog dialog2(this, dialog.GetStringSelection(), "Got string");
+ wxMessageDialog dialog2(this, dialog.GetStringSelection(), _T("Got string"));
dialog2.ShowModal();
}
}
{
const wxString choices[] =
{
- "One", "Two", "Three", "Four", "Five",
- "Six", "Seven", "Eight", "Nine", "Ten",
- "Eleven", "Twelve", "Seventeen",
+ _T("One"), _T("Two"), _T("Three"), _T("Four"), _T("Five"),
+ _T("Six"), _T("Seven"), _T("Eight"), _T("Nine"), _T("Ten"),
+ _T("Eleven"), _T("Twelve"), _T("Seventeen"),
};
wxArrayInt selections;
size_t count = wxGetMultipleChoices(selections,
- "This is a small sample\n"
- "A multi-choice convenience dialog",
- "Please select a value",
+ _T("This is a small sample\n")
+ _T("A multi-choice convenience dialog"),
+ _T("Please select a value"),
WXSIZEOF(choices), choices,
this);
if ( count )
{
wxString msg;
- msg.Printf(wxT("You selected %u items:\n"), count);
+ msg.Printf(wxT("You selected %u items:\n"), (unsigned)count);
for ( size_t n = 0; n < count; n++ )
{
- msg += wxString::Format(wxT("\t%u: %u (%s)\n"), n, selections[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
}
+#endif // wxUSE_CHOICEDLG
+#if wxUSE_FILEDLG
void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
{
wxFileDialog dialog
(
this,
_T("Testing open file dialog"),
- _T(""),
- _T(""),
- _T("C++ files (*.h;*.cpp)|*.h;*.cpp")
+ wxEmptyString,
+ wxEmptyString,
+#ifdef __WXMOTIF__
+ _T("C++ files (*.cpp)|*.cpp")
+#else
+ _T("C++ files (*.cpp;*.h)|*.cpp;*.h")
+#endif
);
+ dialog.SetDirectory(wxGetHomeDir());
+
if (dialog.ShowModal() == wxID_OK)
{
wxString info;
dialog.GetPath().c_str(),
dialog.GetDirectory().c_str(),
dialog.GetFilename().c_str());
- wxMessageDialog dialog2(this, info, "Selected file");
+ wxMessageDialog dialog2(this, info, _T("Selected file"));
dialog2.ShowModal();
}
}
static wxString s_extDef;
wxString path = wxFileSelector(
_T("Select the file to load"),
- _T(""), _T(""),
+ wxEmptyString, wxEmptyString,
s_extDef,
_T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (*.*)|*.*"),
wxCHANGE_DIR,
void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
{
- wxFileDialog dialog(this, "Testing open multiple file dialog",
- "", "", wxFileSelectorDefaultWildcardStr,
+ wxString wildcards =
+#ifdef __WXMOTIF__
+ _T("C++ files (*.cpp)|*.cpp");
+#else
+ _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
+#endif
+ wxFileDialog dialog(this, _T("Testing open multiple file dialog"),
+ wxEmptyString, wxEmptyString, wildcards,
wxMULTIPLE);
if (dialog.ShowModal() == wxID_OK)
for ( size_t n = 0; n < count; n++ )
{
s.Printf(_T("File %d: %s (%s)\n"),
- n, paths[n].c_str(), filenames[n].c_str());
+ (int)n, paths[n].c_str(), filenames[n].c_str());
msg += s;
}
+ s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex());
+ msg += s;
- wxMessageDialog dialog2(this, msg, "Selected files");
+ wxMessageDialog dialog2(this, msg, _T("Selected files"));
dialog2.ShowModal();
}
}
void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
{
- wxFileDialog dialog(this, "Testing save file dialog", "", "myletter.txt",
- "Text files (*.txt)|*.txt|Document files (*.doc)|*.doc",
- wxSAVE|wxOVERWRITE_PROMPT);
+ wxFileDialog dialog(this,
+ _T("Testing save file dialog"),
+ wxEmptyString,
+ _T("myletter.doc"),
+ _T("Text files (*.txt)|*.txt|Document files (*.doc)|*.doc"),
+ wxSAVE|wxOVERWRITE_PROMPT);
+
+ dialog.SetFilterIndex(1);
+
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ wxLogMessage(_T("%s, filter %d"),
+ dialog.GetPath().c_str(), dialog.GetFilterIndex());
+ }
+}
+#endif // wxUSE_FILEDLG
+
+#if USE_FILEDLG_GENERIC
+void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
+{
+ wxGenericFileDialog dialog
+ (
+ this,
+ _T("Testing open file dialog"),
+ wxEmptyString,
+ wxEmptyString,
+ _T("C++ files (*.cpp;*.h)|*.cpp;*.h")
+ );
+
+ dialog.SetDirectory(wxGetHomeDir());
if (dialog.ShowModal() == wxID_OK)
{
- wxChar buf[400];
- wxSprintf(buf, _T("%s, filter %d"), (const wxChar*)dialog.GetPath(), dialog.GetFilterIndex());
- wxMessageDialog dialog2(this, wxString(buf), "Selected path");
+ wxString info;
+ info.Printf(_T("Full file name: %s\n")
+ _T("Path: %s\n")
+ _T("Name: %s"),
+ dialog.GetPath().c_str(),
+ dialog.GetDirectory().c_str(),
+ dialog.GetFilename().c_str());
+ wxMessageDialog dialog2(this, info, _T("Selected file"));
dialog2.ShowModal();
}
}
-void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
+{
+ wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
+ wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"),
+ wxEmptyString, wxEmptyString, wildcards,
+ wxMULTIPLE);
+
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ wxArrayString paths, filenames;
+
+ dialog.GetPaths(paths);
+ dialog.GetFilenames(filenames);
+
+ wxString msg, s;
+ size_t count = paths.GetCount();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ s.Printf(_T("File %d: %s (%s)\n"),
+ (int)n, paths[n].c_str(), filenames[n].c_str());
+
+ msg += s;
+ }
+ s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex());
+ msg += s;
+
+ wxMessageDialog dialog2(this, msg, _T("Selected files"));
+ dialog2.ShowModal();
+ }
+}
+
+void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) )
+{
+ wxGenericFileDialog dialog(this,
+ _T("Testing save file dialog"),
+ wxEmptyString,
+ _T("myletter.doc"),
+ _T("Text files (*.txt)|*.txt|Document files (*.doc)|*.doc"),
+ wxSAVE|wxOVERWRITE_PROMPT);
+
+ dialog.SetFilterIndex(1);
+
+ if (dialog.ShowModal() == wxID_OK)
+ {
+ wxLogMessage(_T("%s, filter %d"),
+ dialog.GetPath().c_str(), dialog.GetFilterIndex());
+ }
+}
+#endif // USE_FILEDLG_GENERIC
+
+#if wxUSE_DIRDLG
+void MyFrame::DoDirChoose(int style)
{
// pass some initial dir to wxDirDialog
wxString dirHome;
wxGetHomeDir(&dirHome);
- wxDirDialog dialog(this, "Testing directory picker", dirHome);
+ wxDirDialog dialog(this, _T("Testing directory picker"), dirHome, style);
if (dialog.ShowModal() == wxID_OK)
{
- wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
- dialog2.ShowModal();
+ wxLogMessage(_T("Selected path: %s"), dialog.GetPath().c_str());
}
}
+void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
+{
+ DoDirChoose(wxDD_DEFAULT_STYLE & ~wxDD_NEW_DIR_BUTTON);
+}
+
+void MyFrame::DirChooseNew(wxCommandEvent& WXUNUSED(event) )
+{
+ DoDirChoose(wxDD_DEFAULT_STYLE | wxDD_NEW_DIR_BUTTON);
+}
+#endif // wxUSE_DIRDLG
+
+#if USE_DIRDLG_GENERIC
void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
{
-#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
// pass some initial dir to wxDirDialog
wxString dirHome;
wxGetHomeDir(&dirHome);
- wxGenericDirDialog dialog(this, "Testing generic directory picker", dirHome);
+ wxGenericDirDialog dialog(this, _T("Testing generic directory picker"), dirHome);
if (dialog.ShowModal() == wxID_OK)
{
- wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
+ wxMessageDialog dialog2(this, dialog.GetPath(), _T("Selected path"));
dialog2.ShowModal();
}
-#else
- wxLogError(wxT("Sorry, generic dir dialog not available:\n")
- wxT("set wxUSE_DIRDLGG to 1 and recompile"));
-#endif
}
+#endif // USE_DIRDLG_GENERIC
+#if USE_MODAL_PRESENTATION
void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event))
{
MyModalDialog dlg(this);
m_dialog = new MyModelessDialog(this);
}
- m_dialog->Show(TRUE);
+ m_dialog->Show(true);
}
else // hide
{
m_dialog->Hide();
}
}
+#endif // USE_MODAL_PRESENTATION
-void MyFrame::ShowTip(wxCommandEvent& event)
-{
#if wxUSE_STARTUP_TIPS
+void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event))
+{
static size_t s_index = (size_t)-1;
if ( s_index == (size_t)-1 )
s_index = rand() % 5;
}
- wxTipProvider *tipProvider = wxCreateFileTipProvider("tips.txt", s_index);
+ wxTipProvider *tipProvider = wxCreateFileTipProvider(_T("tips.txt"), s_index);
bool showAtStartup = wxShowTip(this, tipProvider);
if ( showAtStartup )
{
- wxMessageBox("Will show tips on startup", "Tips dialog",
+ wxMessageBox(_T("Will show tips on startup"), _T("Tips dialog"),
wxOK | wxICON_INFORMATION, this);
}
s_index = tipProvider->GetCurrentTip();
delete tipProvider;
-#endif
}
+#endif // wxUSE_STARTUP_TIPS
void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )
{
- Close(TRUE);
+ Close(true);
}
#if wxUSE_PROGRESSDLG
{
static const int max = 10;
- wxProgressDialog dialog("Progress dialog example",
- "An informative message",
+ wxProgressDialog dialog(_T("Progress dialog example"),
+ _T("An informative message"),
max, // range
this, // parent
wxPD_CAN_ABORT |
wxPD_APP_MODAL |
+ // wxPD_AUTO_HIDE | -- try this as well
wxPD_ELAPSED_TIME |
wxPD_ESTIMATED_TIME |
wxPD_REMAINING_TIME);
- bool cont = TRUE;
- for ( int i = 0; i <= max && cont; i++ )
+ bool cont = true;
+ for ( int i = 0; i <= max; i++ )
{
wxSleep(1);
if ( i == max )
{
- cont = dialog.Update(i, "That's all, folks!");
+ cont = dialog.Update(i, _T("That's all, folks!"));
}
else if ( i == max / 2 )
{
- cont = dialog.Update(i, "Only a half left (very long message)!");
+ cont = dialog.Update(i, _T("Only a half left (very long message)!"));
}
else
{
cont = dialog.Update(i);
}
+
+ if ( !cont )
+ {
+ if ( wxMessageBox(_T("Do you really want to cancel?"),
+ _T("Progress dialog question"), // caption
+ wxYES_NO | wxICON_QUESTION) == wxYES )
+ break;
+
+ dialog.Resume();
+ }
}
if ( !cont )
{
wxWindowDisabler disableAll;
- wxBusyInfo info("Sleep^H^H^H^H^HWorkiing, please wait...", this);
+ wxBusyInfo info(_T("Working, please wait..."), this);
- for ( int i = 0; i < 30; i++ )
+ for ( int i = 0; i < 18; i++ )
{
- wxUsleep(100);
+ //wxUsleep(100);
wxTheApp->Yield();
}
+
+ wxSleep(2);
+ //wxWakeUpIdle();
}
#endif // wxUSE_BUSYINFO
(
this,
&m_findData,
- "Find and replace dialog",
+ _T("Find and replace dialog"),
wxFR_REPLACEDIALOG
);
- m_dlgReplace->Show(TRUE);
+ m_dlgReplace->Show(true);
}
}
(
this,
&m_findData,
- "Find dialog",
+ _T("Find dialog"),
// just for testing
wxFR_NOWHOLEWORD
);
- m_dlgFind->Show(TRUE);
+ m_dlgFind->Show(true);
}
}
static wxString DecodeFindDialogEventFlags(int flags)
{
wxString str;
- str << (flags & wxFR_DOWN ? "down" : "up") << ", "
- << (flags & wxFR_WHOLEWORD ? "whole words only, " : "")
- << (flags & wxFR_MATCHCASE ? "" : "not ")
- << "case sensitive";
+ str << (flags & wxFR_DOWN ? _T("down") : _T("up")) << _T(", ")
+ << (flags & wxFR_WHOLEWORD ? _T("whole words only, ") : _T(""))
+ << (flags & wxFR_MATCHCASE ? _T("") : _T("not "))
+ << _T("case sensitive");
return str;
}
if ( type == wxEVT_COMMAND_FIND || type == wxEVT_COMMAND_FIND_NEXT )
{
wxLogMessage(wxT("Find %s'%s' (flags: %s)"),
- type == wxEVT_COMMAND_FIND_NEXT ? "next " : "",
+ type == wxEVT_COMMAND_FIND_NEXT ? wxT("next ") : wxT(""),
event.GetFindString().c_str(),
DecodeFindDialogEventFlags(event.GetFlags()).c_str());
}
type == wxEVT_COMMAND_FIND_REPLACE_ALL )
{
wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"),
- type == wxEVT_COMMAND_FIND_REPLACE_ALL ? "all " : "",
+ type == wxEVT_COMMAND_FIND_REPLACE_ALL ? _T("all ") : wxT(""),
event.GetFindString().c_str(),
event.GetReplaceString().c_str(),
DecodeFindDialogEventFlags(event.GetFlags()).c_str());
{
wxFindReplaceDialog *dlg = event.GetDialog();
+ int idMenu;
const wxChar *txt;
if ( dlg == m_dlgFind )
{
txt = _T("Find");
+ idMenu = DIALOGS_FIND;
m_dlgFind = NULL;
}
else if ( dlg == m_dlgReplace )
{
txt = _T("Replace");
+ idMenu = DIALOGS_REPLACE;
m_dlgReplace = NULL;
}
else
{
txt = _T("Unknown");
+ idMenu = wxID_ANY;
- wxFAIL_MSG( _T("unexecpted event") );
+ wxFAIL_MSG( _T("unexpected event") );
}
- wxLogMessage(wxT("%s dialog is being closed."), txt),
+ wxLogMessage(wxT("%s dialog is being closed."), txt);
+
+ if ( idMenu != wxID_ANY )
+ {
+ GetMenuBar()->Check(idMenu, false);
+ }
dlg->Destroy();
}
dc.SetFont(wxGetApp().m_canvasFont);
dc.SetTextForeground(wxGetApp().m_canvasTextColour);
dc.SetBackgroundMode(wxTRANSPARENT);
- dc.DrawText("wxWindows common dialogs test application", 10, 10);
+ dc.DrawText(
+ _T("wxWidgets common dialogs")
+#if !defined(__SMARTPHONE__)
+ _T(" test application")
+#endif
+ , 10, 10);
}
+#if USE_MODAL_PRESENTATION
+
// ----------------------------------------------------------------------------
// MyModelessDialog
// ----------------------------------------------------------------------------
MyModelessDialog::MyModelessDialog(wxWindow *parent)
- : wxDialog(parent, -1, wxString("Modeless dialog"))
+ : wxDialog(parent, wxID_ANY, wxString(_T("Modeless dialog")))
{
wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
- wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, "Press me");
- wxCheckBox *check = new wxCheckBox(this, -1, "Should be disabled");
+ wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, _T("Press me"));
+ wxCheckBox *check = new wxCheckBox(this, wxID_ANY, _T("Should be disabled"));
check->Disable();
sizerTop->Add(btn, 1, wxEXPAND | wxALL, 5);
sizerTop->Add(check, 1, wxEXPAND | wxALL, 5);
- SetAutoLayout(TRUE);
SetSizer(sizerTop);
sizerTop->SetSizeHints(this);
void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event))
{
- wxMessageBox("Button pressed in modeless dialog", "Info",
+ wxMessageBox(_T("Button pressed in modeless dialog"), _T("Info"),
wxOK | wxICON_INFORMATION, this);
}
{
if ( event.CanVeto() )
{
- wxMessageBox("Use the menu item to close this dialog",
- "Modeless dialog",
+ wxMessageBox(_T("Use the menu item to close this dialog"),
+ _T("Modeless dialog"),
wxOK | wxICON_INFORMATION, this);
event.Veto();
// ----------------------------------------------------------------------------
MyModalDialog::MyModalDialog(wxWindow *parent)
- : wxDialog(parent, -1, wxString("Modal dialog"))
+ : wxDialog(parent, wxID_ANY, wxString(_T("Modal dialog")))
{
wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
- m_btnFocused = new wxButton(this, -1, "Default button");
- m_btnDelete = new wxButton(this, -1, "&Delete button");
- sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5);
+ m_btnModal = new wxButton(this, wxID_ANY, _T("&Modal dialog..."));
+ 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);
- SetAutoLayout(TRUE);
SetSizer(sizerTop);
sizerTop->SetSizeHints(this);
sizerTop->Fit(this);
- m_btnFocused->SetFocus();
- m_btnFocused->SetDefault();
+ m_btnModal->SetFocus();
+ m_btnModal->SetDefault();
}
void MyModalDialog::OnButton(wxCommandEvent& event)
{
if ( event.GetEventObject() == m_btnDelete )
{
- delete m_btnFocused;
- m_btnFocused = NULL;
+ delete m_btnModal;
+ m_btnModal = NULL;
m_btnDelete->Disable();
}
- else if ( event.GetEventObject() == m_btnFocused )
+ else if ( event.GetEventObject() == m_btnModal )
+ {
+#if wxUSE_TEXTDLG
+ wxGetTextFromUser(_T("Dummy prompt"),
+ _T("Modal dialog called from dialog"),
+ wxEmptyString, this);
+#else
+ wxMessageBox(_T("Modal dialog called from dialog"));
+#endif // wxUSE_TEXTDLG
+ }
+ else if ( event.GetEventObject() == m_btnModeless )
{
- wxGetTextFromUser("Dummy prompt", "Modal dialog called from dialog",
- "", this);
+ (new MyModelessDialog(this))->Show();
}
else
{
event.Skip();
}
}
+
+#endif // USE_MODAL_PRESENTATION
+
projects / wxWidgets.git / blobdiff