Code for single instance and bring-to-top under CE.

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

diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp
index 687e2a44b08ec8925e7721683c4e87ccb8c43616..88b285e8ea789d81e9a40886a4e50300db2df507 100644 (file)
--- a/src/gtk/filedlg.cpp
+++ b/src/gtk/filedlg.cpp
@@ -7,16 +7,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "filedlg.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/filedlg.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
-
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
@@ -89,7 +91,7 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFileDialog *dial
         wxString cwd;
         wxSplitPath(filename, &cwd, NULL, NULL);
 
-        if ( cwd != wxGetWorkingDirectory() )
+        if ( cwd != wxGetCwd() )
         {
             wxSetWorkingDirectory(cwd);
         }
@@ -120,12 +122,13 @@ void gtk_filedialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFileDialog *dialo
 // wxFileDialog
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxDialog)
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog,wxFileDialogBase)
 
 wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
                             const wxString& defaultDir, const wxString& defaultFileName,
                             const wxString& wildCard,
                             long style, const wxPoint& pos )
+             :wxFileDialogBase(parent, message, defaultDir, defaultFileName, wildCard, style, pos)
 {
     m_needParent = FALSE;
 
@@ -136,14 +139,6 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
         return;
     }
 
-    m_message = message;
-    m_path = wxT("");
-    m_fileName = defaultFileName;
-    m_dir = defaultDir;
-    m_wildCard = wildCard;
-    m_dialogStyle = style;
-    m_filterIndex = 1;
-
     m_widget = gtk_file_selection_new( m_message.mbc_str() );
 
     int x = (gdk_screen_width () - 400) / 2;