X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/564a150b1f7c63a060c1b205a7cd50035031cd4b..61e6a2ab5e3e1de051c3db492219627c368141f1:/src/generic/filedlgg.cpp
diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 69335d597f..fc92b7327a 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -1,5 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: filedlgg.cpp
+//////////////////////////////////////////////////////////////////////////////
+// Name: src/generic/filedlgg.cpp
// Purpose: wxGenericFileDialog
// Author: Robert Roebling
// Modified by:
@@ -9,10 +9,6 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "filedlgg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@ -23,7 +19,7 @@
#if wxUSE_FILEDLG
// NOTE : it probably also supports MAC, untested
-#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__)
+#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)
#error wxGenericFileDialog currently only supports Unix, win32 and DOS
#endif
@@ -34,6 +30,7 @@
#include "wx/stattext.h"
#include "wx/debug.h"
#include "wx/log.h"
+#include "wx/longlong.h"
#include "wx/intl.h"
#include "wx/msgdlg.h"
#include "wx/sizer.h"
@@ -43,6 +40,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"
@@ -82,71 +80,91 @@
// ----------------------------------------------------------------------------
static
-int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataNameCompare( long data1, long data2, long sortOrder)
{
- wxFileData *fd1 = (wxFileData*)data1;
- wxFileData *fd2 = (wxFileData*)data2;
- if (fd1->GetFileName() == wxT("..")) return -data;
- if (fd2->GetFileName() == wxT("..")) return data;
- if (fd1->IsDir() && !fd2->IsDir()) return -data;
- if (fd2->IsDir() && !fd1->IsDir()) return data;
- return data*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() );
+ wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+ wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+ if (fd1->GetFileName() == wxT(".."))
+ return -sortOrder;
+ if (fd2->GetFileName() == wxT(".."))
+ return sortOrder;
+ if (fd1->IsDir() && !fd2->IsDir())
+ return -sortOrder;
+ if (fd2->IsDir() && !fd1->IsDir())
+ return sortOrder;
+
+ return sortOrder*wxStrcmp( fd1->GetFileName(), fd2->GetFileName() );
}
static
-int wxCALLBACK wxFileDataSizeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataSizeCompare(long data1, long data2, long sortOrder)
{
- wxFileData *fd1 = (wxFileData*)data1;
- wxFileData *fd2 = (wxFileData*)data2;
- if (fd1->GetFileName() == wxT("..")) return -data;
- if (fd2->GetFileName() == wxT("..")) return data;
- if (fd1->IsDir() && !fd2->IsDir()) return -data;
- if (fd2->IsDir() && !fd1->IsDir()) return data;
- if (fd1->IsLink() && !fd2->IsLink()) return -data;
- if (fd2->IsLink() && !fd1->IsLink()) return data;
- return data*(fd1->GetSize() - fd2->GetSize());
+ wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+ wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+ if (fd1->GetFileName() == wxT(".."))
+ return -sortOrder;
+ if (fd2->GetFileName() == wxT(".."))
+ return sortOrder;
+ if (fd1->IsDir() && !fd2->IsDir())
+ return -sortOrder;
+ if (fd2->IsDir() && !fd1->IsDir())
+ return sortOrder;
+ if (fd1->IsLink() && !fd2->IsLink())
+ return -sortOrder;
+ if (fd2->IsLink() && !fd1->IsLink())
+ return sortOrder;
+
+ return fd1->GetSize() > fd2->GetSize() ? sortOrder : -sortOrder;
}
static
-int wxCALLBACK wxFileDataTypeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTypeCompare(long data1, long data2, long sortOrder)
{
- wxFileData *fd1 = (wxFileData*)data1;
- wxFileData *fd2 = (wxFileData*)data2;
- if (fd1->GetFileName() == wxT("..")) return -data;
- if (fd2->GetFileName() == wxT("..")) return data;
- if (fd1->IsDir() && !fd2->IsDir()) return -data;
- if (fd2->IsDir() && !fd1->IsDir()) return data;
- if (fd1->IsLink() && !fd2->IsLink()) return -data;
- if (fd2->IsLink() && !fd1->IsLink()) return data;
- return data*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );
+ wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+ wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+ if (fd1->GetFileName() == wxT(".."))
+ return -sortOrder;
+ if (fd2->GetFileName() == wxT(".."))
+ return sortOrder;
+ if (fd1->IsDir() && !fd2->IsDir())
+ return -sortOrder;
+ if (fd2->IsDir() && !fd1->IsDir())
+ return sortOrder;
+ if (fd1->IsLink() && !fd2->IsLink())
+ return -sortOrder;
+ if (fd2->IsLink() && !fd1->IsLink())
+ return sortOrder;
+
+ return sortOrder*wxStrcmp( fd1->GetFileType(), fd2->GetFileType() );
}
static
-int wxCALLBACK wxFileDataTimeCompare( long data1, long data2, long data)
+int wxCALLBACK wxFileDataTimeCompare(long data1, long data2, long sortOrder)
{
- wxFileData *fd1 = (wxFileData*)data1;
- wxFileData *fd2 = (wxFileData*)data2;
- if (fd1->GetFileName() == wxT("..")) return -data;
- if (fd2->GetFileName() == wxT("..")) return data;
- if (fd1->IsDir() && !fd2->IsDir()) return -data;
- if (fd2->IsDir() && !fd1->IsDir()) return data;
-
- return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
+ wxFileData *fd1 = (wxFileData *)wxUIntToPtr(data1);
+ wxFileData *fd2 = (wxFileData *)wxUIntToPtr(data2);
+
+ if (fd1->GetFileName() == wxT(".."))
+ return -sortOrder;
+ if (fd2->GetFileName() == wxT(".."))
+ return sortOrder;
+ if (fd1->IsDir() && !fd2->IsDir())
+ return -sortOrder;
+ if (fd2->IsDir() && !fd1->IsDir())
+ return sortOrder;
+
+ return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? sortOrder : -sortOrder;
}
-#ifdef __UNIX__
+#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
+#define IsTopMostDir(dir) (dir.empty())
+#else
#define IsTopMostDir(dir) (dir == wxT("/"))
#endif
-#if defined(__DOS__) || defined(__WINDOWS__)
-#define IsTopMostDir(dir) (dir.IsEmpty())
-#endif
-
-#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
-// defined in src/generic/dirctrlg.cpp
-extern bool wxIsDriveAvailable(const wxString& dirName);
-#endif
-
// defined in src/generic/dirctrlg.cpp
extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayInt &icon_ids);
@@ -154,19 +172,9 @@ extern size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, w
// wxFileData
//-----------------------------------------------------------------------------
-wxFileData::wxFileData( const wxFileData& fileData )
-{
- m_fileName = fileData.GetFileName();
- m_filePath = fileData.GetFilePath();
- m_size = fileData.GetSize();
- m_dateTime = fileData.GetDateTime();
- m_permissions = fileData.GetPermissions();
- m_type = fileData.GetType();
- m_image = GetImageId();
-}
-
wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id )
{
+ Init();
m_fileName = fileName;
m_filePath = filePath;
m_type = type;
@@ -175,6 +183,24 @@ wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, file
ReadData();
}
+void wxFileData::Init()
+{
+ m_size = 0;
+ m_type = wxFileData::is_file;
+ m_image = wxFileIconsTable::file;
+}
+
+void wxFileData::Copy( const wxFileData& fileData )
+{
+ m_fileName = fileData.GetFileName();
+ m_filePath = fileData.GetFilePath();
+ m_size = fileData.GetSize();
+ m_dateTime = fileData.GetDateTime();
+ m_permissions = fileData.GetPermissions();
+ m_type = fileData.GetType();
+ m_image = fileData.GetImageId();
+}
+
void wxFileData::ReadData()
{
if (IsDrive())
@@ -183,7 +209,7 @@ void wxFileData::ReadData()
return;
}
-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
// c:\.. is a drive don't stat it
if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))
{
@@ -195,11 +221,17 @@ void wxFileData::ReadData()
wxStructStat buff;
-#if defined(__UNIX__) && (!defined( __EMX__ ) && !defined(__VMS))
+#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
lstat( m_filePath.fn_str(), &buff );
m_type |= S_ISLNK( buff.st_mode ) != 0 ? 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 );
+#endif
#endif
m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
@@ -208,10 +240,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 +285,7 @@ wxString wxFileData::GetFileType() const
return _("");
else if (IsDrive())
return _("");
- 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;
@@ -274,7 +309,8 @@ wxString wxFileData::GetHint() const
else if (IsDrive())
s += _("");
else // plain file
- s += wxString::Format( _("%ld bytes"), m_size );
+ s += wxString::Format(_("%ld bytes"),
+ wxLongLong(m_size).ToString().c_str());
s += wxT(' ');
@@ -286,7 +322,7 @@ wxString wxFileData::GetHint() const
}
return s;
-};
+}
wxString wxFileData::GetEntry( fileListFieldType num ) const
{
@@ -299,7 +335,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const
case FileList_Size:
if (!IsDir() && !IsLink() && !IsDrive())
- s.Printf(_T("%ld"), m_size);
+ s = wxLongLong(m_size).ToString();
break;
case FileList_Type:
@@ -307,7 +343,7 @@ wxString wxFileData::GetEntry( fileListFieldType num ) const
break;
case FileList_Time:
- if (!IsDrive())
+ if (!IsDrive())
s = GetModificationTime();
break;
@@ -347,7 +383,7 @@ void wxFileData::MakeItem( wxListItem &item )
if ( dg.Ok() )
item.SetTextColour(dg);
}
- item.m_data = (long)this;
+ item.m_data = wxPtrToUInt(this);
}
//-----------------------------------------------------------------------------
@@ -357,15 +393,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_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;
}
@@ -471,7 +508,7 @@ void wxFileCtrl::UpdateItem(const wxListItem &item)
fd->ReadData();
SetItemText(item, fd->GetFileName());
- SetItemImage(item, fd->GetImageId(), fd->GetImageId());
+ SetItemImage(item, fd->GetImageId());
if (GetWindowStyleFlag() & wxLC_REPORT)
{
@@ -488,27 +525,28 @@ void wxFileCtrl::UpdateFiles()
wxBusyCursor bcur; // this may take a while...
- FreeAllItemsData();
DeleteAllItems();
wxListItem item;
item.m_itemId = 0;
item.m_col = 0;
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__WXPM__)
+#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)
if ( IsTopMostDir(m_dirName) )
- {
+ {
wxArrayString names, paths;
wxArrayInt icons;
size_t n, count = wxGetAvailableDrives(paths, names, icons);
for (n=0; nRead(wxT("/wxWindows/wxFileDialog/ViewStyle"),
&ms_lastViewStyle);
@@ -874,13 +969,6 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
m_path += defaultFile;
m_filterExtension = wxEmptyString;
- // interpret wildcards
- wxArrayString wildDescriptions, wildFilters;
- if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) )
- {
- wxFAIL_MSG( wxT("Wrong file type description") );
- }
-
// layout
bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
@@ -892,14 +980,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
@@ -908,7 +996,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
@@ -916,7 +1004,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
@@ -926,7 +1014,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
@@ -939,8 +1027,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 );
@@ -949,7 +1037,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
style2 |= wxLC_SINGLE_SEL;
m_list = new wxFileCtrl( this, ID_LIST_CTRL,
- wildFilters[0], ms_lastShowHidden,
+ wxEmptyString, ms_lastShowHidden,
wxDefaultPosition, wxSize(540,200),
style2);
@@ -958,23 +1046,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 ), 0, wxCENTER | wxALL, 5 );
+ buttonsizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 5 );
mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
}
else
@@ -984,7 +1067,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 ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
mainsizer->Add( textsizer, 0, wxEXPAND );
wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL );
@@ -993,17 +1076,13 @@ 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 ), 0, wxCENTER | wxALL, 10 );
mainsizer->Add( choicesizer, 0, wxEXPAND );
}
- for (size_t n=0; nAppend( wildDescriptions[n], (void*) new wxString( wildFilters[n] ) );
- }
- SetFilterIndex( 0 );
+ SetWildcard(wildCard);
- SetAutoLayout( TRUE );
+ SetAutoLayout( true );
SetSizer( mainsizer );
mainsizer->Fit( this );
@@ -1012,22 +1091,27 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
Centre( wxBOTH );
m_text->SetFocus();
+
+ return true;
}
wxGenericFileDialog::~wxGenericFileDialog()
{
- if (wxConfig::Get(FALSE))
+ if (!m_bypassGenericImpl)
{
- wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
- ms_lastViewStyle);
- wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
- ms_lastShowHidden);
- }
+ if (wxConfig::Get(false))
+ {
+ wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
+ ms_lastViewStyle);
+ wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ShowHidden"),
+ ms_lastShowHidden);
+ }
- const int count = m_choice->GetCount();
- for ( int i = 0; i < count; i++ )
- {
- delete (wxString *)m_choice->GetClientData(i);
+ const int count = m_choice->GetCount();
+ for ( int i = 0; i < count; i++ )
+ {
+ delete (wxString *)m_choice->GetClientData(i);
+ }
}
}
@@ -1040,6 +1124,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 );
@@ -1057,6 +1153,31 @@ void wxGenericFileDialog::DoSetFilterIndex(int filterindex)
}
}
+void wxGenericFileDialog::SetWildcard(const wxString& wildCard)
+{
+ wxFileDialogBase::SetWildcard(wildCard);
+
+ wxArrayString wildDescriptions, wildFilters;
+ const size_t count = wxParseCommonDialogsFilter(m_wildCard,
+ wildDescriptions,
+ wildFilters);
+ wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") );
+
+ const size_t countOld = m_choice->GetCount();
+ size_t n;
+ for ( n = 0; n < countOld; n++ )
+ {
+ delete (wxString *)m_choice->GetClientData(n);
+ }
+
+ for ( n = 0; n < count; n++ )
+ {
+ m_choice->Append( wildDescriptions[n], new wxString( wildFilters[n] ) );
+ }
+
+ SetFilterIndex( 0 );
+}
+
void wxGenericFileDialog::SetFilterIndex( int filterindex )
{
m_choice->SetSelection( filterindex );
@@ -1086,7 +1207,7 @@ void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
GetEventHandler()->ProcessEvent( cevent );
}
-static bool ignoreChanges = FALSE;
+static bool ignoreChanges = false;
void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
{
@@ -1118,16 +1239,16 @@ 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 )
{
wxString filename( fn );
wxString dir = m_list->GetDir();
- if (filename.IsEmpty()) return;
+ if (filename.empty()) return;
if (filename == wxT(".")) return;
// "some/place/" means they want to chdir not try to load "place"
@@ -1154,20 +1275,23 @@ void wxGenericFileDialog::HandleAction( const wxString &fn )
if (filename.BeforeFirst(wxT('/')) == wxT("~"))
{
- filename = wxGetUserHome() + filename.Remove(0, 1);
+ filename = wxString(wxGetUserHome()) + filename.Remove(0, 1);
}
#endif // __UNIX__
- if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
- (filename.Find(wxT('?')) != wxNOT_FOUND))
+ if (!(m_dialogStyle & wxSAVE))
{
- if (filename.Find(wxFILE_SEP_PATH) != wxNOT_FOUND)
+ if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
+ (filename.Find(wxT('?')) != wxNOT_FOUND))
{
- wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
+ if (filename.Find(wxFILE_SEP_PATH) != wxNOT_FOUND)
+ {
+ wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
+ return;
+ }
+ m_list->SetWild( filename );
return;
}
- m_list->SetWild( filename );
- return;
}
if (!IsTopMostDir(dir))
@@ -1355,16 +1479,15 @@ void wxGenericFileDialog::UpdateControls()
bool enable = !IsTopMostDir(dir);
m_upDirButton->Enable(enable);
-#if defined(__DOS__) || defined(__WINDOWS__)
+#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
m_newDirButton->Enable(enable);
-#endif // defined(__DOS__) || defined(__WINDOWS__)
+#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
}
#ifdef USE_GENERIC_FILEDIALOG
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
#endif // USE_GENERIC_FILEDIALOG
#endif // wxUSE_FILEDLG
-