Updated to new PyCrust

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 7aa9851717417095dfab65eab416a5efea360225..f0f9ad244c29a2c86e7272b81a19dc4b6916f863 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -20,14 +20,22 @@
 #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
 

+#include "wx/checkbox.h"
+#include "wx/textctrl.h"
+#include "wx/choice.h"
+#include "wx/checkbox.h"
+#include "wx/stattext.h"

 #include "wx/filedlg.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/filedlg.h"
 #include "wx/debug.h"
 #include "wx/log.h"
 #include "wx/intl.h"

+#include "wx/listctrl.h"

 #include "wx/msgdlg.h"
 #include "wx/sizer.h"
 #include "wx/bmpbuttn.h"
 #include "wx/msgdlg.h"
 #include "wx/sizer.h"
 #include "wx/bmpbuttn.h"


@@ -35,7 +43,8 @@
 #include "wx/mimetype.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/mimetype.h"
 #include "wx/image.h"
 #include "wx/module.h"

-
+#include "wx/config.h"
+#include "wx/imaglist.h"

 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"


@@ -45,8 +54,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"


@@ -54,36 +65,91 @@
 #include "wx/generic/repview.xpm"
 #include "wx/generic/new_dir.xpm"
 #include "wx/generic/dir_up.xpm"
 #include "wx/generic/repview.xpm"
 #include "wx/generic/new_dir.xpm"
 #include "wx/generic/dir_up.xpm"

+#include "wx/generic/folder.xpm"
+#include "wx/generic/deffile.xpm"
+#include "wx/generic/exefile.xpm"

 
 

-/* XPM */
-static char * folder_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"         s None        c None",
-".        c #000000",
-"+        c #c0c0c0",
-"@        c #808080",
-"#        c #ffff00",
-"$        c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @#+#+#@       ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-"  ..............",
-"                ",
-"                "};
+//-----------------------------------------------------------------------------
+//  wxFileData
+//-----------------------------------------------------------------------------

 
 

+class wxFileData : public wxObject
+{
+private:
+    wxString m_name;
+    wxString m_fileName;
+    long     m_size;
+    int      m_hour;
+    int      m_minute;
+    int      m_year;
+    int      m_month;
+    int      m_day;
+    wxString m_permissions;
+    bool     m_isDir;
+    bool     m_isLink;
+    bool     m_isExe;
+
+public:
+    wxFileData() { }
+    wxFileData( const wxString &name, const wxString &fname );
+    wxString GetName() const;
+    wxString GetFullName() const;
+    wxString GetHint() const;
+    wxString GetEntry( int num );
+    bool IsDir();
+    bool IsLink();
+    bool IsExe();
+    long GetSize();
+    void MakeItem( wxListItem &item );
+    void SetNewName( const wxString &name, const wxString &fname );
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFileData);
+};
+
+//-----------------------------------------------------------------------------
+//  wxFileCtrl
+//-----------------------------------------------------------------------------
+
+class wxFileCtrl : public wxListCtrl
+{
+private:
+    wxString      m_dirName;
+    bool          m_showHidden;
+    wxString      m_wild;
+
+public:
+    wxFileCtrl();
+    wxFileCtrl( wxWindow *win,
+                wxWindowID id,
+                const wxString &dirName,
+                const wxString &wild,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = wxLC_LIST,
+                const wxValidator &validator = wxDefaultValidator,
+                const wxString &name = wxT("filelist") );
+    void ChangeToListMode();
+    void ChangeToReportMode();
+    void ChangeToIconMode();
+    void ShowHidden( bool show = TRUE );
+    long Add( wxFileData *fd, wxListItem &item );
+    void Update();
+    virtual void StatusbarText( wxChar *WXUNUSED(text) ) {};
+    void MakeDir();
+    void GoToParentDir();
+    void GoToHomeDir();
+    void GoToDir( const wxString &dir );
+    void SetWild( const wxString &wild );
+    void GetDir( wxString &dir );
+    void OnListDeleteItem( wxListEvent &event );
+    void OnListDeleteAllItems( wxListEvent &event );
+    void OnListEndLabelEdit( wxListEvent &event );
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFileCtrl);
+    DECLARE_EVENT_TABLE()
+};

 
 // ----------------------------------------------------------------------------
 // private classes - icons list management
 
 // ----------------------------------------------------------------------------
 // private classes - icons list management


@@ -91,38 +157,48 @@ static char * folder_xpm[] = {
 
 class wxFileIconEntry : public wxObject
 {
 
 class wxFileIconEntry : public wxObject
 {

-    public:
-        wxFileIconEntry(int i) { id = i; }
-    
-        int id;
+public:
+    wxFileIconEntry(int i) { id = i; }
+
+    int id;

 };
 
 
 class wxFileIconsTable
 {
 };
 
 
 class wxFileIconsTable
 {

-    public:
+public:
+    wxFileIconsTable();

 
 

-        wxFileIconsTable();
-        
-        int GetIconID(const wxString& extension);
-        wxImageList *GetImageList() { return &m_ImageList; }
+    int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
+    wxImageList *GetImageList() { return &m_ImageList; }

 
 

-    protected:        
-        wxImageList m_ImageList;
-        wxHashTable m_HashTable;
-        wxMimeTypesManager m_Mime;
+protected:
+    wxImageList m_ImageList;
+    wxHashTable m_HashTable;

 };
 
 static wxFileIconsTable *g_IconsTable = NULL;
 
 };
 
 static wxFileIconsTable *g_IconsTable = NULL;
 

+#define FI_FOLDER     0
+#define FI_UNKNOWN    1
+#define FI_EXECUTABLE 2

 
 wxFileIconsTable::wxFileIconsTable() :
                     m_ImageList(16, 16),
 
 wxFileIconsTable::wxFileIconsTable() :
                     m_ImageList(16, 16),

-                    m_HashTable(wxKEY_STRING),
-                    m_Mime()
+                    m_HashTable(wxKEY_STRING)

 {
     m_HashTable.DeleteContents(TRUE);
 {
     m_HashTable.DeleteContents(TRUE);

-    m_ImageList.Add(wxBitmap(folder_xpm));
+    m_ImageList.Add(wxBitmap(folder_xpm));  // FI_FOLDER
+    m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN
+    if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)
+    {                                       // FI_EXECUTABLE
+        m_ImageList.Add(wxBitmap(exefile_xpm));
+        m_HashTable.Delete(_T("exe"));
+        m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
+    }
+    /* else put into list by GetIconID
+       (KDE defines application/x-executable for *.exe and has nice icon)
+     */

 }
 
 
 }
 
 


@@ -131,14 +207,16 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
 {
     wxImage small(16, 16);
     unsigned char *p1, *p2, *ps;
 {
     wxImage small(16, 16);
     unsigned char *p1, *p2, *ps;

-    unsigned char mr = img.GetMaskRed(), mg = img.GetMaskGreen(), mb = img.GetMaskBlue();
-    
+    unsigned char mr = img.GetMaskRed(),
+                  mg = img.GetMaskGreen(),
+                  mb = img.GetMaskBlue();
+

     unsigned x, y;
     unsigned sr, sg, sb, smask;
     unsigned x, y;
     unsigned sr, sg, sb, smask;

-    
+

     p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
     small.SetMaskColour(mr, mr, mr);
     p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
     small.SetMaskColour(mr, mr, mr);

-    
+

     for (y = 0; y < 16; y++)
     {
         for (x = 0; x < 16; x++)
     for (y = 0; y < 16; y++)
     {
         for (x = 0; x < 16; x++)


@@ -160,8 +238,8 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
                 sr += p2[0], sg += p2[1], sb += p2[2];
             else smask++;
             p2 += 3;
                 sr += p2[0], sg += p2[1], sb += p2[2];
             else smask++;
             p2 += 3;

-            
-            if (smask > 2) 
+
+            if (smask > 2)

                 ps[0] = ps[1] = ps[2] = mr;
             else
                 ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;
                 ps[0] = ps[1] = ps[2] = mr;
             else
                 ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;


@@ -169,42 +247,94 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
         }
         p1 += 32 * 3, p2 += 32 * 3;
     }
         }
         p1 += 32 * 3, p2 += 32 * 3;
     }

-    
+

     return small.ConvertToBitmap();
 }
 
 
     return small.ConvertToBitmap();
 }
 
 

-int wxFileIconsTable::GetIconID(const wxString& extension)
+// finds empty borders and return non-empty area of image:
+static wxImage CutEmptyBorders(const wxImage& img)
+{
+    unsigned char mr = img.GetMaskRed(),
+                  mg = img.GetMaskGreen(),
+                  mb = img.GetMaskBlue();
+    unsigned char *dt = img.GetData(), *dttmp;
+    unsigned w = img.GetWidth(), h = img.GetHeight();
+
+    unsigned top, bottom, left, right, i;
+    bool empt;
+
+#define MK_DTTMP(x,y)      dttmp = dt + ((x + y * w) * 3)
+#define NOEMPTY_PIX(empt)  if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = FALSE; break;}
+
+    for (empt = TRUE, top = 0; empt && top < h; top++)
+    {
+        MK_DTTMP(0, top);
+        for (i = 0; i < w; i++, dttmp+=3)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = TRUE, bottom = h-1; empt && bottom > top; bottom--)
+    {
+        MK_DTTMP(0, bottom);
+        for (i = 0; i < w; i++, dttmp+=3)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = TRUE, left = 0; empt && left < w; left++)
+    {
+        MK_DTTMP(left, 0);
+        for (i = 0; i < h; i++, dttmp+=3*w)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = TRUE, right = w-1; empt && right > left; right--)
+    {
+        MK_DTTMP(right, 0);
+        for (i = 0; i < h; i++, dttmp+=3*w)
+            NOEMPTY_PIX(empt)
+    }
+    top--, left--, bottom++, right++;
+
+    return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
+}
+
+
+
+int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)

 {
 {

-    wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
-    
-    if (entry) return (entry -> id);
-    
-    wxFileType *ft = m_Mime.GetFileTypeFromExtension(extension);
+    if (!extension.IsEmpty())
+    {
+        wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
+        if (entry) return (entry -> id);
+    }
+
+    wxFileType *ft = (mime.IsEmpty()) ?
+                   wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
+                   wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);

     wxIcon ic;
     wxIcon ic;

-    if (ft == NULL || (!ft -> GetIcon(&ic)))
+    if (ft == NULL || (!ft -> GetIcon(&ic)) || (!ic.Ok()))

     {
     {

-        int newid = GetIconID(wxT("txt"));
+        int newid = FI_UNKNOWN;

         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
     wxImage img(ic);
     delete ft;
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
     wxImage img(ic);
     delete ft;

-    
+

     int id = m_ImageList.GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
         m_ImageList.Add(img.ConvertToBitmap());
     else
     int id = m_ImageList.GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
         m_ImageList.Add(img.ConvertToBitmap());
     else

-        m_ImageList.Add(CreateAntialiasedBitmap(img.Scale(32, 32)));
+    {
+        if (img.GetWidth() != 32 || img.GetHeight() != 32)
+            m_ImageList.Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
+        else
+            m_ImageList.Add(CreateAntialiasedBitmap(img));
+    }

     m_HashTable.Put(extension, new wxFileIconEntry(id));
     return id;
 }
 
 
 
     m_HashTable.Put(extension, new wxFileIconEntry(id));
     return id;
 }
 
 
 

-
-
-

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -235,7 +365,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 );


@@ -380,13 +510,15 @@ void wxFileData::MakeItem( wxListItem &item )
     item.ClearAttributes();
     if (IsExe()) item.SetTextColour(*wxRED);
     if (IsDir()) item.SetTextColour(*wxBLUE);
     item.ClearAttributes();
     if (IsExe()) item.SetTextColour(*wxRED);
     if (IsDir()) item.SetTextColour(*wxBLUE);

-    
+

     if (IsDir())
     if (IsDir())

-        item.m_image = 0;
+        item.m_image = FI_FOLDER;
+    else if (IsExe())
+        item.m_image = FI_EXECUTABLE;

     else if (m_name.Find(wxT('.')) != wxNOT_FOUND)
         item.m_image = g_IconsTable -> GetIconID(m_name.AfterLast(wxT('.')));
     else
     else if (m_name.Find(wxT('.')) != wxNOT_FOUND)
         item.m_image = g_IconsTable -> GetIconID(m_name.AfterLast(wxT('.')));
     else

-        item.m_image = -1;
+        item.m_image = FI_UNKNOWN;

 
     if (IsLink())
     {
 
     if (IsLink())
     {


@@ -404,11 +536,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl);
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)

+    EVT_LIST_DELETE_ALL_ITEMS(-1, wxFileCtrl::OnListDeleteAllItems)

     EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
 END_EVENT_TABLE()
 
 
     EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
 END_EVENT_TABLE()
 
 

-

 wxFileCtrl::wxFileCtrl()
 {
     m_dirName = wxT("/");
 wxFileCtrl::wxFileCtrl()
 {
     m_dirName = wxT("/");


@@ -476,11 +608,19 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 
 void wxFileCtrl::Update()
 {
 
 void wxFileCtrl::Update()
 {

-    ClearAll();

     long my_style = GetWindowStyleFlag();
     long my_style = GetWindowStyleFlag();

+    int name_col_width = 0;
+    if (my_style & wxLC_REPORT)
+    {
+        if (GetColumnCount() > 0)
+            name_col_width = GetColumnWidth( 0 );
+    }
+
+    ClearAll();

     if (my_style & wxLC_REPORT)
     {
     if (my_style & wxLC_REPORT)
     {

-        InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
+        if (name_col_width < 140) name_col_width = 140;
+        InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, name_col_width );

         InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
         InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 65 );
         InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
         InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
         InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 65 );
         InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );


@@ -507,7 +647,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++;


@@ -515,26 +655,35 @@ void wxFileCtrl::Update()
         f = wxFindNextFile();
     }
 
         f = wxFindNextFile();
     }
 

-    res = m_dirName + wxT("/") + m_wild;
-    f = wxFindFirstFile( res.GetData(), wxFILE );
-    while (!f.IsEmpty())
+    // Tokenize the wildcard string, so we can handle more than 1 
+    // search pattern in a wildcard.
+    wxStringTokenizer tokenWild( m_wild, ";" );
+    while ( tokenWild.HasMoreTokens() )

     {
     {

-        res = wxFileNameFromPath( f );
-        fd = new wxFileData( res, f );
-        wxString s = fd->GetName();
-        if (m_showHidden || (s[0] != wxT('.')))
+        res = m_dirName + wxT("/") + tokenWild.GetNextToken();
+        f = wxFindFirstFile( res.GetData(), wxFILE );
+        while (!f.IsEmpty())

         {
         {

-            Add( fd, item );
-            item.m_itemId++;
+            res = wxFileNameFromPath( f );
+            fd = new wxFileData( res, f );
+            wxString s = fd->GetName();
+            if (m_showHidden || (s[0u] != wxT('.')))
+            {
+                Add( fd, item );
+                item.m_itemId++;
+            }
+            f = wxFindNextFile();

         }
         }

-        f = wxFindNextFile();

     }
 
     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 )


@@ -634,6 +783,23 @@ void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
     delete fd;
 }
 
     delete fd;
 }
 

+void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
+{
+    wxListItem item;
+    item.m_mask = wxLIST_MASK_DATA;
+
+    item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );
+    while ( item.m_itemId != -1 )
+    {
+        GetItem( item );
+        wxFileData *fd = (wxFileData*)item.m_data;
+        delete fd;
+        item.m_data = 0;
+        SetItem( item );
+        item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
+    }
+}
+

 void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
 {
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
 void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
 {
     wxFileData *fd = (wxFileData*)event.m_item.m_data;


@@ -708,8 +874,8 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
         EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
 END_EVENT_TABLE()
 
         EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
 END_EVENT_TABLE()
 

-long wxFileDialog::m_lastViewStyle = wxLC_LIST;
-bool wxFileDialog::m_lastShowHidden = FALSE;
+long wxFileDialog::s_lastViewStyle = wxLC_LIST;
+bool wxFileDialog::s_lastShowHidden = FALSE;

 
 wxFileDialog::wxFileDialog(wxWindow *parent,
                  const wxString& message,
 
 wxFileDialog::wxFileDialog(wxWindow *parent,
                  const wxString& message,


@@ -722,6 +888,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 {
     wxBeginBusyCursor();
 
 {
     wxBeginBusyCursor();
 

+    if (wxConfig::Get(FALSE))
+    {
+        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &s_lastViewStyle);
+        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), &s_lastShowHidden);
+    }
+

     m_message = message;
     m_dialogStyle = style;
 
     m_message = message;
     m_dialogStyle = style;
 


@@ -818,11 +990,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     if (m_dialogStyle & wxMULTIPLE)
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
 
     if (m_dialogStyle & wxMULTIPLE)
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,

-                                wxSize(440,180), m_lastViewStyle | wxSUNKEN_BORDER );
+                                 wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER );

     else
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
     else
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,

-                                wxSize(440,180), m_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
-    m_list -> ShowHidden(m_lastShowHidden);
+                                 wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+    m_list -> ShowHidden(s_lastShowHidden);

     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );


@@ -835,7 +1007,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     m_choice = new wxChoice( this, ID_CHOICE );
     choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
     m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
     m_choice = new wxChoice( this, ID_CHOICE );
     choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
     m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );

-    m_check->SetValue( m_lastShowHidden );
+    m_check->SetValue( s_lastShowHidden );

     choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );
     choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );


@@ -857,9 +1029,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     Centre( wxBOTH );
 
 
     Centre( wxBOTH );
 

+/*

     if (m_fileName.IsEmpty())
         m_list->SetFocus();
     else
     if (m_fileName.IsEmpty())
         m_list->SetFocus();
     else

+*/

         m_text->SetFocus();
 
     wxEndBusyCursor();
         m_text->SetFocus();
 
     wxEndBusyCursor();


@@ -867,6 +1041,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
 wxFileDialog::~wxFileDialog()
 {
 
 wxFileDialog::~wxFileDialog()
 {

+    if (wxConfig::Get(FALSE))
+    {
+        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), s_lastViewStyle);
+        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), s_lastShowHidden);
+    }

 }
 
 void wxFileDialog::OnChoice( wxCommandEvent &event )
 }
 
 void wxFileDialog::OnChoice( wxCommandEvent &event )


@@ -886,7 +1065,7 @@ void wxFileDialog::OnChoice( wxCommandEvent &event )
 
 void wxFileDialog::OnCheck( wxCommandEvent &event )
 {
 
 void wxFileDialog::OnCheck( wxCommandEvent &event )
 {

-    m_list->ShowHidden( (m_lastShowHidden = event.GetInt() != 0) );
+    m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) );

 }
 
 void wxFileDialog::OnActivated( wxListEvent &event )
 }
 
 void wxFileDialog::OnActivated( wxListEvent &event )


@@ -943,7 +1122,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() );


@@ -965,7 +1144,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;


@@ -1014,6 +1193,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);
 }


@@ -1026,14 +1217,14 @@ void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToListMode();
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToListMode();

-    m_lastViewStyle = wxLC_LIST;
+    s_lastViewStyle = wxLC_LIST;

     m_list->SetFocus();
 }
 
 void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToReportMode();
     m_list->SetFocus();
 }
 
 void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToReportMode();

-    m_lastViewStyle = wxLC_REPORT;
+    s_lastViewStyle = wxLC_REPORT;

     m_list->SetFocus();
 }
 
     m_list->SetFocus();
 }
 


@@ -1095,10 +1286,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );

-    while ( item.m_itemId != -1 ) {
+    while ( item.m_itemId != -1 )
+    {

         m_list->GetItem( item );
         paths.Add( dir + item.m_text );
         m_list->GetItem( item );
         paths.Add( dir + item.m_text );

-        item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
+        item.m_itemId = m_list->GetNextItem( item.m_itemId,

             wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     }
 }
             wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     }
 }


@@ -1117,10 +1309,11 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );

-    while ( item.m_itemId != -1 ) {
+    while ( item.m_itemId != -1 )
+    {

         m_list->GetItem( item );
         files.Add( item.m_text );
         m_list->GetItem( item );
         files.Add( item.m_text );

-        item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
+        item.m_itemId = m_list->GetNextItem( item.m_itemId,

             wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     }
 }
             wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     }
 }


@@ -1177,19 +1370,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,


@@ -1197,15 +1388,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);

 }
 
 
 }
 
 


@@ -1225,3 +1416,5 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxFileDialogGenericModule, wxModule)

+
+#endif // wxUSE_FILEDLG