don't show generic dir dlg when it's the same as the standard one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -71,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)
 | 
			
		||||
@@ -158,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
 | 
			
		||||
@@ -531,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
 | 
			
		||||
@@ -551,6 +557,8 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#endif // wxMSW || wxMAC
 | 
			
		||||
 | 
			
		||||
void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event))
 | 
			
		||||
{
 | 
			
		||||
    MyModalDialog dlg(this);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user