wxDirDialog now has the same ctor under all platforms and also uses the

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

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 6af187654a15bc2c18392076062050b35c9ccd39..43d35d78e86d4596ab4d9934c350d8e947b4d1c1 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -46,6 +46,7 @@
 #include "wx/config.h"
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/config.h"
 #include "wx/imaglist.h"
 #include "wx/dir.h"

+#include "wx/artprov.h"

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


@@ -66,33 +67,16 @@
     #include <direct.h>
 #endif
 
     #include <direct.h>
 #endif
 

-# include <time.h>
+#include <time.h>

 #include <unistd.h>
 
 #include <unistd.h>
 

-// XPM hack: make the arrays const
-#define static static const
-
-#ifndef __DOS__
-#include "wx/generic/home.xpm"
-#endif
-#include "wx/generic/listview.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"
-
-#undef static
-

 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 //  wxFileData
 //-----------------------------------------------------------------------------
 

-class wxFileData : public wxObject
+class wxFileData

 {
 public:
 {
 public:

-    wxFileData() { }

     wxFileData( const wxString &name, const wxString &fname );
     wxString GetName() const;
     wxString GetFullName() const;
     wxFileData( const wxString &name, const wxString &fname );
     wxString GetName() const;
     wxString GetFullName() const;


@@ -118,8 +102,6 @@ private:
     bool     m_isDir;
     bool     m_isLink;
     bool     m_isExe;
     bool     m_isDir;
     bool     m_isLink;
     bool     m_isExe;

-
-    DECLARE_DYNAMIC_CLASS(wxFileData);

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -139,6 +121,8 @@ public:
                 long style = wxLC_LIST,
                 const wxValidator &validator = wxDefaultValidator,
                 const wxString &name = wxT("filelist") );
                 long style = wxLC_LIST,
                 const wxValidator &validator = wxDefaultValidator,
                 const wxString &name = wxT("filelist") );

+    virtual ~wxFileCtrl();
+

     void ChangeToListMode();
     void ChangeToReportMode();
     void ChangeToIconMode();
     void ChangeToListMode();
     void ChangeToReportMode();
     void ChangeToIconMode();


@@ -153,9 +137,8 @@ public:
     void SetWild( const wxString &wild );
     void GetDir( wxString &dir );
     void OnListDeleteItem( wxListEvent &event );
     void SetWild( const wxString &wild );
     void GetDir( wxString &dir );
     void OnListDeleteItem( wxListEvent &event );

-    void OnListDeleteAllItems( wxListEvent &event );

     void OnListEndLabelEdit( wxListEvent &event );
     void OnListEndLabelEdit( wxListEvent &event );

-    
+

     // Associate commonly used UI controls with wxFileCtrl so that they can be
     // disabled when they cannot be used (e.g. can't go to parent directory
     // if wxFileCtrl already is in the root dir):
     // Associate commonly used UI controls with wxFileCtrl so that they can be
     // disabled when they cannot be used (e.g. can't go to parent directory
     // if wxFileCtrl already is in the root dir):


@@ -163,10 +146,13 @@ public:
     void SetNewDirControl(wxWindow *ctrl) { m_newDirControl = ctrl; }
 
 private:
     void SetNewDirControl(wxWindow *ctrl) { m_newDirControl = ctrl; }
 
 private:

+    void FreeItemData(const wxListItem& item);
+    void FreeAllItemsData();
+

     wxString      m_dirName;
     bool          m_showHidden;
     wxString      m_wild;
     wxString      m_dirName;
     bool          m_showHidden;
     wxString      m_wild;

-    
+

     wxWindow     *m_goToParentControl;
     wxWindow     *m_newDirControl;
 
     wxWindow     *m_goToParentControl;
     wxWindow     *m_newDirControl;
 


@@ -211,11 +197,14 @@ wxFileIconsTable::wxFileIconsTable() :
                     m_HashTable(wxKEY_STRING)
 {
     m_HashTable.DeleteContents(TRUE);
                     m_HashTable(wxKEY_STRING)
 {
     m_HashTable.DeleteContents(TRUE);

-    m_ImageList.Add(wxBitmap(folder_xpm));  // FI_FOLDER
-    m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN
+    // FI_FOLDER:
+    m_ImageList.Add(wxArtProvider::GetBitmap(wxART_FOLDER, wxART_CMN_DIALOG));
+    // FI_UNKNOWN:
+    m_ImageList.Add(wxArtProvider::GetBitmap(wxART_NORMAL_FILE, wxART_CMN_DIALOG));
+    // FI_EXECUTABLE:

     if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)
     if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)

-    {                                       // FI_EXECUTABLE
-        m_ImageList.Add(wxBitmap(exefile_xpm));
+    {
+        m_ImageList.Add(wxArtProvider::GetBitmap(wxART_EXECUTABLE_FILE, wxART_CMN_DIALOG));

         m_HashTable.Delete(_T("exe"));
         m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
     }
         m_HashTable.Delete(_T("exe"));
         m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
     }


@@ -275,7 +264,7 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
         p1 += 32 * 3, p2 += 32 * 3;
     }
 
         p1 += 32 * 3, p2 += 32 * 3;
     }
 

-    return small.ConvertToBitmap();
+    return wxBitmap(small);

 }
 
 // finds empty borders and return non-empty area of image:
 }
 
 // finds empty borders and return non-empty area of image:


@@ -344,12 +333,12 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }

-    wxImage img(ic);
+    wxImage img = ic.ConvertToImage();

     delete ft;
 
     int id = m_ImageList.GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
     delete ft;
 
     int id = m_ImageList.GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)

-        m_ImageList.Add(img.ConvertToBitmap());
+        m_ImageList.Add(wxBitmap(img));

     else
     {
         if (img.GetWidth() != 32 || img.GetHeight() != 32)
     else
     {
         if (img.GetWidth() != 32 || img.GetHeight() != 32)


@@ -403,13 +392,11 @@ extern bool wxIsDriveAvailable(const wxString& dirName);
 //  wxFileData
 //-----------------------------------------------------------------------------
 
 //  wxFileData
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxFileData,wxObject);
-

 wxFileData::wxFileData( const wxString &name, const wxString &fname )
 {
     m_name = name;
     m_fileName = fname;
 wxFileData::wxFileData( const wxString &name, const wxString &fname )
 {
     m_name = name;
     m_fileName = fname;

-    
+

 #if defined(__DOS__) || defined(__WINDOWS__)
     // VS: In case the file is root directory of a volume (e.g. "C:"),
     //     we don't want it stat()ed, since the drive may not be in:
 #if defined(__DOS__) || defined(__WINDOWS__)
     // VS: In case the file is root directory of a volume (e.g. "C:"),
     //     we don't want it stat()ed, since the drive may not be in:


@@ -596,7 +583,6 @@ 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()
 


@@ -614,11 +600,11 @@ wxFileCtrl::wxFileCtrl()
 wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
                        const wxString &dirName, const wxString &wild,
                        const wxPoint &pos, const wxSize &size,
 wxFileCtrl::wxFileCtrl(wxWindow *win, wxWindowID id,
                        const wxString &dirName, const wxString &wild,
                        const wxPoint &pos, const wxSize &size,

-                       long style, const wxValidator &validator, 
+                       long style, const wxValidator &validator,

                        const wxString &name)
         : wxListCtrl(win, id, pos, size, style, validator, name)
 {
                        const wxString &name)
         : wxListCtrl(win, id, pos, size, style, validator, name)
 {

-    if (! g_IconsTable) 
+    if (! g_IconsTable)

         g_IconsTable = new wxFileIconsTable;
     wxImageList *imageList = g_IconsTable->GetImageList();
 
         g_IconsTable = new wxFileIconsTable;
     wxImageList *imageList = g_IconsTable->GetImageList();
 


@@ -670,7 +656,7 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
         const int noEntries = 4;
 #endif
         ret = InsertItem( item );
         const int noEntries = 4;
 #endif
         ret = InsertItem( item );

-        for (int i = 1; i < noEntries; i++) 
+        for (int i = 1; i < noEntries; i++)

             SetItem( item.m_itemId, i, fd->GetEntry( i) );
     }
     else if (my_style & wxLC_LIST)
             SetItem( item.m_itemId, i, fd->GetEntry( i) );
     }
     else if (my_style & wxLC_LIST)


@@ -683,7 +669,7 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 void wxFileCtrl::UpdateFiles()
 {
     wxBusyCursor bcur; // this may take a while...
 void wxFileCtrl::UpdateFiles()
 {
     wxBusyCursor bcur; // this may take a while...

-    
+

     long my_style = GetWindowStyleFlag();
     int name_col_width = 0;
     if (my_style & wxLC_REPORT)
     long my_style = GetWindowStyleFlag();
     int name_col_width = 0;
     if (my_style & wxLC_REPORT)


@@ -692,7 +678,9 @@ void wxFileCtrl::UpdateFiles()
             name_col_width = GetColumnWidth( 0 );
     }
 
             name_col_width = GetColumnWidth( 0 );
     }
 

+    FreeAllItemsData();

     ClearAll();
     ClearAll();

+

     if (my_style & wxLC_REPORT)
     {
         if (name_col_width < 140) name_col_width = 140;
     if (my_style & wxLC_REPORT)
     {
         if (name_col_width < 140) name_col_width = 140;


@@ -711,7 +699,7 @@ void wxFileCtrl::UpdateFiles()
 
 #if defined(__DOS__) || defined(__WINDOWS__)
     if ( IsTopMostDir(m_dirName) )
 
 #if defined(__DOS__) || defined(__WINDOWS__)
     if ( IsTopMostDir(m_dirName) )

-    {   
+    {

         // Pseudo-directory with all available drives listed...
         for (int drive = 1; drive <= 26; drive++)
         {
         // Pseudo-directory with all available drives listed...
         for (int drive = 1; drive <= 26; drive++)
         {


@@ -752,7 +740,7 @@ void wxFileCtrl::UpdateFiles()
         {
             wxString dirPrefix(dirname + wxFILE_SEP_PATH);
             int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;
         {
             wxString dirPrefix(dirname + wxFILE_SEP_PATH);
             int hiddenFlag = m_showHidden ? wxDIR_HIDDEN : 0;

-            
+

             bool cont;
             wxString f;
 
             bool cont;
             wxString f;
 


@@ -766,12 +754,12 @@ void wxFileCtrl::UpdateFiles()
                 cont = dir.GetNext(&f);
             }
 
                 cont = dir.GetNext(&f);
             }
 

-            // Tokenize the wildcard string, so we can handle more than 1 
+            // Tokenize the wildcard string, so we can handle more than 1

             // search pattern in a wildcard.
             wxStringTokenizer tokenWild(m_wild, wxT(";"));
             while ( tokenWild.HasMoreTokens() )
             {
             // search pattern in a wildcard.
             wxStringTokenizer tokenWild(m_wild, wxT(";"));
             while ( tokenWild.HasMoreTokens() )
             {

-                cont = dir.GetFirst(&f, tokenWild.GetNextToken(), 
+                cont = dir.GetFirst(&f, tokenWild.GetNextToken(),

                                         wxDIR_FILES | hiddenFlag);
                 while (cont)
                 {
                                         wxDIR_FILES | hiddenFlag);
                 while (cont)
                 {


@@ -792,7 +780,7 @@ void wxFileCtrl::UpdateFiles()
        SetColumnWidth(2, wxLIST_AUTOSIZE);
        SetColumnWidth(3, wxLIST_AUTOSIZE);
     }
        SetColumnWidth(2, wxLIST_AUTOSIZE);
        SetColumnWidth(3, wxLIST_AUTOSIZE);
     }

-    
+

     // Finally, enable/disable context-dependent controls:
     if ( m_goToParentControl )
         m_goToParentControl->Enable(!IsTopMostDir(m_dirName));
     // Finally, enable/disable context-dependent controls:
     if ( m_goToParentControl )
         m_goToParentControl->Enable(!IsTopMostDir(m_dirName));


@@ -864,7 +852,7 @@ void wxFileCtrl::GoToParentDir()
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
 #ifdef __UNIX__
         wxString fname( wxFileNameFromPath(m_dirName) );
         m_dirName = wxPathOnly( m_dirName );
 #ifdef __UNIX__

-        if (m_dirName.IsEmpty()) 
+        if (m_dirName.IsEmpty())

             m_dirName = wxT("/");
 #endif
         UpdateFiles();
             m_dirName = wxT("/");
 #endif
         UpdateFiles();


@@ -896,13 +884,18 @@ void wxFileCtrl::GetDir( wxString &dir )
     dir = m_dirName;
 }
 
     dir = m_dirName;
 }
 

-void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
+void wxFileCtrl::FreeItemData(const wxListItem& item)

 {
 {

-    wxFileData *fd = (wxFileData*)event.m_item.m_data;
+    wxFileData *fd = (wxFileData*)item.m_data;

     delete fd;
 }
 
     delete fd;
 }
 

-void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
+void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
+{
+    FreeItemData(event.m_item);
+}
+
+void wxFileCtrl::FreeAllItemsData()

 {
     wxListItem item;
     item.m_mask = wxLIST_MASK_DATA;
 {
     wxListItem item;
     item.m_mask = wxLIST_MASK_DATA;


@@ -911,10 +904,7 @@ void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
     while ( item.m_itemId != -1 )
     {
         GetItem( item );
     while ( item.m_itemId != -1 )
     {
         GetItem( item );

-        wxFileData *fd = (wxFileData*)item.m_data;
-        delete fd;
-        item.m_data = 0;
-        SetItem( item );
+        FreeItemData(item);

         item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
     }
 }
         item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
     }
 }


@@ -962,6 +952,11 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
     }
 }
 
     }
 }
 

+wxFileCtrl::~wxFileCtrl()
+{
+    FreeAllItemsData();
+}
+

 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------


@@ -1009,9 +1004,9 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     if (wxConfig::Get(FALSE))
     {
 
     if (wxConfig::Get(FALSE))
     {

-        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), 
+        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),

                               &s_lastViewStyle);
                               &s_lastViewStyle);

-        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), 
+        wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ShowHidden"),

                               &s_lastShowHidden);
     }
 
                               &s_lastShowHidden);
     }
 


@@ -1027,7 +1022,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     {
         m_dir = wxGetCwd();
     }
     {
         m_dir = wxGetCwd();
     }

-    
+

     size_t len = m_dir.Len();
     if ((len > 1) && (m_dir[len-1] == wxFILE_SEP_PATH))
         m_dir.Remove( len-1, 1 );
     size_t len = m_dir.Len();
     if ((len > 1) && (m_dir[len-1] == wxFILE_SEP_PATH))
         m_dir.Remove( len-1, 1 );


@@ -1071,13 +1066,15 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     wxBitmapButton *but;
 
 
     wxBitmapButton *but;
 

-    but = new wxBitmapButton( this, ID_LIST_MODE, wxBitmap( listview_xpm ) );
+    but = new wxBitmapButton(this, ID_LIST_MODE,
+                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
 
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a list view") );
 #endif
     buttonsizer->Add( but, 0, wxALL, 5 );
 

-    but = new wxBitmapButton( this, ID_REPORT_MODE, wxBitmap( repview_xpm ) );
+    but = new wxBitmapButton(this, ID_REPORT_MODE,
+                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif


@@ -1085,15 +1082,17 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     buttonsizer->Add( 30, 5, 1 );
 
 
     buttonsizer->Add( 30, 5, 1 );
 

-    wxWindow *butDirUp = 
-        new wxBitmapButton( this, ID_UP_DIR, wxBitmap( dir_up_xpm ) );
+    wxWindow *butDirUp =
+        new wxBitmapButton(this, ID_UP_DIR,
+                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     butDirUp->SetToolTip( _("Go to parent directory") );
 #endif
     buttonsizer->Add( butDirUp, 0, wxALL, 5 );
 
 #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
 #if wxUSE_TOOLTIPS
     butDirUp->SetToolTip( _("Go to parent directory") );
 #endif
     buttonsizer->Add( butDirUp, 0, wxALL, 5 );
 
 #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...

-    but = new wxBitmapButton( this, ID_PARENT_DIR, wxBitmap(home_xpm) );
+    but = new wxBitmapButton(this, ID_PARENT_DIR,
+                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif


@@ -1102,17 +1101,24 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     buttonsizer->Add( 20, 20 );
 #endif //!__DOS__
 
     buttonsizer->Add( 20, 20 );
 #endif //!__DOS__
 

-    wxWindow *butNewDir = 
-        new wxBitmapButton( this, ID_NEW_DIR, wxBitmap(new_dir_xpm) );
+    wxWindow *butNewDir =
+        new wxBitmapButton(this, ID_NEW_DIR,
+                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));

 #if wxUSE_TOOLTIPS
     butNewDir->SetToolTip( _("Create new directory") );
 #endif
     buttonsizer->Add( butNewDir, 0, wxALL, 5 );
 
 #if wxUSE_TOOLTIPS
     butNewDir->SetToolTip( _("Create new directory") );
 #endif
     buttonsizer->Add( butNewDir, 0, wxALL, 5 );
 

+#ifdef __WXX11__
+    mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 0 );
+#else

     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );
     mainsizer->Add( buttonsizer, 0, wxALL | wxEXPAND, 5 );

+#endif

 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );

+#ifndef __WXX11__

     staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
     staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );

+#endif

     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
     m_static = new wxStaticText( this, -1, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );


@@ -1126,7 +1132,31 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     m_list->ShowHidden(s_lastShowHidden);
     m_list->SetNewDirControl(butNewDir);
     m_list->SetGoToParentControl(butDirUp);
     m_list->ShowHidden(s_lastShowHidden);
     m_list->SetNewDirControl(butNewDir);
     m_list->SetGoToParentControl(butDirUp);

-    
+
+#ifdef __WXX11__
+    // PDAs have a different screen layout
+    mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
+
+    wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
+    m_choice = new wxChoice( this, ID_CHOICE );
+    choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 5 );
+    mainsizer->Add( choicesizer, 0, wxEXPAND );
+
+    wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
+    m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+    textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
+    mainsizer->Add( textsizer, 0, wxEXPAND );
+
+    m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
+    m_check->SetValue( s_lastShowHidden );
+    textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
+
+    buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+    buttonsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxALL, 5 );
+    buttonsizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 5 );
+    mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
+
+#else

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


@@ -1144,6 +1174,8 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );
 
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );
 

+#endif
+

     m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
     while (tokens.HasMoreTokens())
     {
     m_choice->Append( firstWildText, (void*) new wxString( firstWild ) );
     while (tokens.HasMoreTokens())
     {


@@ -1214,8 +1246,6 @@ void wxFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
 
 void wxFileDialog::OnSelected( wxListEvent &event )
 {
 
 void wxFileDialog::OnSelected( wxListEvent &event )
 {

-    if (FindFocus() != m_list) return;
-

     wxString filename( event.m_item.m_text );
     if (filename == wxT("..")) return;
 
     wxString filename( event.m_item.m_text );
     if (filename == wxT("..")) return;
 


@@ -1380,6 +1410,8 @@ void wxFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
     wxString dir;
     m_list->GetDir( dir );
     m_static->SetLabel( dir );
     wxString dir;
     m_list->GetDir( dir );
     m_static->SetLabel( dir );

+
+    m_text->SetFocus();

 }
 
 void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )


@@ -1417,7 +1449,7 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
     wxString dir;
     m_list->GetDir( dir );
 #ifdef __UNIX__
     wxString dir;
     m_list->GetDir( dir );
 #ifdef __UNIX__

-    if (dir != wxT("/")) 
+    if (dir != wxT("/"))

 #endif
         dir += wxFILE_SEP_PATH;
 
 #endif
         dir += wxFILE_SEP_PATH;