X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..8b260fbe33b67311ab69043e8fb1bc4c4d7ac1f2:/src/gtk1/filedlg.cpp

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index 7513762b20..c1c2c6f3e8 100644
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -16,7 +16,7 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -116,9 +116,15 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
 {
     m_needParent = FALSE;
 
-    PreCreation( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, "filedialog" );
+    if (!PreCreation( parent, pos, wxDefaultSize ) ||
+        !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") ))
+    {
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+	return;
+    }
+    
     m_message = message;
-    m_path = _T("");
+    m_path = wxT("");
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
@@ -135,7 +141,7 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
     gtk_file_selection_hide_fileop_buttons( sel ); // they don't work anyway
 
     m_path.Append(m_dir);
-    if( ! m_path.IsEmpty() && m_path.Last()!=_T('/') )
+    if( ! m_path.IsEmpty() && m_path.Last()!=wxT('/') )
         m_path.Append('/');
     m_path.Append(m_fileName);
 
@@ -165,7 +171,11 @@ void wxFileDialog::SetPath(const wxString& path)
     {
         wxString ext;
         wxSplitPath(path, &m_dir, &m_fileName, &ext);
-        m_fileName += ext;
+	if (!ext.IsEmpty())
+	{
+	    m_fileName += wxT(".");
+            m_fileName += ext;
+	}
     }
 }
 
@@ -184,7 +194,7 @@ wxFileSelectorEx(const wxChar *message,
                  int x, int y)
 {
     // TODO: implement this somehow
-    return wxFileSelector(message, default_path, default_filename, _T(""),
+    return wxFileSelector(message, default_path, default_filename, wxT(""),
                           wildcard, flags, parent, x, y);
 }
 
@@ -195,7 +205,7 @@ wxString wxFileSelector( const wxChar *title,
 {
     wxString filter2;
     if ( defaultExtension && !filter )
-        filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
+        filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;
     else if ( filter )
         filter2 = filter;
 
@@ -227,9 +237,9 @@ wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const
     wxString str = _("Load %s file");
     wxSprintf(prompt, str, what);
 
-    if (*ext == _T('.')) ext++;
+    if (*ext == wxT('.')) ext++;
     wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+    wxSprintf(wild, wxT("*.%s"), ext);
 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }
@@ -243,9 +253,9 @@ wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w
     wxString str = _("Save %s file");
     wxSprintf(prompt, str, what);
 
-    if (*ext == _T('.')) ext++;
+    if (*ext == wxT('.')) ext++;
     wxChar wild[60];
-    wxSprintf(wild, _T("*.%s"), ext);
+    wxSprintf(wild, wxT("*.%s"), ext);
 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }