show dir selection dialog both with and without new dir button

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 25e42ae0b58a5f637fab721229972a912afc8e2d..a398ca0e5f97ea6727b950041d623e8b795a4bc3 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -71,6 +71,7 @@ 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)
+    EVT_MENU(DIALOGS_DIRNEW_CHOOSE,                 MyFrame::DirChooseNew)
 #if defined(__WXMSW__) || defined(__WXMAC__)
     EVT_MENU(DIALOGS_GENERIC_DIR_CHOOSE,            MyFrame::GenericDirChoose)
 #endif // wxMSW || wxMAC
@@ -142,8 +143,8 @@ bool MyApp::OnInit()
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
   file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose f&ont (generic)"));
-
 #endif
+
   file_menu->AppendSeparator();
   file_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L"));
   file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M"));
@@ -160,9 +161,12 @@ bool MyApp::OnInit()
   file_menu->Append(DIALOGS_FILES_OPEN,  _T("Open &files\tCtrl-Q"));
   file_menu->Append(DIALOGS_FILE_SAVE,  _T("Sa&ve file\tCtrl-S"));
   file_menu->Append(DIALOGS_DIR_CHOOSE,  _T("&Choose a directory\tCtrl-D"));
+  file_menu->Append(DIALOGS_DIRNEW_CHOOSE,  _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D"));
 #if defined(__WXMSW__) || defined(__WXMAC__)
   file_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE,  _T("&Choose a directory (generic implementation)"));
 #endif // wxMSW || wxMAC
+  file_menu->AppendSeparator();
+
 #if wxUSE_PROGRESSDLG
   file_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G"));
 #endif // wxUSE_PROGRESSDLG
@@ -174,9 +178,11 @@ bool MyApp::OnInit()
   file_menu->Append(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"), _T(""), TRUE);
 #endif // wxUSE_FINDREPLDLG
   file_menu->AppendSeparator();
+
   file_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
   file_menu->Append(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"), _T(""), TRUE);
   file_menu->AppendSeparator();
+
   file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X"));
   wxMenuBar *menu_bar = new wxMenuBar;
   menu_bar->Append(file_menu, _T("&File"));
@@ -551,13 +557,13 @@ void MyFrame::FileSave(wxCommandEvent& WXUNUSED(event) )
     }
 }
 
-void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
+void MyFrame::DoDirChoose(int style)
 {
     // pass some initial dir to wxDirDialog
     wxString dirHome;
     wxGetHomeDir(&dirHome);
 
-    wxDirDialog dialog(this, _T("Testing directory picker"), dirHome);
+    wxDirDialog dialog(this, _T("Testing directory picker"), dirHome, style);
 
     if (dialog.ShowModal() == wxID_OK)
     {
@@ -565,6 +571,16 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
     }
 }
 
+void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
+{
+    DoDirChoose(wxDD_DEFAULT_STYLE & ~wxDD_NEW_DIR_BUTTON);
+}
+
+void MyFrame::DirChooseNew(wxCommandEvent& WXUNUSED(event) )
+{
+    DoDirChoose(wxDD_NEW_DIR_BUTTON);
+}
+
 #if defined(__WXMSW__) || defined(__WXMAC__)
 
 void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 88b81497bb6bff4077467894e2746289ede2f14c..099b6630fad93a0fae0382c712d72487f261e13a 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -71,6 +71,7 @@ public:
     void FilesOpen(wxCommandEvent& event);
     void FileSave(wxCommandEvent& event);
     void DirChoose(wxCommandEvent& event);
+    void DirChooseNew(wxCommandEvent& event);
     void GenericDirChoose(wxCommandEvent& event);
     void ShowTip(wxCommandEvent& event);
     void ModalDlg(wxCommandEvent& event);
@@ -96,6 +97,8 @@ public:
     void OnExit(wxCommandEvent& event);
 
 private:
+    void DoDirChoose(int style);
+
     MyModelessDialog *m_dialog;
 
 #if wxUSE_FINDREPLDLG
@@ -137,6 +140,7 @@ enum
     DIALOGS_FILES_OPEN,
     DIALOGS_FILE_SAVE,
     DIALOGS_DIR_CHOOSE,
+    DIALOGS_DIRNEW_CHOOSE,
     DIALOGS_GENERIC_DIR_CHOOSE,
     DIALOGS_TIP,
     DIALOGS_NUM_ENTRY,