X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/811697104b7e2f30a28feb4171c1c408f0459966..824fd93d761e1e697be19a4ca582c5259e12c8ea:/src/generic/filedlgg.cpp?ds=sidebyside

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index bcb63b71d0..3bc760fb6b 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -43,6 +43,7 @@
 #include "wx/imaglist.h"
 #include "wx/dir.h"
 #include "wx/artprov.h"
+#include "wx/settings.h"
 #include "wx/file.h"        // for wxS_IXXX constants only
 #include "wx/filedlg.h"     // wxOPEN, wxSAVE...
 #include "wx/generic/filedlgg.h"
@@ -208,10 +209,13 @@ void wxFileData::ReadData()
     // try to get a better icon
     if (m_image == wxFileIconsTable::file)
     {
-        if (IsExe())
+        if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
+        {
+            m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.')));
+        } else if (IsExe())
+        {
             m_image = wxFileIconsTable::executable;
-        else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
-            m_image = wxTheFileIconsTable->GetIconID(m_fileName.AfterLast(wxT('.')));
+        }
     }
 
     m_size = buff.st_size;
@@ -250,7 +254,7 @@ wxString wxFileData::GetFileType() const
         return _("<LINK>");
     else if (IsDrive())
         return _("<DRIVE>");
-   else if (m_fileName.Find(wxT('.'), TRUE) != wxNOT_FOUND)
+   else if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
         return m_fileName.AfterLast(wxT('.'));
 
     return wxEmptyString;
@@ -357,16 +361,16 @@ void wxFileData::MakeItem( wxListItem &item )
 IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl)
 
 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)
-    EVT_LIST_COL_CLICK(-1, wxFileCtrl::OnListColClick)
+    EVT_LIST_DELETE_ITEM(wxID_ANY, wxFileCtrl::OnListDeleteItem)
+    EVT_LIST_DELETE_ALL_ITEMS(wxID_ANY, wxFileCtrl::OnListDeleteAllItems)
+    EVT_LIST_END_LABEL_EDIT(wxID_ANY, wxFileCtrl::OnListEndLabelEdit)
+    EVT_LIST_COL_CLICK(wxID_ANY, wxFileCtrl::OnListColClick)
 END_EVENT_TABLE()
 
 
 wxFileCtrl::wxFileCtrl()
 {
-    m_showHidden = FALSE;
+    m_showHidden = false;
     m_sort_foward = 1;
     m_sort_field = wxFileData::FileList_Name;
 }
@@ -653,7 +657,7 @@ void wxFileCtrl::GoToParentDir()
         if (!m_dirName.IsEmpty())
         {
             if (m_dirName.Last() == wxT('.'))
-                m_dirName = wxT("");
+                m_dirName = wxEmptyString;
         }
 #elif defined(__UNIX__)
         if (m_dirName.IsEmpty())
@@ -701,7 +705,7 @@ void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
     FreeItemData(event.m_item);
 }
 
-void wxFileCtrl::OnListDeleteAllItems( wxListEvent &event )
+void wxFileCtrl::OnListDeleteAllItems( wxListEvent & WXUNUSED(event) )
 {
     FreeAllItemsData();
 }
@@ -854,7 +858,7 @@ BEGIN_EVENT_TABLE(wxGenericFileDialog,wxDialog)
 END_EVENT_TABLE()
 
 long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
-bool wxGenericFileDialog::ms_lastShowHidden = FALSE;
+bool wxGenericFileDialog::ms_lastShowHidden = false;
 
 wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxString& message,
@@ -865,10 +869,10 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
                            const wxPoint& pos )
                     :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
 {
-    wxDialog::Create( parent, -1, message, pos, wxDefaultSize,
+    wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
                       wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );
 
-    if (wxConfig::Get(FALSE))
+    if (wxConfig::Get(false))
     {
         wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
                               &ms_lastViewStyle);
@@ -897,7 +901,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
     // interpret wildcards
     wxArrayString wildDescriptions, wildFilters;
-    if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) )
+    if ( !wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters) )
     {
         wxFAIL_MSG( wxT("Wrong file type description") );
     }
@@ -913,14 +917,14 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     wxBitmapButton *but;
 
     but = new wxBitmapButton(this, ID_LIST_MODE,
-                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_CMN_DIALOG));
+                             wxArtProvider::GetBitmap(wxART_LIST_VIEW, wxART_BUTTON));
 #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,
-                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_CMN_DIALOG));
+                             wxArtProvider::GetBitmap(wxART_REPORT_VIEW, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("View files as a detailed view") );
 #endif
@@ -929,7 +933,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     buttonsizer->Add( 30, 5, 1 );
 
     m_upDirButton = new wxBitmapButton(this, ID_UP_DIR,
-                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_CMN_DIALOG));
+                           wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     m_upDirButton->SetToolTip( _("Go to parent directory") );
 #endif
@@ -937,7 +941,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
 #ifndef __DOS__ // VS: Home directory is meaningless in MS-DOS...
     but = new wxBitmapButton(this, ID_PARENT_DIR,
-                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));
+                             wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     but->SetToolTip( _("Go to home directory") );
 #endif
@@ -947,7 +951,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 #endif //!__DOS__
 
     m_newDirButton = new wxBitmapButton(this, ID_NEW_DIR,
-                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+                           wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON));
 #if wxUSE_TOOLTIPS
     m_newDirButton->SetToolTip( _("Create new directory") );
 #endif
@@ -960,8 +964,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     if (is_pda)
-        staticsizer->Add( new wxStaticText( this, -1, _("Current directory:") ), 0, wxRIGHT, 10 );
-    m_static = new wxStaticText( this, -1, m_dir );
+        staticsizer->Add( new wxStaticText( this, wxID_ANY, _("Current directory:") ), 0, wxRIGHT, 10 );
+    m_static = new wxStaticText( this, wxID_ANY, m_dir );
     staticsizer->Add( m_static, 1 );
     mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
 
@@ -979,23 +983,18 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         // 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( ms_lastShowHidden );
-        textsizer->Add( m_check, 0, wxCENTER|wxALL, 5 );
+        m_check = NULL;
+        m_choice = new wxChoice( this, ID_CHOICE );
+        textsizer->Add( m_choice, 1, 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 );
+        buttonsizer->Add( new wxButton( this, wxID_OK, wxSTOCK_OK ), 0, wxCENTER | wxALL, 5 );
+        buttonsizer->Add( new wxButton( this, wxID_CANCEL, wxSTOCK_CANCEL ), 0, wxCENTER | wxALL, 5 );
         mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
     }
     else
@@ -1005,7 +1004,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
         textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
-        textsizer->Add( new wxButton( this, wxID_OK, _("OK") ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
+        textsizer->Add( new wxButton( this, wxID_OK, wxSTOCK_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
         mainsizer->Add( textsizer, 0, wxEXPAND );
 
         wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
@@ -1014,7 +1013,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
         m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
         m_check->SetValue( ms_lastShowHidden );
         choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
-        choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
+        choicesizer->Add( new wxButton( this, wxID_CANCEL, wxSTOCK_CANCEL ), 0, wxCENTER | wxALL, 10 );
         mainsizer->Add( choicesizer, 0, wxEXPAND );
     }
 
@@ -1024,7 +1023,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
     }
     SetFilterIndex( 0 );
 
-    SetAutoLayout( TRUE );
+    SetAutoLayout( true );
     SetSizer( mainsizer );
 
     mainsizer->Fit( this );
@@ -1037,7 +1036,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
 
 wxGenericFileDialog::~wxGenericFileDialog()
 {
-    if (wxConfig::Get(FALSE))
+    if (wxConfig::Get(false))
     {
         wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
                                ms_lastViewStyle);
@@ -1061,6 +1060,18 @@ int wxGenericFileDialog::ShowModal()
     return wxDialog::ShowModal();
 }
 
+bool wxGenericFileDialog::Show( bool show )
+{
+    if (show)
+    {
+        m_list->GoToDir(m_dir);
+        UpdateControls();
+        m_text->SetValue(m_fileName);
+    }
+
+    return wxDialog::Show( show );
+}
+
 void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
 {
     wxString *str = (wxString*) m_choice->GetClientData( filterindex );
@@ -1107,7 +1118,7 @@ void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
     GetEventHandler()->ProcessEvent( cevent );
 }
 
-static bool ignoreChanges = FALSE;
+static bool ignoreChanges = false;
 
 void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
 {
@@ -1139,9 +1150,9 @@ void wxGenericFileDialog::OnSelected( wxListEvent &event )
     dir += filename;
     if (wxDirExists(dir)) return;
 
-    ignoreChanges = TRUE;
+    ignoreChanges = true;
     m_text->SetValue( filename );
-    ignoreChanges = FALSE;
+    ignoreChanges = false;
 }
 
 void wxGenericFileDialog::HandleAction( const wxString &fn )