added wxListCtrl::AssignImageList

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

diff --git a/src/gtk1/filedlg.cpp b/src/gtk1/filedlg.cpp
index f2c2c99011a08316a906fbfc4a4bc8152553b35e..0f9fd4887a033d5a553d0137ce99ec732393e1d9 100644 (file)
--- a/src/gtk1/filedlg.cpp
+++ b/src/gtk1/filedlg.cpp
@@ -16,7 +16,8 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 

-#include "gtk/gtk.h"
+
+#include <gtk/gtk.h>

 
 //-----------------------------------------------------------------------------
 // idle system
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -117,14 +118,14 @@ wxFileDialog::wxFileDialog( wxWindow *parent, const wxString& message,
     m_needParent = FALSE;
 
     if (!PreCreation( parent, pos, wxDefaultSize ) ||
     m_needParent = FALSE;
 
     if (!PreCreation( parent, pos, wxDefaultSize ) ||

-        !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, _T("filedialog") ))
+        !CreateBase( parent, -1, pos, wxDefaultSize, style | wxDIALOG_MODAL, wxDefaultValidator, wxT("filedialog") ))

     {
     {

-        wxFAIL_MSG( _T("wxXX creation failed") );
+        wxFAIL_MSG( wxT("wxXX creation failed") );

        return;
     }
     
     m_message = message;
        return;
     }
     
     m_message = message;

-    m_path = _T("");
+    m_path = wxT("");

     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;


@@ -141,7 +142,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);
     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);
 
         m_path.Append('/');
     m_path.Append(m_fileName);
 


@@ -173,7 +174,7 @@ void wxFileDialog::SetPath(const wxString& path)
         wxSplitPath(path, &m_dir, &m_fileName, &ext);
        if (!ext.IsEmpty())
        {
         wxSplitPath(path, &m_dir, &m_fileName, &ext);
        if (!ext.IsEmpty())
        {

-           m_fileName += _T(".");
+           m_fileName += wxT(".");

             m_fileName += ext;
        }
     }
             m_fileName += ext;
        }
     }


@@ -194,7 +195,7 @@ wxFileSelectorEx(const wxChar *message,
                  int x, int y)
 {
     // TODO: implement this somehow
                  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);
 }
 
                           wildcard, flags, parent, x, y);
 }
 


@@ -205,7 +206,7 @@ wxString wxFileSelector( const wxChar *title,
 {
     wxString filter2;
     if ( defaultExtension && !filter )
 {
     wxString filter2;
     if ( defaultExtension && !filter )

-        filter2 = wxString(_T("*.")) + wxString(defaultExtension) ;
+        filter2 = wxString(wxT("*.")) + wxString(defaultExtension) ;

     else if ( filter )
         filter2 = filter;
 
     else if ( filter )
         filter2 = filter;
 


@@ -237,9 +238,9 @@ wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const
     wxString str = _("Load %s file");
     wxSprintf(prompt, str, what);
 
     wxString str = _("Load %s file");
     wxSprintf(prompt, str, what);
 

-    if (*ext == _T('.')) ext++;
+    if (*ext == wxT('.')) ext++;

     wxChar wild[60];
     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);
 }
 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }


@@ -253,9 +254,9 @@ wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w
     wxString str = _("Save %s file");
     wxSprintf(prompt, str, what);
 
     wxString str = _("Save %s file");
     wxSprintf(prompt, str, what);
 

-    if (*ext == _T('.')) ext++;
+    if (*ext == wxT('.')) ext++;

     wxChar wild[60];
     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);
 }
 
     return wxFileSelector (prompt, (const wxChar *) NULL, default_name, ext, wild, 0, parent);
 }