Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env

[wxWidgets.git] / src / generic / filedlgg.cpp

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 002683596536031d2ba4521b084a4fde503459c7..2d418f1064f4f1bb808d976333f3237496835582 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_FILEDLG
+

 #ifndef __UNIX__
 #error wxFileDialog currently only supports unix
 #endif
 #ifndef __UNIX__
 #error wxFileDialog currently only supports unix
 #endif


@@ -46,8 +48,10 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <pwd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <pwd.h>

-#include <grp.h>
-#include <time.h>
+#ifndef __VMS
+# include <grp.h>
+#endif
+# include <time.h>

 #include <unistd.h>
 
 #include "wx/generic/home.xpm"
 #include <unistd.h>
 
 #include "wx/generic/home.xpm"


@@ -273,7 +277,7 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
     struct stat buff;
     stat( m_fileName.fn_str(), &buff );
 
     struct stat buff;
     stat( m_fileName.fn_str(), &buff );
 

-#ifndef __EMX__
+#if !defined( __EMX__ ) && !defined(__VMS)

     struct stat lbuff;
     lstat( m_fileName.fn_str(), &lbuff );
     m_isLink = S_ISLNK( lbuff.st_mode );
     struct stat lbuff;
     lstat( m_fileName.fn_str(), &lbuff );
     m_isLink = S_ISLNK( lbuff.st_mode );


@@ -555,7 +559,7 @@ void wxFileCtrl::Update()
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();

-        if (m_showHidden || (s[0] != wxT('.')))
+        if (m_showHidden || (s[0u] != wxT('.')))

         {
             Add( fd, item );
             item.m_itemId++;
         {
             Add( fd, item );
             item.m_itemId++;


@@ -570,7 +574,7 @@ void wxFileCtrl::Update()
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();
         res = wxFileNameFromPath( f );
         fd = new wxFileData( res, f );
         wxString s = fd->GetName();

-        if (m_showHidden || (s[0] != wxT('.')))
+        if (m_showHidden || (s[0u] != wxT('.')))

         {
             Add( fd, item );
             item.m_itemId++;
         {
             Add( fd, item );
             item.m_itemId++;


@@ -580,9 +584,12 @@ void wxFileCtrl::Update()
 
     SortItems( ListCompare, 0 );
 
 
     SortItems( ListCompare, 0 );
 

-    SetColumnWidth( 1, wxLIST_AUTOSIZE );
-    SetColumnWidth( 2, wxLIST_AUTOSIZE );
-    SetColumnWidth( 3, wxLIST_AUTOSIZE );
+    if (my_style & wxLC_REPORT)
+    {
+       SetColumnWidth( 1, wxLIST_AUTOSIZE );
+       SetColumnWidth( 2, wxLIST_AUTOSIZE );
+       SetColumnWidth( 3, wxLIST_AUTOSIZE );
+    }

 }
 
 void wxFileCtrl::SetWild( const wxString &wild )
 }
 
 void wxFileCtrl::SetWild( const wxString &wild )


@@ -1021,7 +1028,7 @@ void wxFileDialog::HandleAction( const wxString &fn )
         return;
     }
 
         return;
     }
 

-    if (filename[0] == wxT('~'))
+    if (filename[0u] == wxT('~'))

     {
         filename.Remove( 0, 1 );
         wxString tmp( wxGetUserHome() );
     {
         filename.Remove( 0, 1 );
         wxString tmp( wxGetUserHome() );


@@ -1043,7 +1050,7 @@ void wxFileDialog::HandleAction( const wxString &fn )
     }
 
     if (dir != wxT("/")) dir += wxT("/");
     }
 
     if (dir != wxT("/")) dir += wxT("/");

-    if (filename[0] != wxT('/'))
+    if (filename[0u] != wxT('/'))

     {
         dir += filename;
         filename = dir;
     {
         dir += filename;
         filename = dir;


@@ -1092,6 +1099,18 @@ void wxFileDialog::HandleAction( const wxString &fn )
 
     SetPath( filename );
 
 
     SetPath( filename );
 

+    // change to the directory where the user went if asked
+    if ( m_dialogStyle & wxCHANGE_DIR )
+    {
+        wxString cwd;
+        wxSplitPath(filename, &cwd, NULL, NULL);
+
+        if ( cwd != wxGetWorkingDirectory() )
+        {
+            wxSetWorkingDirectory(cwd);
+        }
+    }
+

     wxCommandEvent event;
     wxDialog::OnOK(event);
 }
     wxCommandEvent event;
     wxDialog::OnOK(event);
 }


@@ -1257,19 +1276,17 @@ wxString wxFileSelector( const wxChar *title,
     }
 }
 
     }
 }
 

-wxString wxLoadFileSelector( const wxChar *what, const wxChar *extension, const wxChar *default_name, wxWindow *parent )
+wxString wxLoadFileSelector( const wxChar *what, const wxChar *ext, const wxChar *default_name, wxWindow *parent )

 {
 {

-    wxChar *ext = (wxChar *)extension;
+    wxString prompt = wxString::Format(_("Load %s file"), what);

 
 

-    wxChar prompt[50];
-    wxString str = _("Load %s file");
-    wxSprintf(prompt, str, what);
+    if (*ext == wxT('.'))
+        ext++;

 
 

-    if (*ext == wxT('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, wxT("*.%s"), ext);
+    wxString wild = wxString::Format(_T("*.%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);

 }
 
 wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,
 }
 
 wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const wxChar *default_name,


@@ -1277,15 +1294,15 @@ wxString wxSaveFileSelector(const wxChar *what, const wxChar *extension, const w
 {
     wxChar *ext = (wxChar *)extension;
 
 {
     wxChar *ext = (wxChar *)extension;
 

-    wxChar prompt[50];
-    wxString str = _("Save %s file");
-    wxSprintf(prompt, str, what);
+    wxString prompt = wxString::Format(_("Save %s file"), what);
+
+    if (*ext == wxT('.'))
+        ext++;

 
 

-    if (*ext == wxT('.')) ext++;
-    wxChar wild[60];
-    wxSprintf(wild, wxT("*.%s"), ext);
+    wxString wild = wxString::Format(_T("*.%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);

 }
 
 
 }
 
 


@@ -1305,3 +1322,5 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)

+
+#endif // wxUSE_FILEDLG