Make the app object be global in case it is run multiple times, such

[wxWidgets.git] / src / gtk / filedlg.cpp

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index ca8605052733f7564b111cdd6932d30a410bb85f..77f19242ded1e061b79a6d8d384f5128ee007f79 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/filedlg.cpp
+// Name:        src/gtk/filedlg.cpp

 // Purpose:     native implementation of wxFileDialog
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
 // Id:          $Id$
 // Purpose:     native implementation of wxFileDialog
 // Author:      Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
 // Id:          $Id$


@@ -10,13 +10,14 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers
-#include "wx/setup.h"
-

 #if wxUSE_FILEDLG
 
 #include "wx/filedlg.h"
 
 #if wxUSE_FILEDLG
 
 #include "wx/filedlg.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+#endif
+

 #ifdef __WXGTK24__
 
 #include <gtk/gtk.h>
 #ifdef __WXGTK24__
 
 #include <gtk/gtk.h>


@@ -24,7 +25,6 @@
 
 #include <unistd.h> // chdir
 
 
 #include <unistd.h> // chdir
 

-#include "wx/intl.h"

 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd
 #include "wx/filename.h" // wxFilename
 #include "wx/tokenzr.h" // wxStringTokenizer
 #include "wx/filefn.h" // ::wxGetCwd