Fix history in wxWebViewIE when using a custom file scheme.

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

diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index dc82dcba88a4b458babba5c7e9da5fdc3b827d9e..0a697894dc60334e2fe1a64e7447e514e080ad07 100644 (file)
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -33,6 +33,7 @@
 #include "wx/generic/dirctrlg.h" // for wxFileIconsTable
 #include "wx/dir.h"
 #include "wx/tokenzr.h"
 #include "wx/generic/dirctrlg.h" // for wxFileIconsTable
 #include "wx/dir.h"
 #include "wx/tokenzr.h"

+#include "wx/imaglist.h"

 
 #ifdef __WXMSW__
     #include "wx/msw/wrapwin.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/wrapwin.h"


@@ -52,7 +53,7 @@
 // ----------------------------------------------------------------------------
 
 static
 // ----------------------------------------------------------------------------
 
 static

-int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataNameCompare( wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -70,7 +71,7 @@ int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder)
 }
 
 static
 }
 
 static

-int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataSizeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -92,7 +93,7 @@ int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder)
 }
 
 static
 }
 
 static

-int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataTypeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -114,7 +115,7 @@ int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder)
 }
 
 static
 }
 
 static

-int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, long sortOrder)
+int wxCALLBACK wxFileDataTimeCompare(wxIntPtr data1, wxIntPtr data2, wxIntPtr sortOrder)

 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
 {
      wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
      wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);


@@ -193,7 +194,7 @@ void wxFileData::ReadData()
     m_type |= (fileAttribs & FILE_ATTRIBUTE_DIRECTORY) != 0 ? is_dir : 0;
 
     wxString p, f, ext;
     m_type |= (fileAttribs & FILE_ATTRIBUTE_DIRECTORY) != 0 ? is_dir : 0;
 
     wxString p, f, ext;

-    wxSplitPath(m_filePath, & p, & f, & ext);
+    wxFileName::SplitPath(m_filePath, & p, & f, & ext);

     if (wxStricmp(ext, wxT("exe")) == 0)
         m_type |= is_exe;
 
     if (wxStricmp(ext, wxT("exe")) == 0)
         m_type |= is_exe;
 


@@ -225,13 +226,7 @@ void wxFileData::ReadData()
     lstat( m_filePath.fn_str(), &buff );
     m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
 #else // no lstat()
     lstat( m_filePath.fn_str(), &buff );
     m_type |= S_ISLNK(buff.st_mode) ? is_link : 0;
 #else // no lstat()

-    // only translate to file charset if we don't go by our
-    // wxStat implementation
-#ifndef wxNEED_WX_UNISTD_H
-    wxStat( m_filePath.fn_str() , &buff );
-#else

     wxStat( m_filePath, &buff );
     wxStat( m_filePath, &buff );

-#endif

 #endif
 
     m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
 #endif
 
     m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;


@@ -244,25 +239,25 @@ void wxFileData::ReadData()
     // __WXWINCE__
 
 #if defined(__UNIX__)
     // __WXWINCE__
 
 #if defined(__UNIX__)

-    m_permissions.Printf(_T("%c%c%c%c%c%c%c%c%c"),
-                         buff.st_mode & wxS_IRUSR ? _T('r') : _T('-'),
-                         buff.st_mode & wxS_IWUSR ? _T('w') : _T('-'),
-                         buff.st_mode & wxS_IXUSR ? _T('x') : _T('-'),
-                         buff.st_mode & wxS_IRGRP ? _T('r') : _T('-'),
-                         buff.st_mode & wxS_IWGRP ? _T('w') : _T('-'),
-                         buff.st_mode & wxS_IXGRP ? _T('x') : _T('-'),
-                         buff.st_mode & wxS_IROTH ? _T('r') : _T('-'),
-                         buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
-                         buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
+    m_permissions.Printf(wxT("%c%c%c%c%c%c%c%c%c"),
+                         buff.st_mode & wxS_IRUSR ? wxT('r') : wxT('-'),
+                         buff.st_mode & wxS_IWUSR ? wxT('w') : wxT('-'),
+                         buff.st_mode & wxS_IXUSR ? wxT('x') : wxT('-'),
+                         buff.st_mode & wxS_IRGRP ? wxT('r') : wxT('-'),
+                         buff.st_mode & wxS_IWGRP ? wxT('w') : wxT('-'),
+                         buff.st_mode & wxS_IXGRP ? wxT('x') : wxT('-'),
+                         buff.st_mode & wxS_IROTH ? wxT('r') : wxT('-'),
+                         buff.st_mode & wxS_IWOTH ? wxT('w') : wxT('-'),
+                         buff.st_mode & wxS_IXOTH ? wxT('x') : wxT('-'));

 #elif defined(__WIN32__)
     DWORD attribs = ::GetFileAttributes(m_filePath.c_str());
     if (attribs != (DWORD)-1)
     {
 #elif defined(__WIN32__)
     DWORD attribs = ::GetFileAttributes(m_filePath.c_str());
     if (attribs != (DWORD)-1)
     {

-        m_permissions.Printf(_T("%c%c%c%c"),
-                             attribs & FILE_ATTRIBUTE_ARCHIVE  ? _T('A') : _T(' '),
-                             attribs & FILE_ATTRIBUTE_READONLY ? _T('R') : _T(' '),
-                             attribs & FILE_ATTRIBUTE_HIDDEN   ? _T('H') : _T(' '),
-                             attribs & FILE_ATTRIBUTE_SYSTEM   ? _T('S') : _T(' '));
+        m_permissions.Printf(wxT("%c%c%c%c"),
+                             attribs & FILE_ATTRIBUTE_ARCHIVE  ? wxT('A') : wxT(' '),
+                             attribs & FILE_ATTRIBUTE_READONLY ? wxT('R') : wxT(' '),
+                             attribs & FILE_ATTRIBUTE_HIDDEN   ? wxT('H') : wxT(' '),
+                             attribs & FILE_ATTRIBUTE_SYSTEM   ? wxT('S') : wxT(' '));

     }
 #endif
 
     }
 #endif
 


@@ -356,7 +351,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const
 #endif // defined(__UNIX__) || defined(__WIN32__)
 
         default:
 #endif // defined(__UNIX__) || defined(__WIN32__)
 
         default:

-            wxFAIL_MSG( _T("unexpected field in wxFileData::GetEntry()") );
+            wxFAIL_MSG( wxT("unexpected field in wxFileData::GetEntry()") );

     }
 
     return s;
     }
 
     return s;


@@ -381,8 +376,8 @@ void wxFileData::MakeItem( wxListItem &item )
 
     if (IsLink())
     {
 
     if (IsLink())
     {

-        wxColour dg = wxTheColourDatabase->Find( _T("MEDIUM GREY") );
-        if ( dg.Ok() )
+        wxColour dg = wxTheColourDatabase->Find( wxT("MEDIUM GREY") );
+        if ( dg.IsOk() )

             item.SetTextColour(dg);
     }
     item.m_data = wxPtrToUInt(this);
             item.SetTextColour(dg);
     }
     item.m_data = wxPtrToUInt(this);


@@ -682,14 +677,14 @@ void wxFileListCtrl::MakeDir()
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;
     wxListItem item;
     item.m_itemId = 0;
     item.m_col = 0;

-    long id = Add( fd, item );
+    long itemid = Add( fd, item );

 
 

-    if (id != -1)
+    if (itemid != -1)

     {
         SortItems(m_sort_field, m_sort_forward);
     {
         SortItems(m_sort_field, m_sort_forward);

-        id = FindItem( 0, wxPtrToUInt(fd) );
-        EnsureVisible( id );
-        EditLabel( id );
+        itemid = FindItem( 0, wxPtrToUInt(fd) );
+        EnsureVisible( itemid );
+        EditLabel( itemid );

     }
     else
         delete fd;
     }
     else
         delete fd;


@@ -912,6 +907,7 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
     this->m_style = style;
     m_inSelected = false;
     m_noSelChgEvent = false;
     this->m_style = style;
     m_inSelected = false;
     m_noSelChgEvent = false;

+    m_check = NULL;

 
     // check that the styles are not contradictory
     wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_OPEN ) ),
 
     // check that the styles are not contradictory
     wxASSERT_MSG( !( ( m_style & wxFC_SAVE ) && ( m_style & wxFC_OPEN ) ),


@@ -947,10 +943,11 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     if ( is_pda )
 
     wxBoxSizer *staticsizer = new wxBoxSizer( wxHORIZONTAL );
     if ( is_pda )

-        staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ), 0, wxRIGHT, 10 );
+        staticsizer->Add( new wxStaticText( this, wxID_ANY, _( "Current directory:" ) ),
+                          wxSizerFlags().DoubleBorder(wxRIGHT) );

     m_static = new wxStaticText( this, wxID_ANY, m_dir );
     staticsizer->Add( m_static, 1 );
     m_static = new wxStaticText( this, wxID_ANY, m_dir );
     staticsizer->Add( m_static, 1 );

-    mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 10 );
+    mainsizer->Add( staticsizer, wxSizerFlags().Expand().Border());

 
     long style2 = wxLC_LIST;
     if ( !( m_style & wxFC_MULTIPLE ) )
 
     long style2 = wxLC_LIST;
     if ( !( m_style & wxFC_MULTIPLE ) )


@@ -979,33 +976,25 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().Border() );
 
         wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
         textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().Border() );

+        textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() );

         mainsizer->Add( textsizer, wxSizerFlags().Expand() );
 
         mainsizer->Add( textsizer, wxSizerFlags().Expand() );
 

-        m_check = NULL;
-        textsizer->Add( m_choice, wxSizerFlags( 1 ).Centre().Border() );

     }
     else // !is_pda
     {
     }
     else // !is_pda
     {

-        mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().DoubleHorzBorder() );
-
-        wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
-        textsizer->Add( m_text, wxSizerFlags( 1 ).Centre().
-                        DoubleBorder( wxLEFT | wxRIGHT | wxTOP ) );
-        mainsizer->Add( textsizer, wxSizerFlags().Expand() );
-
-        wxSizerFlags flagsCentre;
-        flagsCentre.Centre().DoubleBorder();
+        mainsizer->Add( m_list, wxSizerFlags( 1 ).Expand().Border() );
+        mainsizer->Add( m_text, wxSizerFlags().Expand().Border() );

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

-        choicesizer->Add( m_choice, wxSizerFlags( flagsCentre ).Proportion( 1 ) );
+        choicesizer->Add( m_choice, wxSizerFlags( 1 ).Centre() );

 
         if ( !( m_style & wxFC_NOSHOWHIDDEN ) )
 
         if ( !( m_style & wxFC_NOSHOWHIDDEN ) )

-            {
+        {

             m_check = new wxCheckBox( this, ID_CHECK, _( "Show &hidden files" ) );
             m_check = new wxCheckBox( this, ID_CHECK, _( "Show &hidden files" ) );

-            choicesizer->Add( m_check, flagsCentre );
-            }
+            choicesizer->Add( m_check, wxSizerFlags().Centre().DoubleBorder(wxLEFT) );
+        }

 
 

-        mainsizer->Add( choicesizer, wxSizerFlags().Expand() );
+        mainsizer->Add( choicesizer, wxSizerFlags().Expand().Border() );

     }
 
     SetWildcard( wildCard );
     }
 
     SetWildcard( wildCard );


@@ -1080,7 +1069,15 @@ wxFileName wxGenericFileCtrl::DoGetFileName() const
     return fn;
 }
 
     return fn;
 }
 

-void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool fullPath ) const
+// helper used in DoGetFilenames() and needed because Borland can't compile
+// operator?: inline
+static inline wxString GetFileNameOrPath(const wxFileName& fn, bool fullPath)
+{
+    return fullPath ? fn.GetFullPath() : fn.GetFullName();
+}
+
+void
+wxGenericFileCtrl::DoGetFilenames(wxArrayString& filenames, bool fullPath) const

 {
     filenames.clear();
 
 {
     filenames.clear();
 


@@ -1093,7 +1090,7 @@ void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool ful
         if ( fn.IsRelative() )
             fn.MakeAbsolute(dir);
 
         if ( fn.IsRelative() )
             fn.MakeAbsolute(dir);
 

-        filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
+        filenames.push_back(GetFileNameOrPath(fn, fullPath));

         return;
     }
 
         return;
     }
 


@@ -1117,7 +1114,7 @@ void wxGenericFileCtrl::DoGetFilenames( wxArrayString& filenames, const bool ful
         m_list->GetItem(item);
 
         const wxFileName fn(dir, item.m_text);
         m_list->GetItem(item);
 
         const wxFileName fn(dir, item.m_text);

-        filenames.push_back(fullPath ? fn.GetFullPath() : fn.GetFullName());
+        filenames.push_back(GetFileNameOrPath(fn, fullPath));

     }
 }
 
     }
 }
 


@@ -1170,21 +1167,25 @@ bool wxGenericFileCtrl::SetFilename( const wxString& name )
 
 void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
 {
 
 void wxGenericFileCtrl::DoSetFilterIndex( int filterindex )
 {

-    const wxString& str = (wx_static_cast(wxStringClientData *,
-                            m_choice->GetClientObject( filterindex )))
-                            ->GetData();
+    wxClientData *pcd = m_choice->GetClientObject( filterindex );
+    if ( !pcd )
+        return;
+
+    const wxString& str = ((static_cast<wxStringClientData *>(pcd))->GetData());

     m_list->SetWild( str );
     m_filterIndex = filterindex;
     if ( str.Left( 2 ) == wxT( "*." ) )
     {
         m_filterExtension = str.Mid( 1 );
     m_list->SetWild( str );
     m_filterIndex = filterindex;
     if ( str.Left( 2 ) == wxT( "*." ) )
     {
         m_filterExtension = str.Mid( 1 );

-        if ( m_filterExtension == _T( ".*" ) )
+        if ( m_filterExtension == wxT( ".*" ) )

             m_filterExtension.clear();
     }
     else
     {
         m_filterExtension.clear();
     }
             m_filterExtension.clear();
     }
     else
     {
         m_filterExtension.clear();
     }

+
+    GenerateFilterChangedEvent( this, this );

 }
 
 void wxGenericFileCtrl::SetWildcard( const wxString& wildCard )
 }
 
 void wxGenericFileCtrl::SetWildcard( const wxString& wildCard )


@@ -1291,7 +1292,7 @@ void wxGenericFileCtrl::OnSelected( wxListEvent &event )
 
         return;
     }
 
         return;
     }

-    
+

 
     m_ignoreChanges = true;
     m_text->SetValue( filename );
 
     m_ignoreChanges = true;
     m_text->SetValue( filename );


@@ -1424,7 +1425,7 @@ bool wxGenericFileCtrl::SetPath( const wxString& path )
         return false;
 
     wxString ext;
         return false;
 
     wxString ext;

-    wxSplitPath( path, &m_dir, &m_fileName, &ext );
+    wxFileName::SplitPath( path, &m_dir, &m_fileName, &ext );

     if ( !ext.empty() )
     {
         m_fileName += wxT( "." );
     if ( !ext.empty() )
     {
         m_fileName += wxT( "." );