reverted my previous change to WINVER - it is already defined elsewhere

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 7477d7de43c7cc8a195c6228f8fb6c3de43cc3d9..632fdf155d61da75e5548413ec2020c74981a5e8 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -25,11 +25,13 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include <wx/colordlg.h>
-#include <wx/filedlg.h>
-#include <wx/dirdlg.h>
-#include <wx/fontdlg.h>
-#include <wx/choicdlg.h>
+#include "wx/colordlg.h"
+#include "wx/filedlg.h"
+#include "wx/dirdlg.h"
+#include "wx/fontdlg.h"
+#include "wx/choicdlg.h"
+#include "wx/tipdlg.h"
+#include "wx/progdlg.h"

 
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 
 
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 


@@ -38,24 +40,72 @@
 #include <wx/generic/fontdlgg.h>
 #endif
 
 #include <wx/generic/fontdlgg.h>
 #endif
 

+#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
+// New wxGenericDirCtrl
+#include "wx/dirctrl.h"
+#endif
+

 #include "dialogs.h"
 
 IMPLEMENT_APP(MyApp)
 
 #include "dialogs.h"
 
 IMPLEMENT_APP(MyApp)
 

-MyCanvas *myCanvas = (MyCanvas *) NULL;
+BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+    EVT_PAINT(MyCanvas::OnPaint)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(DIALOGS_CHOOSE_COLOUR,                 MyFrame::ChooseColour)
+    EVT_MENU(DIALOGS_CHOOSE_FONT,                   MyFrame::ChooseFont)
+    EVT_MENU(DIALOGS_LOG_DIALOG,                    MyFrame::LogDialog)
+    EVT_MENU(DIALOGS_MESSAGE_BOX,                   MyFrame::MessageBox)
+    EVT_MENU(DIALOGS_TEXT_ENTRY,                    MyFrame::TextEntry)
+    EVT_MENU(DIALOGS_PASSWORD_ENTRY,                MyFrame::PasswordEntry)
+    EVT_MENU(DIALOGS_NUM_ENTRY,                     MyFrame::NumericEntry)
+    EVT_MENU(DIALOGS_SINGLE_CHOICE,                 MyFrame::SingleChoice)
+    EVT_MENU(DIALOGS_MULTI_CHOICE,                  MyFrame::MultiChoice)
+    EVT_MENU(DIALOGS_FILE_OPEN,                     MyFrame::FileOpen)
+    EVT_MENU(DIALOGS_FILE_OPEN2,                    MyFrame::FileOpen2)
+    EVT_MENU(DIALOGS_FILES_OPEN,                    MyFrame::FilesOpen)
+    EVT_MENU(DIALOGS_FILE_SAVE,                     MyFrame::FileSave)
+    EVT_MENU(DIALOGS_DIR_CHOOSE,                    MyFrame::DirChoose)
+    EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE,            MyFrame::GenericDirChoose)
+    EVT_MENU(DIALOGS_MODAL,                         MyFrame::ModalDlg)
+    EVT_MENU(DIALOGS_MODELESS,                      MyFrame::ModelessDlg)
+    EVT_MENU(DIALOGS_TIP,                           MyFrame::ShowTip)
+#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
+    EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC,         MyFrame::ChooseColourGeneric)
+    EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC,           MyFrame::ChooseFontGeneric)
+#endif
+#if wxUSE_PROGRESSDLG
+    EVT_MENU(DIALOGS_PROGRESS,                      MyFrame::ShowProgress)
+#endif
+    EVT_MENU(wxID_EXIT,                             MyFrame::OnExit)
+
+    EVT_BUTTON(DIALOGS_MODELESS_BTN,                MyFrame::OnButton)
+END_EVENT_TABLE()

 
 

-// A macro needed for some compilers (AIX) that need 'main' to be defined
-// in the application itself.
-IMPLEMENT_WXWIN_MAIN
+BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
+    EVT_BUTTON(-1, MyModalDialog::OnButton)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyModelessDialog, wxDialog)
+    EVT_CLOSE(MyModelessDialog::OnClose)
+END_EVENT_TABLE()
+
+MyCanvas *myCanvas = (MyCanvas *) NULL;

 
 // `Main program' equivalent, creating windows and returning main app frame
 
 // `Main program' equivalent, creating windows and returning main app frame

-bool MyApp::OnInit(void)
+bool MyApp::OnInit()

 {
 {

+#if defined(__WXGTK__) && defined(wxUSE_UNICODE)
+  wxConvCurrent = &wxConvLibc;
+#endif
+

   m_canvasTextColour = wxColour("BLACK");
   m_canvasFont = *wxNORMAL_FONT;
 
   // Create the main frame window
   m_canvasTextColour = wxColour("BLACK");
   m_canvasFont = *wxNORMAL_FONT;
 
   // Create the main frame window

-  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows dialogs example", wxPoint(50, 50), wxSize(400, 300));
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxWindows dialogs example", wxPoint(20, 20), wxSize(400, 300));

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


@@ -74,19 +124,30 @@ bool MyApp::OnInit(void)
 
 #endif
   file_menu->AppendSeparator();
 
 #endif
   file_menu->AppendSeparator();

-  file_menu->Append(DIALOGS_MESSAGE_BOX, "&Message box");
-  file_menu->Append(DIALOGS_TEXT_ENTRY,  "Text &entry");
-  file_menu->Append(DIALOGS_SINGLE_CHOICE,  "&Single choice");
+  file_menu->Append(DIALOGS_LOG_DIALOG, "&Log dialog\tCtrl-L");
+  file_menu->Append(DIALOGS_MESSAGE_BOX, "&Message box\tCtrl-M");
+  file_menu->Append(DIALOGS_TEXT_ENTRY,  "Text &entry\tCtrl-E");
+  file_menu->Append(DIALOGS_PASSWORD_ENTRY,  "&Password entry\tCtrl-P");
+  file_menu->Append(DIALOGS_NUM_ENTRY, "&Numeric entry\tCtrl-N");
+  file_menu->Append(DIALOGS_SINGLE_CHOICE,  "&Single choice\tCtrl-C");
+  file_menu->Append(DIALOGS_MULTI_CHOICE,  "M&ultiple choice\tCtrl-U");

   file_menu->AppendSeparator();
   file_menu->AppendSeparator();

-  file_menu->Append(DIALOGS_FILE_OPEN,  "&Open file");
-  file_menu->Append(DIALOGS_FILE_SAVE,  "Sa&ve file");
-#ifndef __WXGTK__
-  // don't add a menu entry for something that isn't in wxGTK. It only
-  // confuses the user
-  file_menu->Append(DIALOGS_DIR_CHOOSE,  "&Choose a directory");
-#endif
+  file_menu->Append(DIALOGS_TIP,  "&Tip of the day\tCtrl-T");
+  file_menu->AppendSeparator();
+  file_menu->Append(DIALOGS_FILE_OPEN,  "&Open file\tCtrl-O");
+  file_menu->Append(DIALOGS_FILE_OPEN2,  "&Second open file\tCtrl-2");
+  file_menu->Append(DIALOGS_FILES_OPEN,  "Open &files\tCtrl-Q");
+  file_menu->Append(DIALOGS_FILE_SAVE,  "Sa&ve file\tCtrl-S");
+  file_menu->Append(DIALOGS_DIR_CHOOSE,  "&Choose a directory\tCtrl-D");
+  file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  "&Choose a directory (generic implementation)");
+#if wxUSE_PROGRESSDLG
+  file_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G");
+#endif // wxUSE_PROGRESSDLG

   file_menu->AppendSeparator();
   file_menu->AppendSeparator();

-  file_menu->Append(wxID_EXIT, "E&xit");
+  file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-F");
+  file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE);
+  file_menu->AppendSeparator();
+  file_menu->Append(wxID_EXIT, "E&xit\tAlt-X");

   wxMenuBar *menu_bar = new wxMenuBar;
   menu_bar->Append(file_menu, "&File");
   frame->SetMenuBar(menu_bar);
   wxMenuBar *menu_bar = new wxMenuBar;
   menu_bar->Append(file_menu, "&File");
   frame->SetMenuBar(menu_bar);


@@ -95,7 +156,7 @@ bool MyApp::OnInit(void)
   myCanvas->SetBackgroundColour(*wxWHITE);
 
   frame->Centre(wxBOTH);
   myCanvas->SetBackgroundColour(*wxWHITE);
 
   frame->Centre(wxBOTH);

-  
+

   // Show the frame
   frame->Show(TRUE);
 
   // Show the frame
   frame->Show(TRUE);
 


@@ -105,31 +166,36 @@ bool MyApp::OnInit(void)
 }
 
 // My frame constructor
 }
 
 // My frame constructor

-MyFrame::MyFrame(wxWindow *parent, const wxString& title, const wxPoint& pos, const wxSize& size):
-  wxFrame(parent, -1, title, pos, size)
-{}
+MyFrame::MyFrame(wxWindow *parent,
+                 const wxString& title,
+                 const wxPoint& pos,
+                 const wxSize& size)
+       : wxFrame(parent, -1, title, pos, size)
+{
+    m_dialog = (MyModelessDialog *)NULL;
+}

 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
 {

-      wxColourData data;
-      data.SetChooseFull(TRUE);
-      for (int i = 0; i < 16; i++)
-      {
+    wxColourData data;
+    data.SetChooseFull(TRUE);
+    for (int i = 0; i < 16; i++)
+    {

         wxColour colour(i*16, i*16, i*16);
         data.SetCustomColour(i, colour);
         wxColour colour(i*16, i*16, i*16);
         data.SetCustomColour(i, colour);

-      }
-      
-      wxColourDialog *dialog = new wxColourDialog(this, &data);
-      if (dialog->ShowModal() == wxID_OK)
-      {
+    }
+
+    wxColourDialog *dialog = new wxColourDialog(this, &data);
+    dialog->SetTitle("Choose the background colour");
+    if (dialog->ShowModal() == wxID_OK)
+    {

         wxColourData retData = dialog->GetColourData();
         wxColour col = retData.GetColour();
         wxColourData retData = dialog->GetColourData();
         wxColour col = retData.GetColour();

-//        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID);

         myCanvas->SetBackgroundColour(col);
         myCanvas->Clear();
         myCanvas->Refresh();
         myCanvas->SetBackgroundColour(col);
         myCanvas->Clear();
         myCanvas->Refresh();

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

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


@@ -137,7 +203,7 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
       wxFontData data;
       data.SetInitialFont(wxGetApp().m_canvasFont);
       data.SetColour(wxGetApp().m_canvasTextColour);
       wxFontData data;
       data.SetInitialFont(wxGetApp().m_canvasFont);
       data.SetColour(wxGetApp().m_canvasTextColour);

-      
+

       wxFontDialog *dialog = new wxFontDialog(this, &data);
       if (dialog->ShowModal() == wxID_OK)
       {
       wxFontDialog *dialog = new wxFontDialog(this, &data);
       if (dialog->ShowModal() == wxID_OK)
       {


@@ -146,7 +212,7 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
         wxGetApp().m_canvasTextColour = retData.GetColour();
         myCanvas->Refresh();
       }
         wxGetApp().m_canvasTextColour = retData.GetColour();
         myCanvas->Refresh();
       }

-      dialog->Close();
+      dialog->Destroy();

 }
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
 }
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW


@@ -159,7 +225,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
         wxColour colour(i*16, i*16, i*16);
         data.SetCustomColour(i, colour);
       }
         wxColour colour(i*16, i*16, i*16);
         data.SetCustomColour(i, colour);
       }

-      
+

       wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &data);
       if (dialog->ShowModal() == wxID_OK)
       {
       wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &data);
       if (dialog->ShowModal() == wxID_OK)
       {


@@ -170,7 +236,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
         myCanvas->Clear();
         myCanvas->Refresh();
       }
         myCanvas->Clear();
         myCanvas->Refresh();
       }

-      dialog->Close();
+      dialog->Destroy();

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


@@ -187,27 +253,86 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
         wxGetApp().m_canvasTextColour = retData.GetColour();
         myCanvas->Refresh();
       }
         wxGetApp().m_canvasTextColour = retData.GetColour();
         myCanvas->Refresh();
       }

-      dialog->Close();
+      dialog->Destroy();
+}
+#endif // wxTEST_GENERIC_DIALOGS_IN_MSW
+
+void MyFrame::LogDialog(wxCommandEvent& event)
+{
+    // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages
+    // being flushed -- test it
+    {
+        wxBusyCursor bc;
+        wxLogMessage("This is some message - everything is ok so far.");
+        wxLogMessage("Another message...\n... this one is on multiple lines");
+        wxLogWarning("And then something went wrong!");
+    }
+
+    wxLogError("Intermediary error handler decided to abort.");
+    wxLogError("The top level caller detected an unrecoverable error.");
+
+    wxLog::FlushActive();
+
+    wxLogMessage("And this is the same dialog but with only one message.");

 }
 }

-#endif

 
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
 {

-  wxMessageDialog dialog(this, "This is a message box\nA long, long string to test out the message box properly",
-       "Message box text", wxYES_NO|wxCANCEL);
+  wxMessageDialog dialog( NULL, "This is a message box\nA long, long string to test out the message box properly",
+      "Message box text", wxYES_NO|wxCANCEL|wxICON_INFORMATION);

 
   dialog.ShowModal();
 }
 
 
   dialog.ShowModal();
 }
 

-void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::NumericEntry(wxCommandEvent& WXUNUSED(event) )
+{
+    long res = wxGetNumberFromUser( "This is some text, actually a lot of text.\n"
+                                    "Even two rows of text.",
+                                    "Enter a number:", "Numeric input test",
+                                     50, 0, 100, this );
+
+    wxString msg;
+    int icon;
+    if ( res == -1 )
+    {
+        msg = "Invalid number entered or dialog cancelled.";
+        icon = wxICON_HAND;
+    }
+    else
+    {
+        msg.Printf(_T("You've entered %lu"), res );
+        icon = wxICON_INFORMATION;
+    }
+
+    wxMessageBox(msg, "Numeric test result", wxOK | icon, this);
+}
+
+void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
+{
+    wxString pwd = wxGetPasswordFromUser("Enter password:",
+                                         "Password entry dialog",
+                                         "",
+                                         this);
+    if ( !!pwd )
+    {
+        wxMessageBox(wxString::Format("Your password is '%s'", pwd.c_str()),
+                     "Got password", wxOK | wxICON_INFORMATION, this);
+    }
+}
+
+void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))

 {
 {

-  wxTextEntryDialog dialog(this, "This is a small sample\nA long, long string to test out the text entrybox",
-       "Please enter a string", "Default value", wxOK|wxCANCEL);
+  wxTextEntryDialog dialog(this,
+                           "This is a small sample\n"
+                           "A long, long string to test out the text entrybox",
+                           "Please enter a string",
+                           "Default value",
+                           wxOK | wxCANCEL);

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

-       wxMessageDialog dialog2(this, dialog.GetValue(), "Got string");
-       dialog2.ShowModal();
+    wxMessageDialog dialog2(this, dialog.GetValue(), "Got string");
+    dialog2.ShowModal();

   }
 }
 
   }
 }
 


@@ -228,76 +353,352 @@ void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
     }
 }
 
     }
 }
 

+void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
+{
+    const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ;
+    int n = 5;
+
+    wxArrayInt selections;
+    size_t count = wxGetMultipleChoices(selections,
+                                        "This is a small sample\n"
+                                        "A multi-choice convenience dialog",
+                                        "Please select a value",
+                                        n, (const wxString *)choices,
+                                        this);
+    if ( count )
+    {
+        wxString msg;
+        msg.Printf("You selected %u items:\n", count);
+        for ( size_t n = 0; n < count; n++ )
+        {
+            msg += wxString::Format("\t%u: %u (%s)\n", n, selections[n],
+                                    choices[selections[n]].c_str());
+        }
+        wxLogMessage(msg);
+    }
+    //else: cancelled or nothing selected
+}
+

 void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 {
 void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 {

-       wxFileDialog dialog(this, "Testing open file dialog", "", "", "*.txt", 0);
+    wxFileDialog dialog(this, "Testing open file dialog", "", "", "*.txt", 0);

 
 

-       if (dialog.ShowModal() == wxID_OK)
-       {
-               wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
-               dialog2.ShowModal();
-       }
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        wxString info;
+        info.Printf(_T("Full file name: %s\n")
+                    _T("Path: %s\n")
+                    _T("Name: %s"),
+                    dialog.GetPath().c_str(),
+                    dialog.GetDirectory().c_str(),
+                    dialog.GetFilename().c_str());
+        wxMessageDialog dialog2(this, info, "Selected file");
+        dialog2.ShowModal();
+    }
+}
+
+// this shows how to take advantage of specifying a default extension in the
+// call to wxFileSelector: it is remembered after each new call and the next
+// one will use it by default
+void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
+{
+    static wxString s_extDef;
+    wxString path = wxFileSelector(
+                                    _T("Select the file to load"),
+                                    _T(""), _T(""),
+                                    s_extDef,
+                                    _T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (*.*)|*.*"),
+                                    0,
+                                    this
+                                   );
+
+    if ( !path )
+        return;
+
+    // it is just a sample, would use wxSplitPath in real program
+    s_extDef = path.AfterLast(_T('.'));
+
+    wxLogMessage(_T("You selected the file '%s', remembered extension '%s'"),
+                 (const wxChar*) path, (const wxChar*) s_extDef);
+}
+
+void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
+{
+    wxFileDialog dialog(this, "Testing open multiple file dialog",
+                        "", "", wxFileSelectorDefaultWildcardStr,
+                        wxMULTIPLE);
+
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        wxArrayString paths, filenames;
+
+        dialog.GetPaths(paths);
+        dialog.GetFilenames(filenames);
+
+        wxString msg, s;
+        size_t count = paths.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            s.Printf(_T("File %d: %s (%s)\n"),
+                     n, paths[n].c_str(), filenames[n].c_str());
+
+            msg += s;
+        }
+
+        wxMessageDialog dialog2(this, msg, "Selected files");
+        dialog2.ShowModal();
+    }

 }
 
 void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
 {

-       wxFileDialog dialog(this, "Testing save file dialog", "", "",
-               "Text files (*.txt)|*.txt|Document files (*.doc)|*.doc",
-               wxSAVE|wxOVERWRITE_PROMPT);
-
-       if (dialog.ShowModal() == wxID_OK)
-       {
-               char buf[400];
-               sprintf(buf, "%s, filter %d", (const char *)dialog.GetPath(), dialog.GetFilterIndex());
-               wxMessageDialog dialog2(this, wxString(buf), "Selected path");
-               dialog2.ShowModal();
-       }
+    wxFileDialog dialog(this, "Testing save file dialog", "", "myletter.txt",
+        "Text files (*.txt)|*.txt|Document files (*.doc)|*.doc",
+        wxSAVE|wxOVERWRITE_PROMPT);
+
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        wxChar buf[400];
+        wxSprintf(buf, _T("%s, filter %d"), (const wxChar*)dialog.GetPath(), dialog.GetFilterIndex());
+        wxMessageDialog dialog2(this, wxString(buf), "Selected path");
+        dialog2.ShowModal();
+    }

 }
 
 void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
 {
 }
 
 void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
 {

-#ifndef __WXGTK__
-       wxDirDialog dialog(this, "Testing directory picker", "");
-
-       if (dialog.ShowModal() == wxID_OK)
-       {
-               wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
-               dialog2.ShowModal();
-       }
+    // pass some initial dir to wxDirDialog
+    wxString dirHome;
+    wxGetHomeDir(&dirHome);
+
+    wxDirDialog dialog(this, "Testing directory picker", dirHome);
+
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
+        dialog2.ShowModal();
+    }
+}
+
+void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
+{
+#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
+    // pass some initial dir to wxDirDialog
+    wxString dirHome;
+    wxGetHomeDir(&dirHome);
+
+    wxGenericDirDialog dialog(this, "Testing generic directory picker", dirHome);
+
+    if (dialog.ShowModal() == wxID_OK)
+    {
+        wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
+        dialog2.ShowModal();
+    }
+#else
+    wxLogError("Sorry, generic dir dialog not available:\n"
+               "set wxUSE_DIRDLGG to 1 and recompile");
+#endif
+}
+
+void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event))
+{
+    MyModalDialog dlg(this);
+    dlg.ShowModal();
+}
+
+void MyFrame::ModelessDlg(wxCommandEvent& event)
+{
+    bool show = GetMenuBar()->IsChecked(event.GetId());
+
+    if ( show )
+    {
+        if ( !m_dialog )
+        {
+            m_dialog = new MyModelessDialog(this);
+        }
+
+        m_dialog->Show(TRUE);
+    }
+    else // hide
+    {
+        m_dialog->Hide();
+    }
+}
+
+void MyFrame::OnButton(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox("Button pressed in modeless dialog", "Info",
+                 wxOK | wxICON_INFORMATION, this);
+}
+
+void MyFrame::ShowTip(wxCommandEvent& event)
+{
+#if wxUSE_STARTUP_TIPS
+    static size_t s_index = (size_t)-1;
+
+    if ( s_index == (size_t)-1 )
+    {
+        srand(time(NULL));
+
+        // this is completely bogus, we don't know how many lines are there
+        // in the file, but who cares, it's a demo only...
+        s_index = rand() % 5;
+    }
+
+    wxTipProvider *tipProvider = wxCreateFileTipProvider("tips.txt", s_index);
+
+    bool showAtStartup = wxShowTip(this, tipProvider);
+
+    if ( showAtStartup )
+    {
+        wxMessageBox("Will show tips on startup", "Tips dialog",
+                     wxOK | wxICON_INFORMATION, this);
+    }
+
+    s_index = tipProvider->GetCurrentTip();
+    delete tipProvider;

 #endif
 }
 
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )
 {
 #endif
 }
 
 void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )
 {

-       Close(TRUE);
+    Close(TRUE);

 }
 
 }
 

+#if wxUSE_PROGRESSDLG
+
+void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
+{
+    static const int max = 10;
+
+    wxProgressDialog dialog("Progress dialog example",
+                            "An informative message",
+                            max,    // range
+                            this,   // parent
+                            wxPD_CAN_ABORT |
+                            wxPD_APP_MODAL |
+                            wxPD_ELAPSED_TIME |
+                            wxPD_ESTIMATED_TIME |
+                            wxPD_REMAINING_TIME);
+
+    bool cont = TRUE;
+    for ( int i = 0; i <= max && cont; i++ )
+    {
+        wxSleep(1);
+        if ( i == max )
+        {
+            cont = dialog.Update(i, "That's all, folks!");
+        }
+        else if ( i == max / 2 )
+        {
+            cont = dialog.Update(i, "Only a half left (very long message)!");
+        }
+        else
+        {
+            cont = dialog.Update(i);
+        }
+    }
+
+    if ( !cont )
+    {
+        wxLogStatus("Progress dialog aborted!");
+    }
+    else
+    {
+        wxLogStatus("Countdown from %d finished", max);
+    }
+}
+
+#endif // wxUSE_PROGRESSDLG
+
+// ----------------------------------------------------------------------------
+// MyCanvas
+// ----------------------------------------------------------------------------
+

 void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {
 void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
 {

-       wxPaintDC dc(this);
+    wxPaintDC dc(this);

     dc.SetFont(wxGetApp().m_canvasFont);
     dc.SetTextForeground(wxGetApp().m_canvasTextColour);
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.DrawText("wxWindows common dialogs test application", 10, 10);
 }
 
     dc.SetFont(wxGetApp().m_canvasFont);
     dc.SetTextForeground(wxGetApp().m_canvasTextColour);
     dc.SetBackgroundMode(wxTRANSPARENT);
     dc.DrawText("wxWindows common dialogs test application", 10, 10);
 }
 

-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-       EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
+// ----------------------------------------------------------------------------
+// MyModelessDialog
+// ----------------------------------------------------------------------------

 
 

-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-       EVT_MENU(DIALOGS_CHOOSE_COLOUR,                         MyFrame::ChooseColour)
-       EVT_MENU(DIALOGS_CHOOSE_FONT,                           MyFrame::ChooseFont)
-       EVT_MENU(DIALOGS_MESSAGE_BOX,                           MyFrame::MessageBox)
-       EVT_MENU(DIALOGS_TEXT_ENTRY,                            MyFrame::TextEntry)
-       EVT_MENU(DIALOGS_SINGLE_CHOICE,                         MyFrame::SingleChoice)
-       EVT_MENU(DIALOGS_FILE_OPEN,                                     MyFrame::FileOpen)
-       EVT_MENU(DIALOGS_FILE_SAVE,                                     MyFrame::FileSave)
-       EVT_MENU(DIALOGS_DIR_CHOOSE,                            MyFrame::DirChoose)
-#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
-       EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC,         MyFrame::ChooseColourGeneric)
-       EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC,           MyFrame::ChooseFontGeneric)
-#endif
-       EVT_MENU(wxID_EXIT,                                                     MyFrame::OnExit)
-END_EVENT_TABLE()
+MyModelessDialog::MyModelessDialog(wxWindow *parent)
+                : wxDialog(parent, -1, wxString("Modeless dialog"))
+{
+    wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
+
+    wxButton *btn = new wxButton(this, DIALOGS_MODELESS_BTN, "Press me");
+    wxCheckBox *check = new wxCheckBox(this, -1, "Should be disabled");
+    check->Disable();
+
+    sizerTop->Add(btn, 1, wxEXPAND | wxALL, 5);
+    sizerTop->Add(check, 1, wxEXPAND | wxALL, 5);
+
+    SetAutoLayout(TRUE);
+    SetSizer(sizerTop);
+
+    sizerTop->SetSizeHints(this);
+    sizerTop->Fit(this);
+}

 
 

+void MyModelessDialog::OnClose(wxCloseEvent& event)
+{
+    if ( event.CanVeto() )
+    {
+        wxMessageBox("Use the menu item to close this dialog",
+                     "Modeless dialog",
+                     wxOK | wxICON_INFORMATION, this);
+
+        event.Veto();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// MyModalDialog
+// ----------------------------------------------------------------------------
+
+MyModalDialog::MyModalDialog(wxWindow *parent)
+             : wxDialog(parent, -1, wxString("Modal dialog"))
+{
+    wxBoxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
+
+    m_btnFocused = new wxButton(this, -1, "Default button");
+    m_btnDelete = new wxButton(this, -1, "&Delete button");
+    sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5);
+    sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5);
+
+    SetAutoLayout(TRUE);
+    SetSizer(sizerTop);
+
+    sizerTop->SetSizeHints(this);
+    sizerTop->Fit(this);
+
+    m_btnFocused->SetFocus();
+    m_btnFocused->SetDefault();
+}
+
+void MyModalDialog::OnButton(wxCommandEvent& event)
+{
+    if ( event.GetEventObject() == m_btnDelete )
+    {
+        delete m_btnFocused;
+        m_btnFocused = NULL;
+
+        m_btnDelete->Disable();
+    }
+    else if ( event.GetEventObject() == m_btnFocused )
+    {
+        wxGetTextFromUser("Dummy prompt", "Modal dialog called from dialog",
+                          "", this);
+    }
+    else
+    {
+        event.Skip();
+    }
+}