minor clean up

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index f2d8a6ead2814aaa40e9744511385bbd60718a3d..0e04f3effa8f2fff49b7949efa04650cd8583571 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -32,9 +32,7 @@
 #include "wx/choicdlg.h"
 #include "wx/tipdlg.h"
 #include "wx/progdlg.h"
-
-// New wxGenericDirCtrl
-#include "wx/dirctrl.h"
+#include "wx/fdrepdlg.h"
 
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 
@@ -43,6 +41,11 @@
 #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)
@@ -76,10 +79,18 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 #endif
 #if wxUSE_PROGRESSDLG
     EVT_MENU(DIALOGS_PROGRESS,                      MyFrame::ShowProgress)
-#endif
+#endif // wxUSE_PROGRESSDLG
+#if wxUSE_FINDREPLDLG
+    EVT_MENU(DIALOGS_FIND,                          MyFrame::ShowFindDialog)
+    EVT_MENU(DIALOGS_REPLACE,                       MyFrame::ShowReplaceDialog)
+
+    EVT_FIND(-1, MyFrame::OnFindDialog)
+    EVT_FIND_NEXT(-1, MyFrame::OnFindDialog)
+    EVT_FIND_REPLACE(-1, MyFrame::OnFindDialog)
+    EVT_FIND_REPLACE_ALL(-1, MyFrame::OnFindDialog)
+    EVT_FIND_CLOSE(-1, MyFrame::OnFindDialog)
+#endif // wxUSE_FINDREPLDLG
     EVT_MENU(wxID_EXIT,                             MyFrame::OnExit)
-
-    EVT_BUTTON(DIALOGS_MODELESS_BTN,                MyFrame::OnButton)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
@@ -87,6 +98,8 @@ BEGIN_EVENT_TABLE(MyModalDialog, wxDialog)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyModelessDialog, wxDialog)
+    EVT_BUTTON(DIALOGS_MODELESS_BTN, MyModelessDialog::OnButton)
+
     EVT_CLOSE(MyModelessDialog::OnClose)
 END_EVENT_TABLE()
 
@@ -141,8 +154,12 @@ bool MyApp::OnInit()
 #if wxUSE_PROGRESSDLG
   file_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G");
 #endif // wxUSE_PROGRESSDLG
+#if wxUSE_FINDREPLDLG
+  file_menu->Append(DIALOGS_FIND, "&Find dialog\tCtrl-F");
+  file_menu->Append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F");
+#endif // wxUSE_FINDREPLDLG
   file_menu->AppendSeparator();
-  file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-F");
+  file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-D");
   file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE);
   file_menu->AppendSeparator();
   file_menu->Append(wxID_EXIT, "E&xit\tAlt-X");
@@ -264,6 +281,9 @@ void MyFrame::LogDialog(wxCommandEvent& event)
         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!");
+
+        // and if ~wxBusyCursor doesn't do it, then call it manually
+        wxYield();
     }
 
     wxLogError("Intermediary error handler decided to abort.");
@@ -379,6 +399,8 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 {
+//    wxFAIL_MSG( "Test assert" );
+
     wxFileDialog dialog(this, "Testing open file dialog", "", "", "*.txt", 0);
 
     if (dialog.ShowModal() == wxID_OK)
@@ -400,6 +422,9 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 // one will use it by default
 void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
 {
+    wxOnAssert( "Test assert.txt", 20, "Test" );
+    return;
+
     static wxString s_extDef;
     wxString path = wxFileSelector(
                                     _T("Select the file to load"),
@@ -480,6 +505,7 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
 {
+#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
     // pass some initial dir to wxDirDialog
     wxString dirHome;
     wxGetHomeDir(&dirHome);
@@ -491,6 +517,10 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
         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))
@@ -518,12 +548,6 @@ void MyFrame::ModelessDlg(wxCommandEvent& event)
     }
 }
 
-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
@@ -604,6 +628,78 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 
 #endif // wxUSE_PROGRESSDLG
 
+#if wxUSE_FINDREPLDLG
+
+void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) )
+{
+    wxFindReplaceDialog *dialog = new wxFindReplaceDialog
+                                      (
+                                        this,
+                                        &m_findData,
+                                        "Find and replace dialog",
+                                        wxFR_REPLACEDIALOG
+                                      );
+    dialog->Show();
+}
+
+void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
+{
+    wxFindReplaceDialog *dialog = new wxFindReplaceDialog
+                                      (
+                                        this,
+                                        &m_findData,
+                                        "Find dialog",
+                                        // just for testing
+                                        wxFR_NOWHOLEWORD
+                                      );
+    dialog->Show();
+}
+
+static wxString DecodeFindDialogEventFlags(int flags)
+{
+    wxString str;
+    str << (flags & wxFR_DOWN ? "down" : "up") << ", "
+        << (flags & wxFR_WHOLEWORD ? "whole words only, " : "")
+        << (flags & wxFR_MATCHCASE ? "" : "not ")
+        << "case sensitive";
+
+    return str;
+}
+
+void MyFrame::OnFindDialog(wxFindDialogEvent& event)
+{
+    wxEventType type = event.GetEventType();
+
+    if ( type == wxEVT_COMMAND_FIND || type == wxEVT_COMMAND_FIND_NEXT )
+    {
+        wxLogMessage("Find %s'%s' (flags: %s)",
+                     type == wxEVT_COMMAND_FIND_NEXT ? "next " : "",
+                     event.GetFindString().c_str(),
+                     DecodeFindDialogEventFlags(event.GetFlags()).c_str());
+    }
+    else if ( type == wxEVT_COMMAND_FIND_REPLACE ||
+                type == wxEVT_COMMAND_FIND_REPLACE_ALL )
+    {
+        wxLogMessage("Replace %s'%s' with '%s' (flags: %s)",
+                     type == wxEVT_COMMAND_FIND_REPLACE_ALL ? "all " : "",
+                     event.GetFindString().c_str(),
+                     event.GetReplaceString().c_str(),
+                     DecodeFindDialogEventFlags(event.GetFlags()).c_str());
+    }
+    else if ( type == wxEVT_COMMAND_FIND_CLOSE )
+    {
+        wxLogMessage("Find dialog is being closed.");
+
+        event.GetDialog()->Destroy();
+    }
+    else
+    {
+        wxLogError("Unknown find dialog event!");
+    }
+}
+
+#endif // wxUSE_FINDREPLDLG
+
 // ----------------------------------------------------------------------------
 // MyCanvas
 // ----------------------------------------------------------------------------
@@ -640,6 +736,12 @@ MyModelessDialog::MyModelessDialog(wxWindow *parent)
     sizerTop->Fit(this);
 }
 
+void MyModelessDialog::OnButton(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox("Button pressed in modeless dialog", "Info",
+                 wxOK | wxICON_INFORMATION, this);
+}
+
 void MyModelessDialog::OnClose(wxCloseEvent& event)
 {
     if ( event.CanVeto() )