fix for wxFrame parent which somehow wasn't committed yesterday

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 08d8abd3c74e700e21e7dad89fe34fb0cc9d8220..2dcbb0b92e6ff9057756484d1d5d9f88c911c9c1 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -91,8 +91,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     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)
@@ -100,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()
 
@@ -188,6 +188,8 @@ MyFrame::MyFrame(wxWindow *parent,
        : wxFrame(parent, -1, title, pos, size)
 {
     m_dialog = (MyModelessDialog *)NULL;
+
+    CreateStatusBar();
 }
 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
@@ -278,20 +280,20 @@ void MyFrame::LogDialog(wxCommandEvent& event)
     // 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!");
+        wxLogMessage(wxT("This is some message - everything is ok so far."));
+        wxLogMessage(wxT("Another message...\n... this one is on multiple lines"));
+        wxLogWarning(wxT("And then something went wrong!"));
 
         // and if ~wxBusyCursor doesn't do it, then call it manually
         wxYield();
     }
 
-    wxLogError("Intermediary error handler decided to abort.");
-    wxLogError("The top level caller detected an unrecoverable error.");
+    wxLogError(wxT("Intermediary error handler decided to abort."));
+    wxLogError(wxT("The top level caller detected an unrecoverable error."));
 
     wxLog::FlushActive();
 
-    wxLogMessage("And this is the same dialog but with only one message.");
+    wxLogMessage(wxT("And this is the same dialog but with only one message."));
 }
 
 void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) )
@@ -333,7 +335,7 @@ void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
                                          this);
     if ( !!pwd )
     {
-        wxMessageBox(wxString::Format("Your password is '%s'", pwd.c_str()),
+        wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()),
                      "Got password", wxOK | wxICON_INFORMATION, this);
     }
 }
@@ -386,10 +388,10 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
     if ( count )
     {
         wxString msg;
-        msg.Printf("You selected %u items:\n", count);
+        msg.Printf(wxT("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],
+            msg += wxString::Format(wxT("\t%u: %u (%s)\n"), n, selections[n],
                                     choices[selections[n]].c_str());
         }
         wxLogMessage(msg);
@@ -399,7 +401,9 @@ void MyFrame::MultiChoice(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",
+                        "", "",
+                        "C++ files (*.h;*.cpp)|*.h;*.cpp");
 
     if (dialog.ShowModal() == wxID_OK)
     {
@@ -513,8 +517,8 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
         dialog2.ShowModal();
     }
 #else
-    wxLogError("Sorry, generic dir dialog not available:\n"
-               "set wxUSE_DIRDLGG to 1 and recompile");
+    wxLogError(wxT("Sorry, generic dir dialog not available:\n")
+               wxT("set wxUSE_DIRDLGG to 1 and recompile"));
 #endif
 }
 
@@ -543,12 +547,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
@@ -619,11 +617,11 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) )
 
     if ( !cont )
     {
-        wxLogStatus("Progress dialog aborted!");
+        wxLogStatus(wxT("Progress dialog aborted!"));
     }
     else
     {
-        wxLogStatus("Countdown from %d finished", max);
+        wxLogStatus(wxT("Countdown from %d finished"), max);
     }
 }
 
@@ -640,7 +638,7 @@ void MyFrame::ShowReplaceDialog( wxCommandEvent& WXUNUSED(event) )
                                         "Find and replace dialog",
                                         wxFR_REPLACEDIALOG
                                       );
-    dialog->Show();
+    dialog->Show(TRUE);
 }
 
 void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
@@ -653,7 +651,7 @@ void MyFrame::ShowFindDialog( wxCommandEvent& WXUNUSED(event) )
                                         // just for testing
                                         wxFR_NOWHOLEWORD
                                       );
-    dialog->Show();
+    dialog->Show(TRUE);
 }
 
 static wxString DecodeFindDialogEventFlags(int flags)
@@ -673,7 +671,7 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
 
     if ( type == wxEVT_COMMAND_FIND || type == wxEVT_COMMAND_FIND_NEXT )
     {
-        wxLogMessage("Find %s'%s' (flags: %s)",
+        wxLogMessage(wxT("Find %s'%s' (flags: %s)"),
                      type == wxEVT_COMMAND_FIND_NEXT ? "next " : "",
                      event.GetFindString().c_str(),
                      DecodeFindDialogEventFlags(event.GetFlags()).c_str());
@@ -681,7 +679,7 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
     else if ( type == wxEVT_COMMAND_FIND_REPLACE ||
                 type == wxEVT_COMMAND_FIND_REPLACE_ALL )
     {
-        wxLogMessage("Replace %s'%s' with '%s' (flags: %s)",
+        wxLogMessage(wxT("Replace %s'%s' with '%s' (flags: %s)"),
                      type == wxEVT_COMMAND_FIND_REPLACE_ALL ? "all " : "",
                      event.GetFindString().c_str(),
                      event.GetReplaceString().c_str(),
@@ -689,13 +687,13 @@ void MyFrame::OnFindDialog(wxFindDialogEvent& event)
     }
     else if ( type == wxEVT_COMMAND_FIND_CLOSE )
     {
-        wxLogMessage("Find dialog is being closed.");
+        wxLogMessage(wxT("Find dialog is being closed."));
 
         event.GetDialog()->Destroy();
     }
     else
     {
-        wxLogError("Unknown find dialog event!");
+        wxLogError(wxT("Unknown find dialog event!"));
     }
 }
 
@@ -737,6 +735,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() )