Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for !wxUSE_DIRDLGG

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-11-25 22:44:55 +00:00
parent 5eaac5b574
commit 4ad3c82fff
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
samples/dialogs/dialogs.cpp
View File

@@ -33,9 +33,6 @@
#include "wx/tipdlg.h" #include "wx/tipdlg.h"
#include "wx/progdlg.h" #include "wx/progdlg.h"
// New wxGenericDirCtrl
#include "wx/dirctrl.h"
#define wxTEST_GENERIC_DIALOGS_IN_MSW 0 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
#if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
@@ -43,6 +40,11 @@
#include <wx/generic/fontdlgg.h> #include <wx/generic/fontdlgg.h>
#endif #endif
#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
// New wxGenericDirCtrl
#include "wx/dirctrl.h"
#endif
#include "dialogs.h" #include "dialogs.h"
IMPLEMENT_APP(MyApp) IMPLEMENT_APP(MyApp)
@@ -480,6 +482,7 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) )
void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) ) void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
{ {
#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
// pass some initial dir to wxDirDialog // pass some initial dir to wxDirDialog
wxString dirHome; wxString dirHome;
wxGetHomeDir(&dirHome); wxGetHomeDir(&dirHome);
@@ -491,6 +494,10 @@ void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path"); wxMessageDialog dialog2(this, dialog.GetPath(), "Selected path");
dialog2.ShowModal(); 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)) void MyFrame::ModalDlg(wxCommandEvent& WXUNUSED(event))