Version updates, manual date change, no change to dragimmg.cpp

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 077243681cd7944685b6ce85a2e084bcffea23ea..18d11c22490430c366318208af1f18ce9045cc97 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -38,13 +38,14 @@
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
-#include <wx/generic/colrdlgg.h>
-#include <wx/generic/fontdlgg.h>
+#include "wx/generic/colrdlgg.h"
+#include "wx/generic/fontdlgg.h"
 #endif
 
+#define wxUSE_DIRDLGG 0
+
 #if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
-// New wxGenericDirCtrl
-#include "wx/dirctrl.h"
+#include "wx/generic/dirdlgg.h"
 #endif
 
 #include "dialogs.h"
@@ -70,7 +71,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(DIALOGS_FILES_OPEN,                    MyFrame::FilesOpen)
     EVT_MENU(DIALOGS_FILE_SAVE,                     MyFrame::FileSave)
     EVT_MENU(DIALOGS_DIR_CHOOSE,                    MyFrame::DirChoose)
+#if defined(__WXMSW__) || defined(__WXMAC__)
     EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE,            MyFrame::GenericDirChoose)
+#endif // wxMSW || wxMAC
     EVT_MENU(DIALOGS_MODAL,                         MyFrame::ModalDlg)
     EVT_MENU(DIALOGS_MODELESS,                      MyFrame::ModelessDlg)
     EVT_MENU(DIALOGS_TIP,                           MyFrame::ShowTip)
@@ -157,7 +160,9 @@ bool MyApp::OnInit()
   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");
+#if defined(__WXMSW__) || defined(__WXMAC__)
   file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  "&Choose a directory (generic implementation)");
+#endif // wxMSW || wxMAC
 #if wxUSE_PROGRESSDLG
   file_menu->Append(DIALOGS_PROGRESS, "Pro&gress dialog\tCtrl-G");
 #endif // wxUSE_PROGRESSDLG
@@ -169,7 +174,7 @@ bool MyApp::OnInit()
   file_menu->Append(DIALOGS_REPLACE, "Find and &replace dialog\tShift-Ctrl-F", "", TRUE);
 #endif // wxUSE_FINDREPLDLG
   file_menu->AppendSeparator();
-  file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-D");
+  file_menu->Append(DIALOGS_MODAL, "Mo&dal dialog\tCtrl-W");
   file_menu->Append(DIALOGS_MODELESS, "Modeless &dialog\tCtrl-Z", "", TRUE);
   file_menu->AppendSeparator();
   file_menu->Append(wxID_EXIT, "E&xit\tAlt-X");
@@ -209,7 +214,10 @@ MyFrame::MyFrame(wxWindow *parent,
 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
 {
+    wxColour col = myCanvas->GetBackgroundColour();
+
     wxColourData data;
+    data.SetColour(col);
     data.SetChooseFull(TRUE);
     for (int i = 0; i < 16; i++)
     {
@@ -217,17 +225,16 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
         data.SetCustomColour(i, colour);
     }
 
-    wxColourDialog *dialog = new wxColourDialog(this, &data);
-    dialog->SetTitle("Choose the background colour");
-    if (dialog->ShowModal() == wxID_OK)
+    wxColourDialog dialog(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();
+        col = retData.GetColour();
         myCanvas->SetBackgroundColour(col);
         myCanvas->Clear();
         myCanvas->Refresh();
     }
-    dialog->Destroy();
 }
 
 void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) )
@@ -374,10 +381,12 @@ void MyFrame::TextEntry(wxCommandEvent& WXUNUSED(event))
 void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 {
     const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ;
-    int n = 5;
 
-    wxSingleChoiceDialog dialog(this, "This is a small sample\nA single-choice convenience dialog",
-        "Please select a value", n, (const wxString *)choices);
+    wxSingleChoiceDialog dialog(this,
+                                "This is a small sample\n"
+                                "A single-choice convenience dialog",
+                                "Please select a value",
+                                WXSIZEOF(choices), choices);
 
     dialog.SetSelection(2);
 
@@ -390,15 +399,19 @@ void MyFrame::SingleChoice(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 {
-    const wxString choices[] = { "One", "Two", "Three", "Four", "Five" } ;
-    int n = 5;
+    const wxString choices[] =
+    {
+        "One", "Two", "Three", "Four", "Five",
+        "Six", "Seven", "Eight", "Nine", "Ten",
+        "Eleven", "Twelve", "Seventeen",
+    };
 
     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,
+                                        WXSIZEOF(choices), choices,
                                         this);
     if ( count )
     {
@@ -416,9 +429,14 @@ void MyFrame::MultiChoice(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) )
 {
-    wxFileDialog dialog(this, "Testing open file dialog",
-                        "", "",
-                        "C++ files (*.h;*.cpp)|*.h;*.cpp");
+    wxFileDialog dialog
+                 (
+                    this,
+                    _T("Testing open file dialog"),
+                    _T(""),
+                    _T(""),
+                    _T("C++ files (*.h;*.cpp)|*.h;*.cpp")
+                 );
 
     if (dialog.ShowModal() == wxID_OK)
     {
@@ -445,7 +463,7 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
                                     _T(""), _T(""),
                                     s_extDef,
                                     _T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (*.*)|*.*"),
-                                    0,
+                                    wxCHANGE_DIR,
                                     this
                                    );
 
@@ -517,6 +535,8 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
     }
 }
 
+#if defined(__WXMSW__) || defined(__WXMAC__)
+
 void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
 {
 #if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
@@ -537,6 +557,8 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
 #endif
 }
 
+#endif // wxMSW || wxMAC
+
 void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event))
 {
     MyModalDialog dlg(this);
@@ -648,7 +670,7 @@ void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event))
 {
     wxWindowDisabler disableAll;
 
-    wxBusyInfo info("Sleep^H^H^H^H^HWorkiing, please wait...", this);
+    wxBusyInfo info("Working, please wait...", this);
 
     for ( int i = 0; i < 30; i++ )
     {
@@ -834,8 +856,10 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
 
     m_btnFocused = new wxButton(this, -1, "Default button");
     m_btnDelete = new wxButton(this, -1, "&Delete button");
+    wxButton *btnOk = new wxButton(this, wxID_CANCEL, "&Close");
     sizerTop->Add(m_btnFocused, 0, wxALIGN_CENTER | wxALL, 5);
     sizerTop->Add(m_btnDelete, 0, wxALIGN_CENTER | wxALL, 5);
+    sizerTop->Add(btnOk, 0, wxALIGN_CENTER | wxALL, 5);
 
     SetAutoLayout(TRUE);
     SetSizer(sizerTop);