X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b600ed13625645eb985acf49eecd06fd111eb061..31ad423e4fb556ec225a63b161154d3bf3445c1b:/src/gtk1/filedlg.cpp?ds=sidebyside diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp index 687e2a44b0..a3fcec04f1 100644 --- a/src/gtk1/filedlg.cpp +++ b/src/gtk1/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,30 +122,23 @@ 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; if (!PreCreation( parent, pos, wxDefaultSize ) || - !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") )) + !CreateBase( parent, wxID_ANY, pos, wxDefaultSize, style, wxDefaultValidator, wxT("filedialog") )) { wxFAIL_MSG( wxT("wxXX creation failed") ); 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;