removing old xcode files

[wxWidgets.git] / samples / dialogs / dialogs.cpp

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index d9cd57f0795ee558f8d4bdce031612d3ae185408..1c020573f544381590927e8bea5c7178b383e7ee 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -1,12 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialogs.cpp
 // Purpose:     Common dialogs demo
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialogs.cpp
 // Purpose:     Common dialogs demo

-// Author:      Julian Smart
-// Modified by: ABX (2004) - adjustements for conditional building + new menu
+// Author:      Julian Smart, Vadim Zeitlin, ABX

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+//              (c) 2004 ABX
+//              (c) Vadim Zeitlin
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -32,6 +33,10 @@
 #include "wx/sysopt.h"
 #include "wx/notifmsg.h"
 
 #include "wx/sysopt.h"
 #include "wx/notifmsg.h"
 

+#if wxUSE_RICHMSGDLG
+    #include "wx/richmsgdlg.h"
+#endif // wxUSE_RICHMSGDLG
+

 #if wxUSE_COLOURDLG
     #include "wx/colordlg.h"
 #endif // wxUSE_COLOURDLG
 #if wxUSE_COLOURDLG
     #include "wx/colordlg.h"
 #endif // wxUSE_COLOURDLG


@@ -86,6 +91,10 @@
     #include "wx/fdrepdlg.h"
 #endif // wxUSE_FINDREPLDLG
 
     #include "wx/fdrepdlg.h"
 #endif // wxUSE_FINDREPLDLG
 

+#if wxUSE_INFOBAR
+    #include "wx/infobar.h"
+#endif // wxUSE_INFOBAR
+

 #include "wx/spinctrl.h"
 #include "wx/propdlg.h"
 
 #include "wx/spinctrl.h"
 #include "wx/propdlg.h"
 


@@ -118,9 +127,13 @@ END_EVENT_TABLE()
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if wxUSE_MSGDLG
     EVT_MENU(DIALOGS_MESSAGE_BOX,                   MyFrame::MessageBox)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if wxUSE_MSGDLG
     EVT_MENU(DIALOGS_MESSAGE_BOX,                   MyFrame::MessageBox)

+    EVT_MENU(DIALOGS_MESSAGE_BOX_WINDOW_MODAL,      MyFrame::MessageBoxWindowModal)

     EVT_MENU(DIALOGS_MESSAGE_DIALOG,                MyFrame::MessageBoxDialog)
     EVT_MENU(DIALOGS_MESSAGE_BOX_WXINFO,            MyFrame::MessageBoxInfo)
 #endif // wxUSE_MSGDLG
     EVT_MENU(DIALOGS_MESSAGE_DIALOG,                MyFrame::MessageBoxDialog)
     EVT_MENU(DIALOGS_MESSAGE_BOX_WXINFO,            MyFrame::MessageBoxInfo)
 #endif // wxUSE_MSGDLG

+#if wxUSE_RICHMSGDLG
+    EVT_MENU(DIALOGS_RICH_MESSAGE_DIALOG,           MyFrame::RichMessageDialog)
+#endif // wxUSE_RICHMSGDLG

 #if wxUSE_COLOURDLG
     EVT_MENU(DIALOGS_CHOOSE_COLOUR,                 MyFrame::ChooseColour)
     EVT_MENU(DIALOGS_GET_COLOUR,                    MyFrame::GetColour)
 #if wxUSE_COLOURDLG
     EVT_MENU(DIALOGS_CHOOSE_COLOUR,                 MyFrame::ChooseColour)
     EVT_MENU(DIALOGS_GET_COLOUR,                    MyFrame::GetColour)


@@ -133,8 +146,13 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #if wxUSE_LOG_DIALOG
     EVT_MENU(DIALOGS_LOG_DIALOG,                    MyFrame::LogDialog)
 #endif // wxUSE_LOG_DIALOG
 #if wxUSE_LOG_DIALOG
     EVT_MENU(DIALOGS_LOG_DIALOG,                    MyFrame::LogDialog)
 #endif // wxUSE_LOG_DIALOG

+#if wxUSE_INFOBAR
+    EVT_MENU(DIALOGS_INFOBAR_SIMPLE,                MyFrame::InfoBarSimple)
+    EVT_MENU(DIALOGS_INFOBAR_ADVANCED,              MyFrame::InfoBarAdvanced)
+#endif // wxUSE_INFOBAR

 
 #if wxUSE_TEXTDLG
 
 #if wxUSE_TEXTDLG

+    EVT_MENU(DIALOGS_LINE_ENTRY,                    MyFrame::LineEntry)

     EVT_MENU(DIALOGS_TEXT_ENTRY,                    MyFrame::TextEntry)
     EVT_MENU(DIALOGS_PASSWORD_ENTRY,                MyFrame::PasswordEntry)
 #endif // wxUSE_TEXTDLG
     EVT_MENU(DIALOGS_TEXT_ENTRY,                    MyFrame::TextEntry)
     EVT_MENU(DIALOGS_PASSWORD_ENTRY,                MyFrame::PasswordEntry)
 #endif // wxUSE_TEXTDLG


@@ -260,7 +278,32 @@ BEGIN_EVENT_TABLE(StdButtonSizerDialog, wxDialog)
     EVT_RADIOBUTTON(wxID_ANY, StdButtonSizerDialog::OnEvent)
 END_EVENT_TABLE()
 
     EVT_RADIOBUTTON(wxID_ANY, StdButtonSizerDialog::OnEvent)
 END_EVENT_TABLE()
 

-MyCanvas *myCanvas = (MyCanvas *) NULL;
+#if wxUSE_CMDLINE_PARSER
+
+#include "wx/cmdline.h"
+
+static const char *PROGRESS_SWITCH = "progress";
+
+void MyApp::OnInitCmdLine(wxCmdLineParser& parser)
+{
+    wxApp::OnInitCmdLine(parser);
+
+    parser.AddOption("", PROGRESS_SWITCH,
+                     "Style for the startup progress dialog (wxPD_XXX)",
+                     wxCMD_LINE_VAL_NUMBER);
+}
+
+bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser)
+{
+    if ( !wxApp::OnCmdLineParsed(parser) )
+        return false;
+
+    parser.Found(PROGRESS_SWITCH, &m_startupProgressStyle);
+
+    return true;
+}
+
+#endif // wxUSE_CMDLINE_PARSER

 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()


@@ -268,21 +311,46 @@ bool MyApp::OnInit()
     if ( !wxApp::OnInit() )
         return false;
 
     if ( !wxApp::OnInit() )
         return false;
 

+#if wxUSE_PROGRESSDLG
+    if ( m_startupProgressStyle != -1 )
+    {
+        // Show a test progress dialog before the main event loop is started:
+        // it should still work.
+        const int PROGRESS_COUNT = 100;
+        wxProgressDialog dlg
+                         (
+                            "Progress in progress",
+                            "Please wait, starting...",
+                            PROGRESS_COUNT,
+                            NULL,
+                            m_startupProgressStyle
+                         );
+        for ( int i = 0; i <= PROGRESS_COUNT; i++ )
+        {
+            if ( !dlg.Update(i) )
+                break;
+
+            wxMilliSleep(50);
+        }
+    }
+#endif // wxUSE_PROGRESSDLG
+

 #if wxUSE_IMAGE
     wxInitAllImageHandlers();
 #endif
 
 #if wxUSE_IMAGE
     wxInitAllImageHandlers();
 #endif
 

-    m_canvasTextColour = *wxBLACK;
-    m_canvasFont = *wxNORMAL_FONT;
-

     // Create the main frame window
     // Create the main frame window

-    MyFrame *frame = new MyFrame((wxFrame *) NULL, _T("wxWidgets dialogs example"));
+    MyFrame *frame = new MyFrame(wxT("wxWidgets dialogs example"));

 
     // Make a menubar
     wxMenu *menuDlg = new wxMenu;
 
 
     // Make a menubar
     wxMenu *menuDlg = new wxMenu;
 

-    menuDlg->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M"));
-    menuDlg->Append(DIALOGS_MESSAGE_DIALOG, _T("Message dialog\tShift-Ctrl-M"));
+    menuDlg->Append(DIALOGS_MESSAGE_BOX, wxT("&Message box\tCtrl-M"));
+    menuDlg->Append(DIALOGS_MESSAGE_BOX_WINDOW_MODAL, wxT("Window-Modal Message box "));
+    menuDlg->Append(DIALOGS_MESSAGE_DIALOG, wxT("Message dialog\tShift-Ctrl-M"));
+#if wxUSE_RICHMSGDLG
+    menuDlg->Append(DIALOGS_RICH_MESSAGE_DIALOG, wxT("Rich message dialog"));
+#endif // wxUSE_RICHMSGDLG

 
 
 #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
 
 
 #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG


@@ -290,21 +358,21 @@ bool MyApp::OnInit()
     wxMenu *choices_menu = new wxMenu;
 
     #if wxUSE_COLOURDLG
     wxMenu *choices_menu = new wxMenu;
 
     #if wxUSE_COLOURDLG

-        choices_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose bg colour"));
-        choices_menu->Append(DIALOGS_GET_COLOUR, _T("&Choose fg colour"));
+        choices_menu->Append(DIALOGS_CHOOSE_COLOUR, wxT("&Choose bg colour"));
+        choices_menu->Append(DIALOGS_GET_COLOUR, wxT("&Choose fg colour"));

     #endif // wxUSE_COLOURDLG
 
     #if wxUSE_FONTDLG
     #endif // wxUSE_COLOURDLG
 
     #if wxUSE_FONTDLG

-        choices_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font"));
+        choices_menu->Append(DIALOGS_CHOOSE_FONT, wxT("Choose &font"));

     #endif // wxUSE_FONTDLG
 
     #if wxUSE_CHOICEDLG
     #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"));
+        choices_menu->Append(DIALOGS_SINGLE_CHOICE,  wxT("&Single choice\tCtrl-C"));
+        choices_menu->Append(DIALOGS_MULTI_CHOICE,  wxT("M&ultiple choice\tCtrl-U"));

     #endif // wxUSE_CHOICEDLG
 
     #if wxUSE_REARRANGECTRL
     #endif // wxUSE_CHOICEDLG
 
     #if wxUSE_REARRANGECTRL

-        choices_menu->Append(DIALOGS_REARRANGE,  _T("&Rearrange dialog\tCtrl-R"));
+        choices_menu->Append(DIALOGS_REARRANGE,  wxT("&Rearrange dialog\tCtrl-R"));

     #endif // wxUSE_REARRANGECTRL
 
     #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
     #endif // wxUSE_REARRANGECTRL
 
     #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC


@@ -312,14 +380,14 @@ bool MyApp::OnInit()
     #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
 
     #if USE_COLOURDLG_GENERIC
     #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC
 
     #if USE_COLOURDLG_GENERIC

-        choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("&Choose colour (generic)"));
+        choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, wxT("&Choose colour (generic)"));

     #endif // USE_COLOURDLG_GENERIC
 
     #if USE_FONTDLG_GENERIC
     #endif // USE_COLOURDLG_GENERIC
 
     #if USE_FONTDLG_GENERIC

-        choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)"));
+        choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, wxT("Choose &font (generic)"));

     #endif // USE_FONTDLG_GENERIC
 
     #endif // USE_FONTDLG_GENERIC
 

-    menuDlg->Append(wxID_ANY,_T("&Choices and selectors"),choices_menu);
+    menuDlg->Append(wxID_ANY,wxT("&Choices and selectors"),choices_menu);

 #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
 
 
 #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG
 
 


@@ -328,15 +396,16 @@ bool MyApp::OnInit()
     wxMenu *entry_menu = new wxMenu;
 
     #if wxUSE_TEXTDLG
     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"));
+        entry_menu->Append(DIALOGS_LINE_ENTRY,  wxT("Single line &entry\tCtrl-E"));
+        entry_menu->Append(DIALOGS_TEXT_ENTRY,  wxT("Multi line text &entry\tShift-Ctrl-E"));
+        entry_menu->Append(DIALOGS_PASSWORD_ENTRY,  wxT("&Password entry\tCtrl-P"));

     #endif // wxUSE_TEXTDLG
 
     #if wxUSE_NUMBERDLG
     #endif // wxUSE_TEXTDLG
 
     #if wxUSE_NUMBERDLG

-        entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N"));
+        entry_menu->Append(DIALOGS_NUM_ENTRY, wxT("&Numeric entry\tCtrl-N"));

     #endif // wxUSE_NUMBERDLG
 
     #endif // wxUSE_NUMBERDLG
 

-    menuDlg->Append(wxID_ANY,_T("&Entry dialogs"),entry_menu);
+    menuDlg->Append(wxID_ANY,wxT("&Entry dialogs"),entry_menu);

 
 #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG
 
 
 #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG
 


@@ -344,32 +413,32 @@ bool MyApp::OnInit()
 #if wxUSE_FILEDLG
 
     wxMenu *filedlg_menu = new wxMenu;
 #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"));
+    filedlg_menu->Append(DIALOGS_FILE_OPEN,  wxT("&Open file\tCtrl-O"));
+    filedlg_menu->Append(DIALOGS_FILE_OPEN2,  wxT("&Second open file\tCtrl-2"));
+    filedlg_menu->Append(DIALOGS_FILES_OPEN,  wxT("Open &files\tCtrl-Q"));
+    filedlg_menu->Append(DIALOGS_FILE_SAVE,  wxT("Sa&ve file\tCtrl-S"));

 
 #if USE_FILEDLG_GENERIC
     filedlg_menu->AppendSeparator();
 
 #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)"));
+    filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, wxT("&Open file (generic)"));
+    filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, wxT("Open &files (generic)"));
+    filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, wxT("Sa&ve file (generic)"));

 #endif // USE_FILEDLG_GENERIC
 
 #endif // USE_FILEDLG_GENERIC
 

-    menuDlg->Append(wxID_ANY,_T("&File operations"),filedlg_menu);
+    menuDlg->Append(wxID_ANY,wxT("&File operations"),filedlg_menu);

 
 #endif // wxUSE_FILEDLG
 
 #if wxUSE_DIRDLG
     wxMenu *dir_menu = new wxMenu;
 
 
 #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"));
-    menuDlg->Append(wxID_ANY,_T("&Directory operations"),dir_menu);
+    dir_menu->Append(DIALOGS_DIR_CHOOSE,  wxT("&Choose a directory\tCtrl-D"));
+    dir_menu->Append(DIALOGS_DIRNEW_CHOOSE,  wxT("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D"));
+    menuDlg->Append(wxID_ANY,wxT("&Directory operations"),dir_menu);

 
     #if USE_DIRDLG_GENERIC
         dir_menu->AppendSeparator();
 
     #if USE_DIRDLG_GENERIC
         dir_menu->AppendSeparator();

-        dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  _T("&Choose a directory (generic)"));
+        dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  wxT("&Choose a directory (generic)"));

     #endif // USE_DIRDLG_GENERIC
 
 #endif // wxUSE_DIRDLG
     #endif // USE_DIRDLG_GENERIC
 
 #endif // wxUSE_DIRDLG


@@ -384,68 +453,73 @@ bool MyApp::OnInit()
     wxMenu *info_menu = new wxMenu;
 
     #if wxUSE_STARTUP_TIPS
     wxMenu *info_menu = new wxMenu;
 
     #if wxUSE_STARTUP_TIPS

-        info_menu->Append(DIALOGS_TIP,  _T("&Tip of the day\tCtrl-T"));
+        info_menu->Append(DIALOGS_TIP,  wxT("&Tip of the day\tCtrl-T"));

     #endif // wxUSE_STARTUP_TIPS
 
     #if wxUSE_PROGRESSDLG
     #endif // wxUSE_STARTUP_TIPS
 
     #if wxUSE_PROGRESSDLG

-        info_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G"));
+        info_menu->Append(DIALOGS_PROGRESS, wxT("Pro&gress dialog\tCtrl-G"));

     #endif // wxUSE_PROGRESSDLG
 
     #if wxUSE_BUSYINFO
     #endif // wxUSE_PROGRESSDLG
 
     #if wxUSE_BUSYINFO

-       info_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B"));
+       info_menu->Append(DIALOGS_BUSYINFO, wxT("&Busy info dialog\tCtrl-B"));

     #endif // wxUSE_BUSYINFO
 
     #if wxUSE_LOG_DIALOG
     #endif // wxUSE_BUSYINFO
 
     #if wxUSE_LOG_DIALOG

-       info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L"));
+       info_menu->Append(DIALOGS_LOG_DIALOG, wxT("&Log dialog\tCtrl-L"));

     #endif // wxUSE_LOG_DIALOG
 
     #endif // wxUSE_LOG_DIALOG
 

+    #if wxUSE_INFOBAR
+       info_menu->Append(DIALOGS_INFOBAR_SIMPLE, "Simple &info bar\tCtrl-I");
+       info_menu->Append(DIALOGS_INFOBAR_ADVANCED, "&Advanced info bar\tShift-Ctrl-I");
+    #endif // wxUSE_INFOBAR
+

     #if wxUSE_MSGDLG
         info_menu->Append(DIALOGS_MESSAGE_BOX_WXINFO,
     #if wxUSE_MSGDLG
         info_menu->Append(DIALOGS_MESSAGE_BOX_WXINFO,

-                             _T("&wxWidgets information\tCtrl-I"));
+                             wxT("&wxWidgets information\tCtrl-W"));

     #endif // wxUSE_MSGDLG
 
     #endif // wxUSE_MSGDLG
 

-    menuDlg->Append(wxID_ANY,_T("&Informative dialogs"),info_menu);
+    menuDlg->Append(wxID_ANY,wxT("&Informative dialogs"),info_menu);

 
 #endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG
 
 
 #if wxUSE_FINDREPLDLG
     wxMenu *find_menu = new wxMenu;
 
 #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"));
-    menuDlg->Append(wxID_ANY,_T("&Searching"),find_menu);
+    find_menu->AppendCheckItem(DIALOGS_FIND, wxT("&Find dialog\tCtrl-F"));
+    find_menu->AppendCheckItem(DIALOGS_REPLACE, wxT("Find and &replace dialog\tShift-Ctrl-F"));
+    menuDlg->Append(wxID_ANY,wxT("&Searching"),find_menu);

 #endif // wxUSE_FINDREPLDLG
 
     wxMenu *dialogs_menu = new wxMenu;
 #if USE_MODAL_PRESENTATION
 #endif // wxUSE_FINDREPLDLG
 
     wxMenu *dialogs_menu = new wxMenu;
 #if USE_MODAL_PRESENTATION

-    dialogs_menu->Append(DIALOGS_MODAL, _T("&Modal dialog\tCtrl-W"));
+    dialogs_menu->Append(DIALOGS_MODAL, wxT("&Modal dialog\tShift-Ctrl-W"));

 #endif // USE_MODAL_PRESENTATION
 #endif // USE_MODAL_PRESENTATION

-    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"));
+    dialogs_menu->AppendCheckItem(DIALOGS_MODELESS, wxT("Mode&less dialog\tShift-Ctrl-Z"));
+    dialogs_menu->Append(DIALOGS_CENTRE_SCREEN, wxT("Centered on &screen\tShift-Ctrl-1"));
+    dialogs_menu->Append(DIALOGS_CENTRE_PARENT, wxT("Centered on &parent\tShift-Ctrl-2"));

 #if wxUSE_MINIFRAME
 #if wxUSE_MINIFRAME

-    dialogs_menu->Append(DIALOGS_MINIFRAME, _T("&Mini frame"));
+    dialogs_menu->Append(DIALOGS_MINIFRAME, wxT("&Mini frame"));

 #endif // wxUSE_MINIFRAME
 #endif // wxUSE_MINIFRAME

-    dialogs_menu->Append(DIALOGS_ONTOP, _T("Dialog staying on &top"));
-    menuDlg->Append(wxID_ANY, _T("&Generic dialogs"), dialogs_menu);
+    dialogs_menu->Append(DIALOGS_ONTOP, wxT("Dialog staying on &top"));
+    menuDlg->Append(wxID_ANY, wxT("&Generic dialogs"), dialogs_menu);

 
 #if USE_SETTINGS_DIALOG
     wxMenu *sheet_menu = new wxMenu;
 
 #if USE_SETTINGS_DIALOG
     wxMenu *sheet_menu = new wxMenu;

-    sheet_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Standard property sheet\tShift-Ctrl-P"));
-    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, _T("&Toolbook sheet\tShift-Ctrl-T"));
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET, wxT("&Standard property sheet\tShift-Ctrl-P"));
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_TOOLBOOK, wxT("&Toolbook sheet\tShift-Ctrl-T"));

 
     if (wxPlatformIs(wxPORT_MAC))
 
     if (wxPlatformIs(wxPORT_MAC))

-        sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, _T("Button &Toolbook sheet\tShift-Ctrl-U"));
+        sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, wxT("Button &Toolbook sheet\tShift-Ctrl-U"));

 /*
 #ifdef __WXMAC__
 /*
 #ifdef __WXMAC__

-    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, _T("Button &Toolbook sheet\tShift-Ctrl-U"));
+    sheet_menu->Append(DIALOGS_PROPERTY_SHEET_BUTTONTOOLBOOK, wxT("Button &Toolbook sheet\tShift-Ctrl-U"));

 #endif
 */
 #endif
 */

-    menuDlg->Append(wxID_ANY, _T("&Property sheets"), sheet_menu);
+    menuDlg->Append(wxID_ANY, wxT("&Property sheets"), sheet_menu);

 #endif // USE_SETTINGS_DIALOG
 
     wxMenu *menuNotif = new wxMenu;
 #endif // USE_SETTINGS_DIALOG
 
     wxMenu *menuNotif = new wxMenu;

-    menuNotif->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-Shift-R"));
+    menuNotif->Append(DIALOGS_REQUEST, wxT("&Request user attention\tCtrl-Shift-R"));

 #if wxUSE_NOTIFICATION_MESSAGE
     menuNotif->Append(DIALOGS_NOTIFY_AUTO, "&Automatically hidden notification");
     menuNotif->Append(DIALOGS_NOTIFY_SHOW, "&Show manual notification");
 #if wxUSE_NOTIFICATION_MESSAGE
     menuNotif->Append(DIALOGS_NOTIFY_AUTO, "&Automatically hidden notification");
     menuNotif->Append(DIALOGS_NOTIFY_SHOW, "&Show manual notification");


@@ -453,47 +527,54 @@ bool MyApp::OnInit()
 #endif // wxUSE_NOTIFICATION_MESSAGE
     menuDlg->AppendSubMenu(menuNotif, "&User notifications");
 
 #endif // wxUSE_NOTIFICATION_MESSAGE
     menuDlg->AppendSubMenu(menuNotif, "&User notifications");
 

-    menuDlg->Append(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, _T("&Standard Buttons Sizer Dialog"));
-    menuDlg->Append(DIALOGS_TEST_DEFAULT_ACTION, _T("&Test dialog default action"));
+    menuDlg->Append(DIALOGS_STANDARD_BUTTON_SIZER_DIALOG, wxT("&Standard Buttons Sizer Dialog"));
+    menuDlg->Append(DIALOGS_TEST_DEFAULT_ACTION, wxT("&Test dialog default action"));

 
     menuDlg->AppendSeparator();
 
     menuDlg->AppendSeparator();

-    menuDlg->Append(wxID_EXIT, _T("E&xit\tAlt-X"));
+    menuDlg->Append(wxID_EXIT, wxT("E&xit\tAlt-X"));

 
 #if wxUSE_ABOUTDLG
     wxMenu *menuHelp = new wxMenu;
 
 #if wxUSE_ABOUTDLG
     wxMenu *menuHelp = new wxMenu;

-    menuHelp->Append(DIALOGS_ABOUTDLG_SIMPLE, _T("&About (simple)...\tF1"));
-    menuHelp->Append(DIALOGS_ABOUTDLG_FANCY, _T("About (&fancy)...\tShift-F1"));
-    menuHelp->Append(DIALOGS_ABOUTDLG_FULL, _T("About (f&ull)...\tCtrl-F1"));
-    menuHelp->Append(DIALOGS_ABOUTDLG_CUSTOM, _T("About (&custom)...\tCtrl-Shift-F1"));
+    menuHelp->Append(DIALOGS_ABOUTDLG_SIMPLE, wxT("&About (simple)...\tF1"));
+    menuHelp->Append(DIALOGS_ABOUTDLG_FANCY, wxT("About (&fancy)...\tShift-F1"));
+    menuHelp->Append(DIALOGS_ABOUTDLG_FULL, wxT("About (f&ull)...\tCtrl-F1"));
+    menuHelp->Append(DIALOGS_ABOUTDLG_CUSTOM, wxT("About (&custom)...\tCtrl-Shift-F1"));

 #endif // wxUSE_ABOUTDLG
 
 #endif // wxUSE_ABOUTDLG
 

+    wxMenu* editMenu = new wxMenu;
+    editMenu->Append(wxID_UNDO, _("&Undo\tCtrl+Z"));
+    editMenu->Append(wxID_REDO, _("&Redo\tCtrl+Y"));
+    editMenu->AppendSeparator();
+    editMenu->Append(wxID_CUT, _("Cu&t\tCtrl+X"));
+    editMenu->Append(wxID_COPY, _("&Copy\tCtrl+C"));
+    editMenu->Append(wxID_PASTE, _("&Paste\tCtrl+V"));
+    editMenu->Append(wxID_CLEAR, _("&Delete"));
+    
+    editMenu->AppendSeparator();
+    editMenu->Append(wxID_SELECTALL, _("Select All\tCtrl+A"));
+

     wxMenuBar *menubar = new wxMenuBar;
     wxMenuBar *menubar = new wxMenuBar;

-    menubar->Append(menuDlg, _T("&Dialogs"));
+    menubar->Append(menuDlg, wxT("&Dialogs"));
+    
+    menubar->Append(editMenu, wxT("&Edit"));
+    

 #if wxUSE_ABOUTDLG
 #if wxUSE_ABOUTDLG

-    menubar->Append(menuHelp, _T("&Help"));
+    menubar->Append(menuHelp, wxT("&Help"));

 #endif // wxUSE_ABOUTDLG
 
     frame->SetMenuBar(menubar);
 
 #endif // wxUSE_ABOUTDLG
 
     frame->SetMenuBar(menubar);
 

-    myCanvas = new MyCanvas(frame);
-    myCanvas->SetBackgroundColour(*wxWHITE);
-

     frame->Centre(wxBOTH);
     frame->Centre(wxBOTH);

-
-    // Show the frame

     frame->Show(true);
 
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
 // My frame constructor
     return true;
 }
 
 // My frame constructor

-MyFrame::MyFrame(wxWindow *parent,
-                 const wxString& title)
-       : wxFrame(parent, wxID_ANY, title)
+MyFrame::MyFrame(const wxString& title)
+       : wxFrame(NULL, wxID_ANY, title)

 {
 {

-    SetIcon(sample_xpm);
+    SetIcon(wxICON(sample));

 
 #if USE_MODAL_PRESENTATION
     m_dialog = (MyModelessDialog *)NULL;
 
 #if USE_MODAL_PRESENTATION
     m_dialog = (MyModelessDialog *)NULL;


@@ -520,6 +601,53 @@ MyFrame::MyFrame(wxWindow *parent,
 #if wxUSE_STATUSBAR
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR

+
+    m_canvas = new MyCanvas(this);
+
+#if wxUSE_INFOBAR
+    // an info bar can be created very simply and used without any extra effort
+    m_infoBarSimple = new wxInfoBar(this);
+
+    // or it can also be customized by
+    m_infoBarAdvanced = new wxInfoBar(this);
+
+    // ... adding extra buttons (but more than two will usually be too many)
+    m_infoBarAdvanced->AddButton(wxID_UNDO);
+    m_infoBarAdvanced->AddButton(wxID_REDO);
+
+    m_infoBarAdvanced->Connect(wxID_REDO, wxEVT_COMMAND_BUTTON_CLICKED,
+                                wxCommandEventHandler(MyFrame::OnInfoBarRedo),
+                                NULL,
+                                this);
+
+    // adding and removing a button immediately doesn't make sense here, of
+    // course, it's done just to show that it is possible
+    m_infoBarAdvanced->AddButton(wxID_EXIT);
+    m_infoBarAdvanced->RemoveButton(wxID_EXIT);
+
+    // ... changing the colours and/or fonts
+    m_infoBarAdvanced->SetOwnBackgroundColour(0xc8ffff);
+    m_infoBarAdvanced->SetFont(GetFont().Bold().Larger());
+
+    // ... and changing the effect (only does anything under MSW currently)
+    m_infoBarAdvanced->SetShowHideEffects(wxSHOW_EFFECT_EXPAND,
+                                          wxSHOW_EFFECT_EXPAND);
+    m_infoBarAdvanced->SetEffectDuration(1500);
+
+
+    // to use the info bars we need to use sizer for the window layout
+    wxBoxSizer * const sizer = new wxBoxSizer(wxVERTICAL);
+    sizer->Add(m_infoBarSimple, wxSizerFlags().Expand());
+    sizer->Add(m_canvas, wxSizerFlags(1).Expand());
+    sizer->Add(m_infoBarAdvanced, wxSizerFlags().Expand());
+    SetSizer(sizer);
+
+    // final touch: under MSW the info bars are shown progressively and parts
+    // of the parent window can be seen during the process, so use the same
+    // background colour for our background as for the canvas window which
+    // covers our entire client area to avoid jarring colour jumps
+    SetOwnBackgroundColour(m_canvas->GetBackgroundColour());
+#endif // wxUSE_INFOBAR

 }
 
 MyFrame::~MyFrame()
 }
 
 MyFrame::~MyFrame()


@@ -533,16 +661,16 @@ MyFrame::~MyFrame()
 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event))
 {

-    m_clrData.SetColour(myCanvas->GetBackgroundColour());
+    m_clrData.SetColour(m_canvas->GetBackgroundColour());

 
     wxColourDialog dialog(this, &m_clrData);
     dialog.SetTitle(_("Please choose the background colour"));
     if ( dialog.ShowModal() == wxID_OK )
     {
         m_clrData = dialog.GetColourData();
 
     wxColourDialog dialog(this, &m_clrData);
     dialog.SetTitle(_("Please choose the background colour"));
     if ( dialog.ShowModal() == wxID_OK )
     {
         m_clrData = dialog.GetColourData();

-        myCanvas->SetBackgroundColour(m_clrData.GetColour());
-        myCanvas->ClearBackground();
-        myCanvas->Refresh();
+        m_canvas->SetBackgroundColour(m_clrData.GetColour());
+        m_canvas->ClearBackground();
+        m_canvas->Refresh();

     }
 }
 
     }
 }
 


@@ -551,13 +679,13 @@ void MyFrame::GetColour(wxCommandEvent& WXUNUSED(event))
     wxColour clr = wxGetColourFromUser
                    (
                     this,
     wxColour clr = wxGetColourFromUser
                    (
                     this,

-                    wxGetApp().m_canvasTextColour,
+                    m_canvas->GetForegroundColour(),

                     "Please choose the foreground colour"
                    );
     if ( clr.IsOk() )
     {
                     "Please choose the foreground colour"
                    );
     if ( clr.IsOk() )
     {

-        wxGetApp().m_canvasTextColour = clr;
-        myCanvas->Refresh();
+        m_canvas->SetForegroundColour(clr);
+        m_canvas->Refresh();

     }
     //else: dialog cancelled by user
 }
     }
     //else: dialog cancelled by user
 }


@@ -568,7 +696,7 @@ void MyFrame::GetColour(wxCommandEvent& WXUNUSED(event))
 #if USE_COLOURDLG_GENERIC
 void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
 {
 #if USE_COLOURDLG_GENERIC
 void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
 {

-    m_clrData.SetColour(myCanvas->GetBackgroundColour());
+    m_clrData.SetColour(m_canvas->GetBackgroundColour());

 
     //FIXME:TODO:This has no effect...
     m_clrData.SetChooseFull(true);
 
     //FIXME:TODO:This has no effect...
     m_clrData.SetChooseFull(true);


@@ -587,9 +715,9 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
     if (dialog->ShowModal() == wxID_OK)
     {
         m_clrData = dialog->GetColourData();
     if (dialog->ShowModal() == wxID_OK)
     {
         m_clrData = dialog->GetColourData();

-        myCanvas->SetBackgroundColour(m_clrData.GetColour());
-        myCanvas->ClearBackground();
-        myCanvas->Refresh();
+        m_canvas->SetBackgroundColour(m_clrData.GetColour());
+        m_canvas->ClearBackground();
+        m_canvas->Refresh();

     }
     dialog->Destroy();
 }
     }
     dialog->Destroy();
 }


@@ -599,8 +727,8 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
 void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
 {
     wxFontData data;
 void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
 {
     wxFontData data;

-    data.SetInitialFont(wxGetApp().m_canvasFont);
-    data.SetColour(wxGetApp().m_canvasTextColour);
+    data.SetInitialFont(m_canvas->GetFont());
+    data.SetColour(m_canvas->GetForegroundColour());

 
     // you might also do this:
     //
 
     // you might also do this:
     //


@@ -612,9 +740,9 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
     if (dialog.ShowModal() == wxID_OK)
     {
         wxFontData retData = dialog.GetFontData();
     if (dialog.ShowModal() == wxID_OK)
     {
         wxFontData retData = dialog.GetFontData();

-        wxGetApp().m_canvasFont = retData.GetChosenFont();
-        wxGetApp().m_canvasTextColour = retData.GetColour();
-        myCanvas->Refresh();
+        m_canvas->SetFont(retData.GetChosenFont());
+        m_canvas->SetForegroundColour(retData.GetColour());
+        m_canvas->Refresh();

     }
     //else: cancelled by the user, don't change the font
 }
     }
     //else: cancelled by the user, don't change the font
 }


@@ -624,16 +752,16 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
 {
     wxFontData data;
 void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
 {
     wxFontData data;

-    data.SetInitialFont(wxGetApp().m_canvasFont);
-    data.SetColour(wxGetApp().m_canvasTextColour);
+    data.SetInitialFont(m_canvas->GetFont());
+    data.SetColour(m_canvas->GetForegroundColour());

 
     wxGenericFontDialog *dialog = new wxGenericFontDialog(this, data);
     if (dialog->ShowModal() == wxID_OK)
     {
         wxFontData retData = dialog->GetFontData();
 
     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();
+        m_canvas->SetFont(retData.GetChosenFont());
+        m_canvas->SetForegroundColour(retData.GetColour());
+        m_canvas->Refresh();

     }
     dialog->Destroy();
 }
     }
     dialog->Destroy();
 }


@@ -663,6 +791,30 @@ void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))
 }
 #endif // wxUSE_LOG_DIALOG
 
 }
 #endif // wxUSE_LOG_DIALOG
 

+#if wxUSE_INFOBAR
+
+void MyFrame::InfoBarSimple(wxCommandEvent& WXUNUSED(event))
+{
+    static int s_count = 0;
+    m_infoBarSimple->ShowMessage
+                     (
+                      wxString::Format("Message #%d in the info bar.", ++s_count)
+                     );
+}
+
+void MyFrame::InfoBarAdvanced(wxCommandEvent& WXUNUSED(event))
+{
+    m_infoBarAdvanced->ShowMessage("Sorry, it didn't work out.", wxICON_WARNING);
+}
+
+void MyFrame::OnInfoBarRedo(wxCommandEvent& WXUNUSED(event))
+{
+    m_infoBarAdvanced->ShowMessage("Still no, sorry again.", wxICON_ERROR);
+}
+
+#endif // wxUSE_INFOBAR
+
+

 #if wxUSE_MSGDLG
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_MSGDLG
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
 {


@@ -677,6 +829,54 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
 
     wxString extmsg;
     if ( dialog.SetYesNoCancelLabels
 
     wxString extmsg;
     if ( dialog.SetYesNoCancelLabels

+        (
+         "Answer &Yes",
+         "Answer &No",
+         "Refuse to answer"
+         ) )
+    {
+        extmsg = "This platform supports custom button labels,\n"
+        "so you should see the descriptive labels below.";
+    }
+    else
+    {
+        extmsg = "Custom button labels are not supported on this platform,\n"
+        "so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used.";
+    }
+    dialog.SetExtendedMessage(extmsg);
+
+    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!"));
+    }
+}
+
+void MyFrame::MessageBoxWindowModal(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageDialog* dialog = new wxMessageDialog(this,
+                           "This is a message box\n"
+                           "This is a long, long string to test out if the message box "
+                           "is laid out properly.",
+                           "Message box text",
+                           wxCENTER |
+                           wxNO_DEFAULT | wxYES_NO | wxCANCEL |
+                           wxICON_INFORMATION);
+
+    wxString extmsg;
+    if ( dialog->SetYesNoCancelLabels

                 (
                     "Answer &Yes",
                     "Answer &No",
                 (
                     "Answer &Yes",
                     "Answer &No",


@@ -691,9 +891,15 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
         extmsg = "Custom button labels are not supported on this platform,\n"
                  "so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used.";
     }
         extmsg = "Custom button labels are not supported on this platform,\n"
                  "so the default \"Yes\"/\"No\"/\"Cancel\" buttons are used.";
     }

-    dialog.SetExtendedMessage(extmsg);
+    dialog->SetExtendedMessage(extmsg);
+    dialog->Connect( wxEVT_WINDOW_MODAL_DIALOG_CLOSED, wxWindowModalDialogEventHandler(MyFrame::MessageBoxWindowModalClosed), NULL, this );
+    dialog->ShowWindowModal();
+}

 
 

-    switch ( dialog.ShowModal() )
+void MyFrame::MessageBoxWindowModalClosed(wxWindowModalDialogEvent& event)
+{
+    wxDialog* dialog = event.GetDialog();
+    switch ( dialog->GetReturnCode() )

     {
         case wxID_YES:
             wxLogStatus(wxT("You pressed \"Yes\""));
     {
         case wxID_YES:
             wxLogStatus(wxT("You pressed \"Yes\""));


@@ -710,11 +916,13 @@ void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event))
         default:
             wxLogError(wxT("Unexpected wxMessageDialog return code!"));
     }
         default:
             wxLogError(wxT("Unexpected wxMessageDialog return code!"));
     }

+    delete dialog;

 }
 
 void MyFrame::MessageBoxDialog(wxCommandEvent& WXUNUSED(event))
 {
     TestMessageBoxDialog dlg(this);
 }
 
 void MyFrame::MessageBoxDialog(wxCommandEvent& WXUNUSED(event))
 {
     TestMessageBoxDialog dlg(this);

+    dlg.Create();

     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }
 


@@ -724,57 +932,79 @@ void MyFrame::MessageBoxInfo(wxCommandEvent& WXUNUSED(event))
 }
 #endif // wxUSE_MSGDLG
 
 }
 #endif // wxUSE_MSGDLG
 

+#if wxUSE_RICHMSGDLG
+void MyFrame::RichMessageDialog(wxCommandEvent& WXUNUSED(event))
+{
+    TestRichMessageDialog dlg(this);
+    dlg.Create();
+    dlg.ShowModal();
+}
+#endif // wxUSE_RICHMSGDLG
+

 #if wxUSE_NUMBERDLG
 void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_NUMBERDLG
 void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event))
 {

-    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"),
+    long res = wxGetNumberFromUser( wxT("This is some text, actually a lot of text.\n")
+                                    wxT("Even two rows of text."),
+                                    wxT("Enter a number:"), wxT("Numeric input test"),

                                      50, 0, 100, this );
 
     wxString msg;
     int icon;
     if ( res == -1 )
     {
                                      50, 0, 100, this );
 
     wxString msg;
     int icon;
     if ( res == -1 )
     {

-        msg = _T("Invalid number entered or dialog cancelled.");
+        msg = wxT("Invalid number entered or dialog cancelled.");

         icon = wxICON_HAND;
     }
     else
     {
         icon = wxICON_HAND;
     }
     else
     {

-        msg.Printf(_T("You've entered %lu"), res );
+        msg.Printf(wxT("You've entered %lu"), res );

         icon = wxICON_INFORMATION;
     }
 
         icon = wxICON_INFORMATION;
     }
 

-    wxMessageBox(msg, _T("Numeric test result"), wxOK | icon, this);
+    wxMessageBox(msg, wxT("Numeric test result"), wxOK | icon, this);

 }
 #endif // wxUSE_NUMBERDLG
 
 #if wxUSE_TEXTDLG
 void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
 {
 }
 #endif // wxUSE_NUMBERDLG
 
 #if wxUSE_TEXTDLG
 void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
 {

-    wxString pwd = wxGetPasswordFromUser(_T("Enter password:"),
-                                         _T("Password entry dialog"),
+    wxString pwd = wxGetPasswordFromUser(wxT("Enter password:"),
+                                         wxT("Password entry dialog"),

                                          wxEmptyString,
                                          this);
     if ( !pwd.empty() )
     {
         wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()),
                                          wxEmptyString,
                                          this);
     if ( !pwd.empty() )
     {
         wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()),

-                     _T("Got password"), wxOK | wxICON_INFORMATION, this);
+                     wxT("Got password"), wxOK | wxICON_INFORMATION, this);

     }
 }
 
     }
 }
 

-void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
+void MyFrame::LineEntry(wxCommandEvent& WXUNUSED(event))

 {
     wxTextEntryDialog dialog(this,
 {
     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"),
+                             wxT("This is a small sample\n")
+                             wxT("A long, long string to test out the text entrybox"),
+                             wxT("Please enter a string"),
+                             wxT("Default value"),

                              wxOK | wxCANCEL);
 
     if (dialog.ShowModal() == wxID_OK)
     {
                              wxOK | wxCANCEL);
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxMessageBox(dialog.GetValue(), _T("Got string"), wxOK | wxICON_INFORMATION, this);
+        wxMessageBox(dialog.GetValue(), wxT("Got string"), wxOK | wxICON_INFORMATION, this);
+    }
+}
+
+void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
+{
+    wxTextEntryDialog dialog(this, "You can enter a multiline string here.",
+                             "Please enter some text",
+                             "First line\nSecond one\nAnd another one too",
+                             wxOK | wxCANCEL | wxTE_MULTILINE);
+
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        wxMessageBox(dialog.GetValue(), wxT("Got text"), wxOK | wxICON_INFORMATION, this);

     }
 }
 #endif // wxUSE_TEXTDLG
     }
 }
 #endif // wxUSE_TEXTDLG


@@ -782,19 +1012,19 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_CHOICEDLG
 void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 {
 #if wxUSE_CHOICEDLG
 void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 {

-    const wxString choices[] = { _T("One"), _T("Two"), _T("Three"), _T("Four"), _T("Five") } ;
+    const wxString choices[] = { wxT("One"), wxT("Two"), wxT("Three"), wxT("Four"), wxT("Five") } ;

 
     wxSingleChoiceDialog dialog(this,
 
     wxSingleChoiceDialog dialog(this,

-                                _T("This is a small sample\n")
-                                _T("A single-choice convenience dialog"),
-                                _T("Please select a value"),
+                                wxT("This is a small sample\n")
+                                wxT("A single-choice convenience dialog"),
+                                wxT("Please select a value"),

                                 WXSIZEOF(choices), choices);
 
     dialog.SetSelection(2);
 
     if (dialog.ShowModal() == wxID_OK)
     {
                                 WXSIZEOF(choices), choices);
 
     dialog.SetSelection(2);
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxMessageDialog dialog2(this, dialog.GetStringSelection(), _T("Got string"));
+        wxMessageDialog dialog2(this, dialog.GetStringSelection(), wxT("Got string"));

         dialog2.ShowModal();
     }
 }
         dialog2.ShowModal();
     }
 }


@@ -803,16 +1033,16 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 {
     const wxString choices[] =
     {
 {
     const wxString choices[] =
     {

-        _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"),
+        wxT("One"), wxT("Two"), wxT("Three"), wxT("Four"), wxT("Five"),
+        wxT("Six"), wxT("Seven"), wxT("Eight"), wxT("Nine"), wxT("Ten"),
+        wxT("Eleven"), wxT("Twelve"), wxT("Seventeen"),

     };
 
     wxArrayInt selections;
     const int count = wxGetSelectedChoices(selections,
     };
 
     wxArrayInt selections;
     const int count = wxGetSelectedChoices(selections,

-                                        _T("This is a small sample\n")
-                                        _T("A multi-choice convenience dialog"),
-                                        _T("Please select a value"),
+                                        wxT("This is a small sample\n")
+                                        wxT("A multi-choice convenience dialog"),
+                                        wxT("Please select a value"),

                                         WXSIZEOF(choices), choices,
                                         this);
     if ( count >= 0 )
                                         WXSIZEOF(choices), choices,
                                         this);
     if ( count >= 0 )


@@ -1085,9 +1315,9 @@ private:
 MyExtraPanel::MyExtraPanel(wxWindow *parent)
             : wxPanel(parent)
 {
 MyExtraPanel::MyExtraPanel(wxWindow *parent)
             : wxPanel(parent)
 {

-    m_btn = new wxButton(this, -1, _T("Custom Button"));
+    m_btn = new wxButton(this, -1, wxT("Custom Button"));

     m_btn->Enable(false);
     m_btn->Enable(false);

-    m_cb = new wxCheckBox(this, -1, _T("Enable Custom Button"));
+    m_cb = new wxCheckBox(this, -1, wxT("Enable Custom Button"));

     m_cb->Connect(wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,
                   wxCommandEventHandler(MyExtraPanel::OnCheckBox), NULL, this);
     wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
     m_cb->Connect(wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED,
                   wxCommandEventHandler(MyExtraPanel::OnCheckBox), NULL, this);
     wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);


@@ -1108,13 +1338,13 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
     wxFileDialog dialog
                  (
                     this,
     wxFileDialog dialog
                  (
                     this,

-                    _T("Testing open file dialog"),
+                    wxT("Testing open file dialog"),

                     wxEmptyString,
                     wxEmptyString,
 #ifdef __WXMOTIF__
                     wxEmptyString,
                     wxEmptyString,
 #ifdef __WXMOTIF__

-                    _T("C++ files (*.cpp)|*.cpp")
+                    wxT("C++ files (*.cpp)|*.cpp")

 #else
 #else

-                    _T("C++ files (*.cpp;*.h)|*.cpp;*.h")
+                    wxT("C++ files (*.cpp;*.h)|*.cpp;*.h")

 #endif
                  );
 
 #endif
                  );
 


@@ -1126,16 +1356,16 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
     {
         wxString info;
         wxWindow * const extra = dialog.GetExtraControl();
     {
         wxString info;
         wxWindow * const extra = dialog.GetExtraControl();

-        info.Printf(_T("Full file name: %s\n")
-                    _T("Path: %s\n")
-                    _T("Name: %s\n")
-                    _T("Custom window: %s"),
+        info.Printf(wxT("Full file name: %s\n")
+                    wxT("Path: %s\n")
+                    wxT("Name: %s\n")
+                    wxT("Custom window: %s"),

                     dialog.GetPath().c_str(),
                     dialog.GetDirectory().c_str(),
                     dialog.GetFilename().c_str(),
                     extra ? static_cast<MyExtraPanel*>(extra)->GetInfo()
                           : wxString("None"));
                     dialog.GetPath().c_str(),
                     dialog.GetDirectory().c_str(),
                     dialog.GetFilename().c_str(),
                     extra ? static_cast<MyExtraPanel*>(extra)->GetInfo()
                           : wxString("None"));

-        wxMessageDialog dialog2(this, info, _T("Selected file"));
+        wxMessageDialog dialog2(this, info, wxT("Selected file"));

         dialog2.ShowModal();
     }
 }
         dialog2.ShowModal();
     }
 }


@@ -1147,12 +1377,12 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
 {
     static wxString s_extDef;
     wxString path = wxFileSelector(
 {
     static wxString s_extDef;
     wxString path = wxFileSelector(

-                                    _T("Select the file to load"),
+                                    wxT("Select the file to load"),

                                     wxEmptyString, wxEmptyString,
                                     s_extDef,
                                     wxString::Format
                                     (
                                     wxEmptyString, wxEmptyString,
                                     s_extDef,
                                     wxString::Format
                                     (

-                                        _T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (%s)|%s"),
+                                        wxT("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (%s)|%s"),

                                         wxFileSelectorDefaultWildcardStr,
                                         wxFileSelectorDefaultWildcardStr
                                     ),
                                         wxFileSelectorDefaultWildcardStr,
                                         wxFileSelectorDefaultWildcardStr
                                     ),


@@ -1164,9 +1394,9 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
         return;
 
     // it is just a sample, would use wxSplitPath in real program
         return;
 
     // it is just a sample, would use wxSplitPath in real program

-    s_extDef = path.AfterLast(_T('.'));
+    s_extDef = path.AfterLast(wxT('.'));

 
 

-    wxLogMessage(_T("You selected the file '%s', remembered extension '%s'"),
+    wxLogMessage(wxT("You selected the file '%s', remembered extension '%s'"),

                  path, s_extDef);
 }
 
                  path, s_extDef);
 }
 


@@ -1174,16 +1404,16 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 {
     wxString wildcards =
 #ifdef __WXMOTIF__
 {
     wxString wildcards =
 #ifdef __WXMOTIF__

-                    _T("C++ files (*.cpp)|*.cpp");
+                    wxT("C++ files (*.cpp)|*.cpp");

 #else
                     wxString::Format
                     (
 #else
                     wxString::Format
                     (

-                        _T("All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h"),
+                        wxT("All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h"),

                         wxFileSelectorDefaultWildcardStr,
                         wxFileSelectorDefaultWildcardStr
                     );
 #endif
                         wxFileSelectorDefaultWildcardStr,
                         wxFileSelectorDefaultWildcardStr
                     );
 #endif

-    wxFileDialog dialog(this, _T("Testing open multiple file dialog"),
+    wxFileDialog dialog(this, wxT("Testing open multiple file dialog"),

                         wxEmptyString, wxEmptyString, wildcards,
                         wxFD_OPEN|wxFD_MULTIPLE);
 
                         wxEmptyString, wxEmptyString, wildcards,
                         wxFD_OPEN|wxFD_MULTIPLE);
 


@@ -1198,15 +1428,15 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
         size_t count = paths.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = paths.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {

-            s.Printf(_T("File %d: %s (%s)\n"),
+            s.Printf(wxT("File %d: %s (%s)\n"),

                      (int)n, paths[n].c_str(), filenames[n].c_str());
 
             msg += s;
         }
                      (int)n, paths[n].c_str(), filenames[n].c_str());
 
             msg += s;
         }

-        s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex());
+        s.Printf(wxT("Filter index: %d"), dialog.GetFilterIndex());

         msg += s;
 
         msg += s;
 

-        wxMessageDialog dialog2(this, msg, _T("Selected files"));
+        wxMessageDialog dialog2(this, msg, wxT("Selected files"));

         dialog2.ShowModal();
     }
 }
         dialog2.ShowModal();
     }
 }


@@ -1214,17 +1444,17 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 {
     wxFileDialog dialog(this,
 void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 {
     wxFileDialog dialog(this,

-                        _T("Testing save file dialog"),
+                        wxT("Testing save file dialog"),

                         wxEmptyString,
                         wxEmptyString,

-                        _T("myletter.doc"),
-                        _T("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"),
+                        wxT("myletter.doc"),
+                        wxT("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"),

                         wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
 
     dialog.SetFilterIndex(1);
 
     if (dialog.ShowModal() == wxID_OK)
     {
                         wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
 
     dialog.SetFilterIndex(1);
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxLogMessage(_T("%s, filter %d"),
+        wxLogMessage(wxT("%s, filter %d"),

                      dialog.GetPath().c_str(), dialog.GetFilterIndex());
     }
 }
                      dialog.GetPath().c_str(), dialog.GetFilterIndex());
     }
 }


@@ -1236,10 +1466,10 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
     wxGenericFileDialog dialog
                  (
                     this,
     wxGenericFileDialog dialog
                  (
                     this,

-                    _T("Testing open file dialog"),
+                    wxT("Testing open file dialog"),

                     wxEmptyString,
                     wxEmptyString,
                     wxEmptyString,
                     wxEmptyString,

-                    _T("C++ files (*.cpp;*.h)|*.cpp;*.h")
+                    wxT("C++ files (*.cpp;*.h)|*.cpp;*.h")

                  );
 
     dialog.SetExtraControlCreator(&createMyExtraPanel);
                  );
 
     dialog.SetExtraControlCreator(&createMyExtraPanel);


@@ -1248,13 +1478,13 @@ void MyFrame::FileOpenGeneric(wxCommandEvent& WXUNUSED(event) )
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString info;
     if (dialog.ShowModal() == wxID_OK)
     {
         wxString info;

-        info.Printf(_T("Full file name: %s\n")
-                    _T("Path: %s\n")
-                    _T("Name: %s"),
+        info.Printf(wxT("Full file name: %s\n")
+                    wxT("Path: %s\n")
+                    wxT("Name: %s"),

                     dialog.GetPath().c_str(),
                     dialog.GetDirectory().c_str(),
                     dialog.GetFilename().c_str());
                     dialog.GetPath().c_str(),
                     dialog.GetDirectory().c_str(),
                     dialog.GetFilename().c_str());

-        wxMessageDialog dialog2(this, info, _T("Selected file"));
+        wxMessageDialog dialog2(this, info, wxT("Selected file"));

         dialog2.ShowModal();
     }
 }
         dialog2.ShowModal();
     }
 }


@@ -1265,8 +1495,8 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
     int buttons = wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel"));
     wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), 1);
 
     int buttons = wxSystemOptions::GetOptionInt(wxT("wince.dialog.real-ok-cancel"));
     wxSystemOptions::SetOption(wxT("wince.dialog.real-ok-cancel"), 1);
 

-    wxString wildcards = _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
-    wxGenericFileDialog dialog(this, _T("Testing open multiple file dialog"),
+    wxString wildcards = wxT("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h");
+    wxGenericFileDialog dialog(this, wxT("Testing open multiple file dialog"),

                         wxEmptyString, wxEmptyString, wildcards,
                         wxFD_MULTIPLE);
 
                         wxEmptyString, wxEmptyString, wildcards,
                         wxFD_MULTIPLE);
 


@@ -1281,15 +1511,15 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
         size_t count = paths.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {
         size_t count = paths.GetCount();
         for ( size_t n = 0; n < count; n++ )
         {

-            s.Printf(_T("File %d: %s (%s)\n"),
+            s.Printf(wxT("File %d: %s (%s)\n"),

                      (int)n, paths[n].c_str(), filenames[n].c_str());
 
             msg += s;
         }
                      (int)n, paths[n].c_str(), filenames[n].c_str());
 
             msg += s;
         }

-        s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex());
+        s.Printf(wxT("Filter index: %d"), dialog.GetFilterIndex());

         msg += s;
 
         msg += s;
 

-        wxMessageDialog dialog2(this, msg, _T("Selected files"));
+        wxMessageDialog dialog2(this, msg, wxT("Selected files"));

         dialog2.ShowModal();
     }
 
         dialog2.ShowModal();
     }
 


@@ -1300,17 +1530,17 @@ void MyFrame::FilesOpenGeneric(wxCommandEvent& WXUNUSED(event) )
 void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) )
 {
     wxGenericFileDialog dialog(this,
 void MyFrame::FileSaveGeneric(wxCommandEvent& WXUNUSED(event) )
 {
     wxGenericFileDialog dialog(this,

-                        _T("Testing save file dialog"),
+                        wxT("Testing save file dialog"),

                         wxEmptyString,
                         wxEmptyString,

-                        _T("myletter.doc"),
-                        _T("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"),
+                        wxT("myletter.doc"),
+                        wxT("Text files (*.txt)|*.txt|Document files (*.doc;*.ods)|*.doc;*.ods"),

                         wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
 
     dialog.SetFilterIndex(1);
 
     if (dialog.ShowModal() == wxID_OK)
     {
                         wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
 
     dialog.SetFilterIndex(1);
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxLogMessage(_T("%s, filter %d"),
+        wxLogMessage(wxT("%s, filter %d"),

                      dialog.GetPath().c_str(), dialog.GetFilterIndex());
     }
 }
                      dialog.GetPath().c_str(), dialog.GetFilterIndex());
     }
 }


@@ -1323,11 +1553,11 @@ void MyFrame::DoDirChoose(int style)
     wxString dirHome;
     wxGetHomeDir(&dirHome);
 
     wxString dirHome;
     wxGetHomeDir(&dirHome);
 

-    wxDirDialog dialog(this, _T("Testing directory picker"), dirHome, style);
+    wxDirDialog dialog(this, wxT("Testing directory picker"), dirHome, style);

 
     if (dialog.ShowModal() == wxID_OK)
     {
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxLogMessage(_T("Selected path: %s"), dialog.GetPath().c_str());
+        wxLogMessage(wxT("Selected path: %s"), dialog.GetPath().c_str());

     }
 }
 
     }
 }
 


@@ -1349,11 +1579,11 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
     wxString dirHome;
     wxGetHomeDir(&dirHome);
 
     wxString dirHome;
     wxGetHomeDir(&dirHome);
 

-    wxGenericDirDialog dialog(this, _T("Testing generic directory picker"), dirHome);
+    wxGenericDirDialog dialog(this, wxT("Testing generic directory picker"), dirHome);

 
     if (dialog.ShowModal() == wxID_OK)
     {
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxMessageDialog dialog2(this, dialog.GetPath(), _T("Selected path"));
+        wxMessageDialog dialog2(this, dialog.GetPath(), wxT("Selected path"));

         dialog2.ShowModal();
     }
 }
         dialog2.ShowModal();
     }
 }


@@ -1395,18 +1625,18 @@ void MyFrame::ModelessDlg(wxCommandEvent& event)
 
 void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::DlgCenteredScreen(wxCommandEvent& WXUNUSED(event))
 {

-    wxDialog dlg(this, wxID_ANY, _T("Dialog centered on screen"),
+    wxDialog dlg(this, wxID_ANY, wxT("Dialog centered on screen"),

                  wxDefaultPosition, wxSize(200, 100));
                  wxDefaultPosition, wxSize(200, 100));

-    (new wxButton(&dlg, wxID_OK, _T("Close")))->Centre();
+    (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre();

     dlg.CentreOnScreen();
     dlg.ShowModal();
 }
 
 void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
 {
     dlg.CentreOnScreen();
     dlg.ShowModal();
 }
 
 void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
 {

-    wxDialog dlg(this, wxID_ANY, _T("Dialog centered on parent"),
+    wxDialog dlg(this, wxID_ANY, wxT("Dialog centered on parent"),

                  wxDefaultPosition, wxSize(200, 100));
                  wxDefaultPosition, wxSize(200, 100));

-    (new wxButton(&dlg, wxID_OK, _T("Close")))->Centre();
+    (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre();

     dlg.CentreOnParent();
     dlg.ShowModal();
 }
     dlg.CentreOnParent();
     dlg.ShowModal();
 }


@@ -1414,16 +1644,16 @@ void MyFrame::DlgCenteredParent(wxCommandEvent& WXUNUSED(event))
 #if wxUSE_MINIFRAME
 void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_MINIFRAME
 void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
 {

-    wxFrame *frame = new wxMiniFrame(this, wxID_ANY, _T("Mini frame"),
+    wxFrame *frame = new wxMiniFrame(this, wxID_ANY, wxT("Mini frame"),

                                      wxDefaultPosition, wxSize(300, 100),
                                      wxCAPTION | wxCLOSE_BOX);
     new wxStaticText(frame,
                      wxID_ANY,
                                      wxDefaultPosition, wxSize(300, 100),
                                      wxCAPTION | wxCLOSE_BOX);
     new wxStaticText(frame,
                      wxID_ANY,

-                     _T("Mini frames have slightly different appearance"),
+                     wxT("Mini frames have slightly different appearance"),

                      wxPoint(5, 5));
     new wxStaticText(frame,
                      wxID_ANY,
                      wxPoint(5, 5));
     new wxStaticText(frame,
                      wxID_ANY,

-                     _T("from the normal frames but that's the only difference."),
+                     wxT("from the normal frames but that's the only difference."),

                      wxPoint(5, 25));
 
     frame->CentreOnParent();
                      wxPoint(5, 25));
 
     frame->CentreOnParent();


@@ -1433,10 +1663,10 @@ void MyFrame::MiniFrame(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::DlgOnTop(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::DlgOnTop(wxCommandEvent& WXUNUSED(event))
 {

-    wxDialog dlg(this, wxID_ANY, _T("Dialog staying on top of other windows"),
+    wxDialog dlg(this, wxID_ANY, wxT("Dialog staying on top of other windows"),

                  wxDefaultPosition, wxSize(300, 100),
                  wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP);
                  wxDefaultPosition, wxSize(300, 100),
                  wxDEFAULT_DIALOG_STYLE | wxSTAY_ON_TOP);

-    (new wxButton(&dlg, wxID_OK, _T("Close")))->Centre();
+    (new wxButton(&dlg, wxID_OK, wxT("Close")))->Centre();

     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }
 


@@ -1454,13 +1684,13 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event))
         s_index = rand() % 5;
     }
 
         s_index = rand() % 5;
     }
 

-    wxTipProvider *tipProvider = wxCreateFileTipProvider(_T("tips.txt"), s_index);
+    wxTipProvider *tipProvider = wxCreateFileTipProvider(wxT("tips.txt"), s_index);

 
     bool showAtStartup = wxShowTip(this, tipProvider);
 
     if ( showAtStartup )
     {
 
     bool showAtStartup = wxShowTip(this, tipProvider);
 
     if ( showAtStartup )
     {

-        wxMessageBox(_T("Will show tips on startup"), _T("Tips dialog"),
+        wxMessageBox(wxT("Will show tips on startup"), wxT("Tips dialog"),

                      wxOK | wxICON_INFORMATION, this);
     }
 
                      wxOK | wxICON_INFORMATION, this);
     }
 


@@ -1479,7 +1709,7 @@ void MyFrame::OnPropertySheet(wxCommandEvent& event)
 
 void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event))
 {

-    wxLogStatus(_T("Sleeping for 3 seconds to allow you to switch to another window"));
+    wxLogStatus(wxT("Sleeping for 3 seconds to allow you to switch to another window"));

 
     wxSleep(3);
 
 
     wxSleep(3);
 


@@ -1521,10 +1751,9 @@ void MyFrame::OnNotifMsgShow(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnNotifMsgHide(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnNotifMsgHide(wxCommandEvent& WXUNUSED(event))
 {

-    if ( m_notifMsg )
+    if ( m_notifMsg && !m_notifMsg->Close() )

     {
     {

-        if ( !m_notifMsg->Close() )
-            wxLogStatus("Failed to hide manual notification message");
+        wxLogStatus("Failed to hide manual notification message");

     }
 }
 
     }
 }
 


@@ -1608,25 +1837,26 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 {
     static const int max = 100;
 
 {
     static const int max = 100;
 

-    wxProgressDialog dialog(_T("Progress dialog example"),
-                            _T("An informative message"),
+    wxProgressDialog dialog("Progress dialog example",
+                            // "Reserve" enough space for the multiline
+                            // messages below, we'll change it anyhow
+                            // immediately in the loop below
+                            wxString(' ', 100) + "\n\n\n\n",

                             max,    // range
                             this,   // parent
                             wxPD_CAN_ABORT |
                             wxPD_CAN_SKIP |
                             wxPD_APP_MODAL |
                             max,    // range
                             this,   // parent
                             wxPD_CAN_ABORT |
                             wxPD_CAN_SKIP |
                             wxPD_APP_MODAL |

-                            // wxPD_AUTO_HIDE | -- try this as well
+                            //wxPD_AUTO_HIDE | // -- try this as well

                             wxPD_ELAPSED_TIME |
                             wxPD_ESTIMATED_TIME |
                             wxPD_ELAPSED_TIME |
                             wxPD_ESTIMATED_TIME |

-                            wxPD_REMAINING_TIME
-                            | wxPD_SMOOTH // - makes indeterminate mode bar on WinXP very small
+                            wxPD_REMAINING_TIME |
+                            wxPD_SMOOTH // - makes indeterminate mode bar on WinXP very small

                             );
 
     bool cont = true;
     for ( int i = 0; i <= max; i++ )
     {
                             );
 
     bool cont = true;
     for ( int i = 0; i <= max; i++ )
     {

-        wxMilliSleep(200);
-

         wxString msg;
 
         // test both modes of wxProgressDialog behaviour: start in
         wxString msg;
 
         // test both modes of wxProgressDialog behaviour: start in


@@ -1635,15 +1865,25 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 
         if ( i == max )
         {
 
         if ( i == max )
         {

-            msg = _T("That's all, folks!");
+            msg = "That's all, folks!\n"
+                  "\n"
+                  "Nothing to see here any more.";

         }
         else if ( !determinate )
         {
         }
         else if ( !determinate )
         {

-            msg = _T("Testing indeterminate mode");
+            msg = "Testing indeterminate mode\n"
+                  "\n"
+                  "This mode allows you to show to the user\n"
+                  "that something is going on even if you don't know\n"
+                  "when exactly will you finish.";

         }
         else if ( determinate )
         {
         }
         else if ( determinate )
         {

-            msg = _T("Now in standard determinate mode");
+            msg = "Now in standard determinate mode\n"
+                  "\n"
+                  "This is the standard usage mode in which you\n"
+                  "update the dialog after performing each new step of work.\n"
+                  "It requires knowing the total number of steps in advance.";

         }
 
         // will be set to true if "Skip" button was pressed
         }
 
         // will be set to true if "Skip" button was pressed


@@ -1659,18 +1899,25 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 
         // each skip will move progress about quarter forward
         if ( skip )
 
         // each skip will move progress about quarter forward
         if ( skip )

+        {

             i += max/4;
 
             i += max/4;
 

+            if ( i >= 100 )
+                i = 99;
+        }
+

         if ( !cont )
         {
         if ( !cont )
         {

-            if ( wxMessageBox(_T("Do you really want to cancel?"),
-                              _T("Progress dialog question"),  // caption
+            if ( wxMessageBox(wxT("Do you really want to cancel?"),
+                              wxT("Progress dialog question"),  // caption

                               wxYES_NO | wxICON_QUESTION) == wxYES )
                 break;
 
             cont = true;
             dialog.Resume();
         }
                               wxYES_NO | wxICON_QUESTION) == wxYES )
                 break;
 
             cont = true;
             dialog.Resume();
         }

+
+        wxMilliSleep(200);

     }
 
     if ( !cont )
     }
 
     if ( !cont )


@@ -1689,18 +1936,24 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 
 static void InitAboutInfoMinimal(wxAboutDialogInfo& info)
 {
 
 static void InitAboutInfoMinimal(wxAboutDialogInfo& info)
 {

-    info.SetName(_T("Dialogs Sample"));
-    info.SetVersion(wxVERSION_NUM_DOT_STRING_T);
-    info.SetDescription(_T("This sample shows different wxWidgets dialogs"));
-    info.SetCopyright(_T("(C) 1998-2006 wxWidgets dev team"));
-    info.AddDeveloper(_T("Vadim Zeitlin"));
+    info.SetName(wxT("Dialogs Sample"));
+    info.SetVersion(wxVERSION_NUM_DOT_STRING,
+                    wxString::Format
+                    (
+                        "%s version %s",
+                        wxMINOR_VERSION % 2 ? "Development" : "Stable",
+                        wxVERSION_NUM_DOT_STRING
+                    ));
+    info.SetDescription(wxT("This sample shows different wxWidgets dialogs"));
+    info.SetCopyright(wxT("(C) 1998-2006 wxWidgets dev team"));
+    info.AddDeveloper(wxT("Vadim Zeitlin"));

 }
 
 static void InitAboutInfoWebsite(wxAboutDialogInfo& info)
 {
     InitAboutInfoMinimal(info);
 
 }
 
 static void InitAboutInfoWebsite(wxAboutDialogInfo& info)
 {
     InitAboutInfoMinimal(info);
 

-    info.SetWebSite(_T("http://www.wxwidgets.org/"), _T("wxWidgets web site"));
+    info.SetWebSite(wxT("http://www.wxwidgets.org/"), wxT("wxWidgets web site"));

 }
 
 static void InitAboutInfoAll(wxAboutDialogInfo& info)
 }
 
 static void InitAboutInfoAll(wxAboutDialogInfo& info)


@@ -1708,13 +1961,13 @@ static void InitAboutInfoAll(wxAboutDialogInfo& info)
     InitAboutInfoWebsite(info);
 
     // we can add a second developer
     InitAboutInfoWebsite(info);
 
     // we can add a second developer

-    info.AddDeveloper(_T("A.N. Other"));
+    info.AddDeveloper(wxT("A.N. Other"));

 
     // or we can add several persons at once like this
     static const wxChar *docwriters[] =
     {
 
     // or we can add several persons at once like this
     static const wxChar *docwriters[] =
     {

-        _T("First D. Writer"),
-        _T("Second One"),
+        wxT("First D. Writer"),
+        wxT("Second One"),

     };
 
     info.SetDocWriters(wxArrayString(WXSIZEOF(docwriters), docwriters));
     };
 
     info.SetDocWriters(wxArrayString(WXSIZEOF(docwriters), docwriters));


@@ -1733,7 +1986,7 @@ static void InitAboutInfoAll(wxAboutDialogInfo& info)
 "                    ...and so on and so forth...\n"
     ));
 
 "                    ...and so on and so forth...\n"
     ));
 

-    info.AddTranslator(_T("Wun Ngo Wen (Martian)"));
+    info.AddTranslator(wxT("Wun Ngo Wen (Martian)"));

 }
 
 void MyFrame::ShowSimpleAboutDialog(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::ShowSimpleAboutDialog(wxCommandEvent& WXUNUSED(event))


@@ -1773,7 +2026,7 @@ public:
     virtual void DoAddCustomControls()
     {
         AddControl(new wxStaticLine(this), wxSizerFlags().Expand());
     virtual void DoAddCustomControls()
     {
         AddControl(new wxStaticLine(this), wxSizerFlags().Expand());

-        AddText(_T("Some custom text"));
+        AddText(wxT("Some custom text"));

         AddControl(new wxStaticLine(this), wxSizerFlags().Expand());
     }
 };
         AddControl(new wxStaticLine(this), wxSizerFlags().Expand());
     }
 };


@@ -1795,7 +2048,7 @@ void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event))
 {
     wxWindowDisabler disableAll;
 
 {
     wxWindowDisabler disableAll;
 

-    wxBusyInfo info(_T("Working, please wait..."), this);
+    wxBusyInfo info(wxT("Working, please wait..."), this);

 
     for ( int i = 0; i < 18; i++ )
     {
 
     for ( int i = 0; i < 18; i++ )
     {


@@ -1815,8 +2068,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_dlgReplace )
     {
 {
     if ( m_dlgReplace )
     {

-        delete m_dlgReplace;
-        m_dlgReplace = NULL;
+        wxDELETE(m_dlgReplace);

     }
     else
     {
     }
     else
     {


@@ -1824,7 +2076,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) )
                            (
                             this,
                             &m_findData,
                            (
                             this,
                             &m_findData,

-                            _T("Find and replace dialog"),
+                            wxT("Find and replace dialog"),

                             wxFR_REPLACEDIALOG
                            );
 
                             wxFR_REPLACEDIALOG
                            );
 


@@ -1836,8 +2088,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_dlgFind )
     {
 {
     if ( m_dlgFind )
     {

-        delete m_dlgFind;
-        m_dlgFind = NULL;
+        wxDELETE(m_dlgFind);

     }
     else
     {
     }
     else
     {


@@ -1845,7 +2096,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
                         (
                             this,
                             &m_findData,
                         (
                             this,
                             &m_findData,

-                            _T("Find dialog"),
+                            wxT("Find dialog"),

                             // just for testing
                             wxFR_NOWHOLEWORD
                         );
                             // just for testing
                             wxFR_NOWHOLEWORD
                         );


@@ -1857,10 +2108,10 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
 static wxString DecodeFindDialogEventFlags(int flags)
 {
     wxString str;
 static wxString DecodeFindDialogEventFlags(int flags)
 {
     wxString str;

-    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");
+    str << (flags & wxFR_DOWN ? wxT("down") : wxT("up")) << wxT(", ")
+        << (flags & wxFR_WHOLEWORD ? wxT("whole words only, ") : wxT(""))
+        << (flags & wxFR_MATCHCASE ? wxT("") : wxT("not "))
+        << wxT("case sensitive");

 
     return str;
 }
 
     return str;
 }


@@ -1880,7 +2131,7 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
                 type == wxEVT_COMMAND_FIND_REPLACE_ALL )
     {
         wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"),
                 type == wxEVT_COMMAND_FIND_REPLACE_ALL )
     {
         wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"),

-                     type == wxEVT_COMMAND_FIND_REPLACE_ALL ? _T("all ") : wxT(""),
+                     type == wxEVT_COMMAND_FIND_REPLACE_ALL ? wxT("all ") : wxT(""),

                      event.GetFindString().c_str(),
                      event.GetReplaceString().c_str(),
                      DecodeFindDialogEventFlags(event.GetFlags()).c_str());
                      event.GetFindString().c_str(),
                      event.GetReplaceString().c_str(),
                      DecodeFindDialogEventFlags(event.GetFlags()).c_str());


@@ -1893,22 +2144,22 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
         const wxChar *txt;
         if ( dlg == m_dlgFind )
         {
         const wxChar *txt;
         if ( dlg == m_dlgFind )
         {

-            txt = _T("Find");
+            txt = wxT("Find");

             idMenu = DIALOGS_FIND;
             m_dlgFind = NULL;
         }
         else if ( dlg == m_dlgReplace )
         {
             idMenu = DIALOGS_FIND;
             m_dlgFind = NULL;
         }
         else if ( dlg == m_dlgReplace )
         {

-            txt = _T("Replace");
+            txt = wxT("Replace");

             idMenu = DIALOGS_REPLACE;
             m_dlgReplace = NULL;
         }
         else
         {
             idMenu = DIALOGS_REPLACE;
             m_dlgReplace = NULL;
         }
         else
         {

-            txt = _T("Unknown");
+            txt = wxT("Unknown");

             idMenu = wxID_ANY;
 
             idMenu = wxID_ANY;
 

-            wxFAIL_MSG( _T("unexpected event") );
+            wxFAIL_MSG( wxT("unexpected event") );

         }
 
         wxLogMessage(wxT("%s dialog is being closed."), txt);
         }
 
         wxLogMessage(wxT("%s dialog is being closed."), txt);


@@ -1935,13 +2186,11 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
 void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);
 void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
     wxPaintDC dc(this);

-    dc.SetFont(wxGetApp().m_canvasFont);
-    dc.SetTextForeground(wxGetApp().m_canvasTextColour);

     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.DrawText(
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.DrawText(

-                _T("wxWidgets common dialogs")
+                wxT("wxWidgets common dialogs")

 #if !defined(__SMARTPHONE__)
 #if !defined(__SMARTPHONE__)

-                _T(" test application")
+                wxT(" test application")

 #endif
                 , 10, 10);
 }
 #endif
                 , 10, 10);
 }


@@ -1953,12 +2202,12 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
 // ----------------------------------------------------------------------------
 
 MyModelessDialog::MyModelessDialog(wxWindow *parent)
 // ----------------------------------------------------------------------------
 
 MyModelessDialog::MyModelessDialog(wxWindow *parent)

-                : wxDialog(parent, wxID_ANY, wxString(_T("Modeless dialog")))
+                : wxDialog(parent, wxID_ANY, wxString(wxT("Modeless dialog")))

 {
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
 {
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 

-    wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, _T("Press me"));
-    wxCheckBox *check = new wxCheckBox(this, wxID_ANY, _T("Should be disabled"));
+    wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, wxT("Press me"));
+    wxCheckBox *check = new wxCheckBox(this, wxID_ANY, wxT("Should be disabled"));

     check->Disable();
 
     sizerTop->Add(btn, 1, wxEXPAND | wxALL, 5);
     check->Disable();
 
     sizerTop->Add(btn, 1, wxEXPAND | wxALL, 5);


@@ -1969,7 +2218,7 @@ MyModelessDialog::MyModelessDialog(wxWindow *parent)
 
 void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("Button pressed in modeless dialog"), _T("Info"),
+    wxMessageBox(wxT("Button pressed in modeless dialog"), wxT("Info"),

                  wxOK | wxICON_INFORMATION, this);
 }
 
                  wxOK | wxICON_INFORMATION, this);
 }
 


@@ -1977,8 +2226,8 @@ void MyModelessDialog::OnClose(wxCloseEvent& event)
 {
     if ( event.CanVeto() )
     {
 {
     if ( event.CanVeto() )
     {

-        wxMessageBox(_T("Use the menu item to close this dialog"),
-                     _T("Modeless dialog"),
+        wxMessageBox(wxT("Use the menu item to close this dialog"),
+                     wxT("Modeless dialog"),

                      wxOK | wxICON_INFORMATION, this);
 
         event.Veto();
                      wxOK | wxICON_INFORMATION, this);
 
         event.Veto();


@@ -1990,13 +2239,13 @@ void MyModelessDialog::OnClose(wxCloseEvent& event)
 // ----------------------------------------------------------------------------
 
 MyModalDialog::MyModalDialog(wxWindow *parent)
 // ----------------------------------------------------------------------------
 
 MyModalDialog::MyModalDialog(wxWindow *parent)

-             : wxDialog(parent, wxID_ANY, wxString(_T("Modal dialog")))
+             : wxDialog(parent, wxID_ANY, wxString(wxT("Modal dialog")))

 {
     wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
 {
     wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 

-    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"));
+    m_btnModal = new wxButton(this, wxID_ANY, wxT("&Modal dialog..."));
+    m_btnModeless = new wxButton(this, wxID_ANY, wxT("Mode&less dialog"));
+    m_btnDelete = new wxButton(this, wxID_ANY, wxT("&Delete button"));

 
     sizerTop->Add(m_btnModal, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_btnModeless, 0, wxALIGN_CENTER | wxALL, 5);
 
     sizerTop->Add(m_btnModal, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_btnModeless, 0, wxALIGN_CENTER | wxALL, 5);


@@ -2015,19 +2264,17 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
 {
     if ( event.GetEventObject() == m_btnDelete )
     {
 {
     if ( event.GetEventObject() == m_btnDelete )
     {

-        delete m_btnModal;
-        m_btnModal = NULL;
-
+        wxDELETE(m_btnModal);

         m_btnDelete->Disable();
     }
     else if ( event.GetEventObject() == m_btnModal )
     {
 #if wxUSE_TEXTDLG
         m_btnDelete->Disable();
     }
     else if ( event.GetEventObject() == m_btnModal )
     {
 #if wxUSE_TEXTDLG

-        wxGetTextFromUser(_T("Dummy prompt"),
-                          _T("Modal dialog called from dialog"),
+        wxGetTextFromUser(wxT("Dummy prompt"),
+                          wxT("Modal dialog called from dialog"),

                           wxEmptyString, this);
 #else
                           wxEmptyString, this);
 #else

-        wxMessageBox(_T("Modal dialog called from dialog"));
+        wxMessageBox(wxT("Modal dialog called from dialog"));

 #endif // wxUSE_TEXTDLG
     }
     else if ( event.GetEventObject() == m_btnModeless )
 #endif // wxUSE_TEXTDLG
     }
     else if ( event.GetEventObject() == m_btnModeless )


@@ -2047,7 +2294,7 @@ void MyModalDialog::OnButton(wxCommandEvent& event)
 // ----------------------------------------------------------------------------
 
 StdButtonSizerDialog::StdButtonSizerDialog(wxWindow *parent)
 // ----------------------------------------------------------------------------
 
 StdButtonSizerDialog::StdButtonSizerDialog(wxWindow *parent)

-    : wxDialog(parent, wxID_ANY, wxString(_T("StdButtonSizer dialog")),
+    : wxDialog(parent, wxID_ANY, wxString(wxT("StdButtonSizer dialog")),

       wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER),
       m_buttonsSizer(NULL)
 {
       wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER),
       m_buttonsSizer(NULL)
 {


@@ -2385,6 +2632,9 @@ wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent)
     return panel;
 }
 
     return panel;
 }
 

+#endif // USE_SETTINGS_DIALOG
+
+#if wxUSE_MSGDLG

 // ----------------------------------------------------------------------------
 // TestMessageBoxDialog
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // TestMessageBoxDialog
 // ----------------------------------------------------------------------------


@@ -2407,6 +2657,10 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent)
                     : wxDialog(parent, wxID_ANY, "Message Box Test Dialog",
                                wxDefaultPosition, wxDefaultSize,
                                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
                     : wxDialog(parent, wxID_ANY, "Message Box Test Dialog",
                                wxDefaultPosition, wxDefaultSize,
                                wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)

+{
+}
+
+bool TestMessageBoxDialog::Create()

 {
     wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
 
 {
     wxSizer * const sizerTop = new wxBoxSizer(wxVERTICAL);
 


@@ -2427,8 +2681,13 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent)
 
     sizerTop->Add(sizerMsgs, wxSizerFlags(1).Expand().Border());
 
 
     sizerTop->Add(sizerMsgs, wxSizerFlags(1).Expand().Border());
 

+    // if a derived class provides more message configurations, add these.
+    AddAdditionalTextOptions(sizerTop);

 
     // this one is for configuring the buttons
 
     // this one is for configuring the buttons

+    wxSizer * const
+    sizerBtnsBox = new wxStaticBoxSizer(wxVERTICAL, this, "&Buttons");
+

     wxFlexGridSizer * const sizerBtns = new wxFlexGridSizer(2, 5, 5);
     sizerBtns->AddGrowableCol(1);
 
     wxFlexGridSizer * const sizerBtns = new wxFlexGridSizer(2, 5, 5);
     sizerBtns->AddGrowableCol(1);
 


@@ -2450,20 +2709,29 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent)
                              this);
     }
 
                              this);
     }
 

-    wxSizer * const
-        sizerBtnsBox = new wxStaticBoxSizer(wxVERTICAL, this, "&Buttons");

     sizerBtnsBox->Add(sizerBtns, wxSizerFlags(1).Expand());
     sizerTop->Add(sizerBtnsBox, wxSizerFlags().Expand().Border());
 
 
     // icon choice
     sizerBtnsBox->Add(sizerBtns, wxSizerFlags(1).Expand());
     sizerTop->Add(sizerBtnsBox, wxSizerFlags().Expand().Border());
 
 
     // icon choice

-    const wxString icons[] = {
-        "&Information", "&Question", "&Warning", "&Error"
+    const wxString icons[] =
+    {
+        "&Not specified",
+        "E&xplicitly none",
+        "&Information icon",
+        "&Question icon",
+        "&Warning icon",
+        "&Error icon"

     };
 
     };
 

-    m_icons = new wxRadioBox(this, wxID_ANY, "&Icon:",
+   wxCOMPILE_TIME_ASSERT( WXSIZEOF(icons) == MsgDlgIcon_Max, IconMismatch );
+
+    m_icons = new wxRadioBox(this, wxID_ANY, "&Icon style",

                              wxDefaultPosition, wxDefaultSize,
                              wxDefaultPosition, wxDefaultSize,

-                             WXSIZEOF(icons), icons);
+                             WXSIZEOF(icons), icons,
+                             2, wxRA_SPECIFY_ROWS);
+    // Make the 'Information' icon the default one:
+    m_icons->SetSelection(MsgDlgIcon_Info);

     sizerTop->Add(m_icons, wxSizerFlags().Expand().Border());
 
 
     sizerTop->Add(m_icons, wxSizerFlags().Expand().Border());
 
 


@@ -2482,6 +2750,9 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent)
     m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent");
     sizerFlags->Add(m_chkCentre, wxSizerFlags(1).Border());
 
     m_chkCentre = new wxCheckBox(this, wxID_ANY, "Centre on &parent");
     sizerFlags->Add(m_chkCentre, wxSizerFlags(1).Border());
 

+    // add any additional flag from subclasses
+    AddAdditionalFlags(sizerFlags);
+

     sizerTop->Add(sizerFlags, wxSizerFlags().Expand().Border());
 
     // finally buttons to show the resulting message box and close this dialog
     sizerTop->Add(sizerFlags, wxSizerFlags().Expand().Border());
 
     // finally buttons to show the resulting message box and close this dialog


@@ -2491,6 +2762,8 @@ TestMessageBoxDialog::TestMessageBoxDialog(wxWindow *parent)
     SetSizerAndFit(sizerTop);
 
     m_buttons[Btn_Ok]->SetValue(true);
     SetSizerAndFit(sizerTop);
 
     m_buttons[Btn_Ok]->SetValue(true);

+
+    return true;

 }
 
 void TestMessageBoxDialog::OnUpdateLabelUI(wxUpdateUIEvent& event)
 }
 
 void TestMessageBoxDialog::OnUpdateLabelUI(wxUpdateUIEvent& event)


@@ -2512,7 +2785,7 @@ void TestMessageBoxDialog::OnUpdateNoDefaultUI(wxUpdateUIEvent& event)
     event.Enable( m_buttons[Btn_No]->IsChecked() );
 }
 
     event.Enable( m_buttons[Btn_No]->IsChecked() );
 }
 

-void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
+long TestMessageBoxDialog::GetStyle()

 {
     long style = 0;
 
 {
     long style = 0;
 


@@ -2524,10 +2797,31 @@ void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
 
     switch ( m_icons->GetSelection() )
     {
 
     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 MsgDlgIcon_Max:
+            wxFAIL_MSG( "unexpected selection" );
+
+        case MsgDlgIcon_No:
+            break;
+
+        case MsgDlgIcon_None:
+            style |= wxICON_NONE;
+            break;
+
+        case MsgDlgIcon_Info:
+            style |= wxICON_INFORMATION;
+            break;
+
+        case MsgDlgIcon_Question:
+            style |= wxICON_QUESTION;
+            break;
+
+        case MsgDlgIcon_Warning:
+            style |= wxICON_WARNING;
+            break;
+
+        case MsgDlgIcon_Error:
+            style |= wxICON_ERROR;
+            break;

     }
 
     if ( m_chkCentre->IsChecked() )
     }
 
     if ( m_chkCentre->IsChecked() )


@@ -2536,9 +2830,13 @@ void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
     if ( m_chkNoDefault->IsEnabled() && m_chkNoDefault->IsChecked() )
         style |= wxNO_DEFAULT;
 
     if ( m_chkNoDefault->IsEnabled() && m_chkNoDefault->IsChecked() )
         style |= wxNO_DEFAULT;
 

+    return style;
+}
+
+void TestMessageBoxDialog::PrepareMessageDialog(wxMessageDialogBase &dlg)
+{
+    long style = dlg.GetMessageDialogStyle();

 
 

-    wxMessageDialog dlg(this, m_textMsg->GetValue(), "Test Message Box",
-                        style);

     if ( !m_textExtMsg->IsEmpty() )
         dlg.SetExtendedMessage(m_textExtMsg->GetValue());
 
     if ( !m_textExtMsg->IsEmpty() )
         dlg.SetExtendedMessage(m_textExtMsg->GetValue());
 


@@ -2568,6 +2866,12 @@ void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
             dlg.SetOKLabel(m_labels[Btn_Ok]->GetValue());
         }
     }
             dlg.SetOKLabel(m_labels[Btn_Ok]->GetValue());
         }
     }

+}
+
+void TestMessageBoxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageDialog dlg(this, GetMessage(), "Test Message Box", GetStyle());
+    PrepareMessageDialog(dlg);

 
     dlg.ShowModal();
 }
 
     dlg.ShowModal();
 }


@@ -2576,8 +2880,69 @@ void TestMessageBoxDialog::OnClose(wxCommandEvent& WXUNUSED(event))
 {
     EndModal(wxID_CANCEL);
 }
 {
     EndModal(wxID_CANCEL);
 }

+#endif // wxUSE_MSGDLG

 
 

-#endif // USE_SETTINGS_DIALOG
+#if wxUSE_RICHMSGDLG
+// ----------------------------------------------------------------------------
+// TestRichMessageDialog
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(TestRichMessageDialog, TestMessageBoxDialog)
+    EVT_BUTTON(wxID_APPLY, TestRichMessageDialog::OnApply)
+END_EVENT_TABLE()
+
+TestRichMessageDialog::TestRichMessageDialog(wxWindow *parent)
+                     : TestMessageBoxDialog(parent)
+{
+    SetTitle("Rich Message Dialog Test Dialog");
+}
+
+void TestRichMessageDialog::AddAdditionalTextOptions(wxSizer *sizer)
+{
+    wxSizer * const sizerMsgs = new wxStaticBoxSizer(wxVERTICAL, this,
+                                                     "&Additional Elements");
+
+    // add a option to show a check box.
+    wxFlexGridSizer * const sizerCheckBox = new wxFlexGridSizer(2, 5, 5);
+    sizerCheckBox->AddGrowableCol(1);
+    sizerCheckBox->Add(new wxStaticText(this, wxID_ANY, "&Check box:"));
+    m_textCheckBox = new wxTextCtrl(this, wxID_ANY);
+    sizerCheckBox->Add(m_textCheckBox, wxSizerFlags(1).Expand().Border(wxBOTTOM));
+    sizerMsgs->Add(sizerCheckBox, wxSizerFlags(1).Expand());
+
+    // add option to show a detailed text.
+    sizerMsgs->Add(new wxStaticText(this, wxID_ANY, "&Detailed message:"));
+    m_textDetailed = new wxTextCtrl(this, wxID_ANY, "",
+                                    wxDefaultPosition, wxDefaultSize,
+                                    wxTE_MULTILINE);
+    sizerMsgs->Add(m_textDetailed, wxSizerFlags(1).Expand());
+
+    sizer->Add(sizerMsgs, wxSizerFlags(1).Expand().Border());
+}
+
+void TestRichMessageDialog::AddAdditionalFlags(wxSizer *sizer)
+{
+    // add checkbox to set the initial state for the checkbox shown
+    // in the dialog.
+    m_initialValueCheckBox =
+        new wxCheckBox(this, wxID_ANY, "Checkbox initially checked");
+    sizer->Add(m_initialValueCheckBox, wxSizerFlags(1).Border());
+}
+
+void TestRichMessageDialog::OnApply(wxCommandEvent& WXUNUSED(event))
+{
+    wxRichMessageDialog dlg(this, GetMessage(), "Test Rich Message Dialog",
+                            GetStyle());
+    PrepareMessageDialog(dlg);
+
+    dlg.ShowCheckBox(m_textCheckBox->GetValue(),
+                     m_initialValueCheckBox->GetValue());
+    dlg.ShowDetailedText(m_textDetailed->GetValue());
+
+    dlg.ShowModal();
+}
+
+#endif // wxUSE_RICHMSGDLG

 
 #if wxUSE_LOG
 
 
 #if wxUSE_LOG