//////////////////////////////////////////////////////////////////////////////
-// Name: filedlgg.cpp
+// Name: src/generic/filedlgg.cpp
// Purpose: wxGenericFileDialog
// Author: Robert Roebling
// Modified by:
// 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"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#if wxUSE_FILEDLG
#error wxGenericFileDialog currently only supports Unix, win32 and DOS
#endif
-#include "wx/checkbox.h"
-#include "wx/textctrl.h"
-#include "wx/choice.h"
-#include "wx/checkbox.h"
-#include "wx/stattext.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/msgdlg.h"
-#include "wx/sizer.h"
-#include "wx/bmpbuttn.h"
+#ifndef WX_PRECOMP
+ #ifdef __WXMSW__
+ #include "wx/msw/wrapwin.h"
+ #endif
+ #include "wx/hash.h"
+ #include "wx/intl.h"
+ #include "wx/settings.h"
+ #include "wx/log.h"
+ #include "wx/msgdlg.h"
+ #include "wx/bmpbuttn.h"
+ #include "wx/checkbox.h"
+ #include "wx/choice.h"
+ #include "wx/stattext.h"
+ #include "wx/textctrl.h"
+ #include "wx/sizer.h"
+ #include "wx/filedlg.h" // wxFD_OPEN, wxFD_SAVE...
+#endif
+
+#include "wx/longlong.h"
#include "wx/tokenzr.h"
#include "wx/config.h"
#include "wx/imaglist.h"
#include "wx/dir.h"
#include "wx/artprov.h"
-#include "wx/settings.h"
+#include "wx/filefn.h"
#include "wx/file.h" // for wxS_IXXX constants only
-#include "wx/filedlg.h" // wxOPEN, wxSAVE...
#include "wx/generic/filedlgg.h"
#include "wx/generic/dirctrlg.h" // for wxFileIconsTable
#include "wx/tooltip.h"
#endif
-#include <sys/types.h>
-#include <sys/stat.h>
+#ifndef __WXWINCE__
+ #include <sys/types.h>
+ #include <sys/stat.h>
+#endif
#ifdef __UNIX__
#include <dirent.h>
#endif
#ifdef __WINDOWS__
- #include "wx/msw/wrapwin.h"
#include "wx/msw/mslu.h"
#endif
#include <direct.h>
#endif
+#ifndef __WXWINCE__
#include <time.h>
+#endif
+
#if defined(__UNIX__) || defined(__DOS__)
#include <unistd.h>
#endif
// ----------------------------------------------------------------------------
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;
}
-#if defined(__UNIX__) && !defined(__OS2__)
+#if defined(__WXWINCE__)
+#define IsTopMostDir(dir) (dir == wxT("\\") || dir == wxT("/"))
+#elif (defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__))
+#define IsTopMostDir(dir) (dir.empty())
+#else
#define IsTopMostDir(dir) (dir == wxT("/"))
#endif
-#if defined(__DOS__) || defined(__WINDOWS__) || defined (__OS2__)
-#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);
wxFileData::wxFileData( const wxString &filePath, const wxString &fileName, fileType type, int image_id )
{
+ Init();
m_fileName = fileName;
m_filePath = filePath;
m_type = type;
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_dateTime = fileData.GetDateTime();
m_permissions = fileData.GetPermissions();
m_type = fileData.GetType();
- m_image = GetImageId();
+ m_image = fileData.GetImageId();
}
void wxFileData::ReadData()
return;
}
-#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+#if defined(__DOS__) || (defined(__WINDOWS__) && !defined(__WXWINCE__)) || defined(__OS2__)
// c:\.. is a drive don't stat it
if ((m_fileName == wxT("..")) && (m_filePath.length() <= 5))
{
}
#endif // __DOS__ || __WINDOWS__
+#ifdef __WXWINCE__
+
+ // WinCE
+
+ DWORD fileAttribs = GetFileAttributes(m_filePath.fn_str());
+ m_type |= (fileAttribs & FILE_ATTRIBUTE_DIRECTORY) != 0 ? is_dir : 0;
+
+ wxString p, f, ext;
+ wxSplitPath(m_filePath, & p, & f, & ext);
+ if (wxStricmp(ext, wxT("exe")) == 0)
+ m_type |= is_exe;
+
+ // Find out size
+ m_size = 0;
+ HANDLE fileHandle = CreateFile(m_filePath.fn_str(),
+ GENERIC_READ,
+ FILE_SHARE_READ,
+ NULL,
+ OPEN_EXISTING,
+ FILE_ATTRIBUTE_NORMAL,
+ NULL);
+
+ if (fileHandle != INVALID_HANDLE_VALUE)
+ {
+ m_size = GetFileSize(fileHandle, 0);
+ CloseHandle(fileHandle);
+ }
+
+ m_dateTime = wxFileModificationTime(m_filePath);
+
+#else
+
+ // OTHER PLATFORMS
+
wxStructStat buff;
#if defined(__UNIX__) && (!defined( __OS2__ ) && !defined(__VMS))
m_type |= (buff.st_mode & S_IFDIR) != 0 ? is_dir : 0;
m_type |= (buff.st_mode & wxS_IXUSR) != 0 ? is_exe : 0;
- // try to get a better icon
- if (m_image == wxFileIconsTable::file)
- {
- if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
- {
- m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.')));
- } else if (IsExe())
- {
- m_image = wxFileIconsTable::executable;
- }
- }
-
- m_size = (long)buff.st_size;
+ m_size = buff.st_size;
m_dateTime = buff.st_mtime;
+#endif
+ // __WXWINCE__
#if defined(__UNIX__)
m_permissions.Printf(_T("%c%c%c%c%c%c%c%c%c"),
buff.st_mode & wxS_IWOTH ? _T('w') : _T('-'),
buff.st_mode & wxS_IXOTH ? _T('x') : _T('-'));
#elif defined(__WIN32__)
- DWORD attribs = GetFileAttributes(m_filePath);
+ DWORD attribs = ::GetFileAttributes(m_filePath.c_str());
if (attribs != (DWORD)-1)
{
m_permissions.Printf(_T("%c%c%c%c"),
attribs & FILE_ATTRIBUTE_SYSTEM ? _T('S') : _T(' '));
}
#endif
+
+ // try to get a better icon
+ if (m_image == wxFileIconsTable::file)
+ {
+ if (m_fileName.Find(wxT('.'), true) != wxNOT_FOUND)
+ {
+ m_image = wxTheFileIconsTable->GetIconID( m_fileName.AfterLast(wxT('.')));
+ } else if (IsExe())
+ {
+ m_image = wxFileIconsTable::executable;
+ }
+ }
}
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;
else if (IsDrive())
s += _("<DRIVE>");
else // plain file
- s += wxString::Format( _("%ld bytes"), m_size );
+ s += wxString::Format(wxPLURAL("%ld byte", "%ld bytes", m_size),
+ wxLongLong(m_size).ToString().c_str());
s += wxT(' ');
}
return s;
-};
+}
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:
break;
case FileList_Time:
- if (!IsDrive())
+ if (!IsDrive())
s = GetModificationTime();
break;
if ( dg.Ok() )
item.SetTextColour(dg);
}
- item.m_data = (long)this;
+ item.m_data = wxPtrToUInt(this);
}
//-----------------------------------------------------------------------------
// wxFileCtrl
//-----------------------------------------------------------------------------
+static bool ignoreChanges = false;
+
IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl)
BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
item.m_itemId = 0;
item.m_col = 0;
-#if defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)
+#if (defined(__WINDOWS__) || defined(__DOS__) || defined(__WXMAC__) || defined(__OS2__)) && !defined(__WXWINCE__)
if ( IsTopMostDir(m_dirName) )
- {
+ {
wxArrayString names, paths;
wxArrayInt icons;
size_t n, count = wxGetAvailableDrives(paths, names, icons);
for (n=0; n<count; n++)
- {
+ {
wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
if (Add(fd, item) != -1)
item.m_itemId++;
else
delete fd;
- }
}
+ }
else
#endif // defined(__DOS__) || defined(__WINDOWS__)
{
// Real directory...
- if ( !IsTopMostDir(m_dirName) )
+ if ( !IsTopMostDir(m_dirName) && !m_dirName.empty() )
{
wxString p(wxPathOnly(m_dirName));
-#if defined(__UNIX__) && !defined(__OS2__)
- if (p.IsEmpty()) p = wxT("/");
+#if (defined(__UNIX__) || defined(__WXWINCE__)) && !defined(__OS2__)
+ if (p.empty()) p = wxT("/");
#endif // __UNIX__
wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
if (Add(fd, item) != -1)
- item.m_itemId++;
+ item.m_itemId++;
else
delete fd;
}
if (dirname.length() == 2 && dirname[1u] == wxT(':'))
dirname << wxT('\\');
#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
+
+ if (dirname.empty())
+ dirname = wxFILE_SEP_PATH;
+
+ wxLogNull logNull;
wxDir dir(dirname);
if ( dir.IsOpened() )
{
wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
if (Add(fd, item) != -1)
- item.m_itemId++;
+ item.m_itemId++;
else
delete fd;
{
wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
if (Add(fd, item) != -1)
- item.m_itemId++;
+ item.m_itemId++;
else
delete fd;
if (id != -1)
{
SortItems(m_sort_field, m_sort_foward);
- id = FindItem( 0, (long)fd );
+ id = FindItem( 0, wxPtrToUInt(fd) );
EnsureVisible( id );
EditLabel( id );
}
{
if (!IsTopMostDir(m_dirName))
{
- size_t len = m_dirName.Len();
+ size_t len = m_dirName.length();
if (wxEndsWithPathSeparator(m_dirName))
m_dirName.Remove( len-1, 1 );
wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName );
#if defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
- if (!m_dirName.IsEmpty())
+ if (!m_dirName.empty())
{
if (m_dirName.Last() == wxT('.'))
m_dirName = wxEmptyString;
}
#elif defined(__UNIX__)
- if (m_dirName.IsEmpty())
+ if (m_dirName.empty())
m_dirName = wxT("/");
#endif
UpdateFiles();
long id = FindItem( 0, fname );
- if (id != -1)
+ if (id != wxNOT_FOUND)
{
+ ignoreChanges = true;
SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( id );
+ ignoreChanges = false;
}
}
}
m_dirName = dir;
UpdateFiles();
+
+ ignoreChanges = true;
SetItemState( 0, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ ignoreChanges = false;
+
EnsureVisible( 0 );
}
wxFileData *fd = (wxFileData*)event.m_item.m_data;
wxASSERT( fd );
- if ((event.GetLabel().IsEmpty()) ||
- (event.GetLabel() == _(".")) ||
- (event.GetLabel() == _("..")) ||
+ if ((event.GetLabel().empty()) ||
+ (event.GetLabel() == wxT(".")) ||
+ (event.GetLabel() == wxT("..")) ||
(event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
{
wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
if (wxRenameFile(fd->GetFilePath(),new_name))
{
fd->SetNewName( new_name, event.GetLabel() );
+
+ ignoreChanges = true;
SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
+ ignoreChanges = false;
+
UpdateItem( event.GetItem() );
EnsureVisible( event.GetItem() );
}
SortItems(m_sort_field, m_sort_foward);
}
-void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool foward)
+void wxFileCtrl::SortItems(wxFileData::fileListFieldType field, bool forward)
{
m_sort_field = field;
- m_sort_foward = foward;
- long sort_dir = foward ? 1 : -1;
+ m_sort_foward = forward;
+ const long sort_dir = forward ? 1 : -1;
switch (m_sort_field)
{
- case wxFileData::FileList_Name :
- {
- wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataNameCompare, sort_dir);
- break;
- }
case wxFileData::FileList_Size :
- {
- wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataSizeCompare, sort_dir);
+ wxListCtrl::SortItems(wxFileDataSizeCompare, sort_dir);
break;
- }
+
case wxFileData::FileList_Type :
- {
- wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTypeCompare, sort_dir);
- break;
- }
+ wxListCtrl::SortItems(wxFileDataTypeCompare, sort_dir);
+ break;
+
case wxFileData::FileList_Time :
- {
- wxListCtrl::SortItems((wxListCtrlCompare)wxFileDataTimeCompare, sort_dir);
- break;
- }
- default : break;
+ wxListCtrl::SortItems(wxFileDataTimeCompare, sort_dir);
+ break;
+
+ case wxFileData::FileList_Name :
+ default :
+ wxListCtrl::SortItems(wxFileDataNameCompare, sort_dir);
+ break;
}
}
#define ID_CHOICE (wxID_FILEDLGG + 8)
#define ID_TEXT (wxID_FILEDLGG + 9)
#define ID_LIST_CTRL (wxID_FILEDLGG + 10)
-#define ID_ACTIVATED (wxID_FILEDLGG + 11)
#define ID_CHECK (wxID_FILEDLGG + 12)
IMPLEMENT_DYNAMIC_CLASS(wxGenericFileDialog, wxFileDialogBase)
long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST;
bool wxGenericFileDialog::ms_lastShowHidden = false;
+void wxGenericFileDialog::Init()
+{
+ m_bypassGenericImpl = false;
+
+ m_choice = NULL;
+ m_text = NULL;
+ m_list = NULL;
+ m_check = NULL;
+ m_static = NULL;
+ m_upDirButton = NULL;
+ m_newDirButton = NULL;
+}
+
wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent,
const wxString& message,
const wxString& defaultDir,
const wxString& defaultFile,
const wxString& wildCard,
- long style,
+ long style,
const wxPoint& pos,
- bool bypassGenericImpl )
- :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
+ const wxSize& sz,
+ const wxString& name,
+ bool bypassGenericImpl ) : wxFileDialogBase()
{
- m_bypassGenericImpl = bypassGenericImpl;
-
- if (!m_bypassGenericImpl)
- Create( parent, message, defaultDir, defaultFile, wildCard, style, pos );
+ Init();
+ Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, sz, name, bypassGenericImpl );
}
bool wxGenericFileDialog::Create( wxWindow *parent,
- const wxString& message,
- const wxString& defaultDir,
- const wxString& defaultFile,
- const wxString& wildCard,
- long style,
- const wxPoint& pos )
+ const wxString& message,
+ const wxString& defaultDir,
+ const wxString& defaultFile,
+ const wxString& wildCard,
+ long style,
+ const wxPoint& pos,
+ const wxSize& sz,
+ const wxString& name,
+ bool bypassGenericImpl )
{
- if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
- wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
+ m_bypassGenericImpl = bypassGenericImpl;
+
+ if (!wxFileDialogBase::Create(parent, message, defaultDir, defaultFile,
+ wildCard, style, pos, sz, name))
{
return false;
}
+ if (m_bypassGenericImpl)
+ return true;
+
+ if (!wxDialog::Create( parent, wxID_ANY, message, pos, sz,
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER, name
+ ))
+ {
+ return false;
+ }
+
+ ignoreChanges = true;
+
if (wxConfig::Get(false))
{
wxConfig::Get()->Read(wxT("/wxWindows/wxFileDialog/ViewStyle"),
&ms_lastShowHidden);
}
- if (m_dialogStyle == 0)
- m_dialogStyle = wxOPEN;
- if ((m_dialogStyle & wxMULTIPLE ) && !(m_dialogStyle & wxOPEN))
- m_dialogStyle |= wxOPEN;
-
if ((m_dir.empty()) || (m_dir == wxT(".")))
{
m_dir = wxGetCwd();
+ if (m_dir.empty())
+ m_dir = wxFILE_SEP_PATH;
}
- size_t len = m_dir.Len();
+ size_t len = m_dir.length();
if ((len > 1) && (wxEndsWithPathSeparator(m_dir)))
m_dir.Remove( len-1, 1 );
staticsizer->Add( m_static, 1 );
mainsizer->Add( staticsizer, 0, wxEXPAND | wxLEFT|wxRIGHT|wxBOTTOM, 10 );
- long style2 = ms_lastViewStyle | wxSUNKEN_BORDER;
- if ( !(m_dialogStyle & wxMULTIPLE) )
+ long style2 = ms_lastViewStyle;
+ if ( !HasFlag(wxFD_MULTIPLE) )
style2 |= wxLC_SINGLE_SEL;
+#ifdef __WXWINCE__
+ style2 |= wxSIMPLE_BORDER;
+#else
+ style2 |= wxSUNKEN_BORDER;
+#endif
+
m_list = new wxFileCtrl( this, ID_LIST_CTRL,
- _T(""), ms_lastShowHidden,
+ wxEmptyString, ms_lastShowHidden,
wxDefaultPosition, wxSize(540,200),
style2);
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 5 );
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
- m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+ m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
textsizer->Add( m_text, 1, wxCENTER | wxALL, 5 );
mainsizer->Add( textsizer, 0, wxEXPAND );
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 ), 0, wxCENTER | wxALL, 5 );
- buttonsizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 5 );
- mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT );
+ wxSizer *bsizer = CreateButtonSizer( wxOK|wxCANCEL , false, 5 );
+ if(bsizer->GetChildren().GetCount() > 0 )
+ {
+ mainsizer->Add( bsizer, 0, wxEXPAND | wxALL, 5 );
+ }
+ else
+ {
+ delete bsizer;
+ }
}
else
{
mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
- m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER );
+ m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 );
mainsizer->Add( textsizer, 0, wxEXPAND );
SetAutoLayout( true );
SetSizer( mainsizer );
- mainsizer->Fit( this );
- mainsizer->SetSizeHints( this );
+ if (!is_pda)
+ {
+ mainsizer->Fit( this );
+ mainsizer->SetSizeHints( this );
- Centre( wxBOTH );
+ Centre( wxBOTH );
+ }
m_text->SetFocus();
-
+
+ ignoreChanges = false;
+
return true;
}
wxGenericFileDialog::~wxGenericFileDialog()
{
+ ignoreChanges = true;
+
if (!m_bypassGenericImpl)
{
if (wxConfig::Get(false))
int wxGenericFileDialog::ShowModal()
{
+ ignoreChanges = true;
+
m_list->GoToDir(m_dir);
UpdateControls();
m_text->SetValue(m_fileName);
+ ignoreChanges = false;
+
return wxDialog::ShowModal();
}
bool wxGenericFileDialog::Show( bool show )
{
+ // Called by ShowModal, so don't repeate the update
+#ifndef __WIN32__
if (show)
{
m_list->GoToDir(m_dir);
UpdateControls();
m_text->SetValue(m_fileName);
}
+#endif
return wxDialog::Show( show );
}
wildFilters);
wxCHECK_RET( count, wxT("wxFileDialog: bad wildcard string") );
- m_choice->Clear();
- for ( size_t n = 0; n < count; n++ )
+ 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] ) );
}
void wxGenericFileDialog::OnTextEnter( wxCommandEvent &WXUNUSED(event) )
{
- wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
- cevent.SetEventObject( this );
- GetEventHandler()->ProcessEvent( cevent );
+ HandleAction( m_text->GetValue() );
}
-static bool ignoreChanges = false;
-
void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(event) )
{
if (!ignoreChanges)
void wxGenericFileDialog::OnSelected( wxListEvent &event )
{
+ static bool inSelected = false;
+
+ if (inSelected)
+ return;
+
+ inSelected = true;
wxString filename( event.m_item.m_text );
- if (filename == wxT("..")) return;
+
+#ifdef __WXWINCE__
+ // No double-click on most WinCE devices, so do action immediately.
+ HandleAction( filename );
+#else
+ if (filename == wxT(".."))
+ {
+ inSelected = false;
+ return;
+ }
wxString dir = m_list->GetDir();
if (!IsTopMostDir(dir))
dir += wxFILE_SEP_PATH;
dir += filename;
- if (wxDirExists(dir)) return;
+ if (wxDirExists(dir))
+ {
+ inSelected = false;
+ return;
+ }
ignoreChanges = true;
m_text->SetValue( filename );
ignoreChanges = false;
+#endif
+ inSelected = false;
}
void wxGenericFileDialog::HandleAction( const wxString &fn )
{
+ if (ignoreChanges)
+ return;
+
wxString filename( fn );
- wxString dir = m_list->GetDir();
- if (filename.IsEmpty()) return;
+ if (filename.empty())
+ {
+#ifdef __WXWINCE__
+ EndModal(wxID_CANCEL);
+#endif
+ return;
+ }
if (filename == wxT(".")) return;
+ wxString dir = m_list->GetDir();
+
// "some/place/" means they want to chdir not try to load "place"
bool want_dir = filename.Last() == wxFILE_SEP_PATH;
if (want_dir)
if (filename == wxT(".."))
{
+ ignoreChanges = true;
m_list->GoToParentDir();
m_list->SetFocus();
UpdateControls();
+ ignoreChanges = false;
return;
}
#ifdef __UNIX__
if (filename == wxT("~"))
{
+ ignoreChanges = true;
m_list->GoToHomeDir();
m_list->SetFocus();
UpdateControls();
+ ignoreChanges = false;
return;
}
}
#endif // __UNIX__
- if ((filename.Find(wxT('*')) != wxNOT_FOUND) ||
- (filename.Find(wxT('?')) != wxNOT_FOUND))
+ if (!HasFlag(wxFD_SAVE))
{
- 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))
if (wxDirExists(filename))
{
+ ignoreChanges = true;
m_list->GoToDir( filename );
UpdateControls();
+ ignoreChanges = false;
return;
}
// VZ: the logic of testing for !wxFileExists() only for the open file
// dialog is not entirely clear to me, why don't we allow saving to a
// file without extension as well?
- if ( !(m_dialogStyle & wxOPEN) || !wxFileExists(filename) )
+ if ( !HasFlag(wxFD_OPEN) || !wxFileExists(filename) )
{
filename = AppendExtension(filename, m_filterExtension);
}
// check that the file [doesn't] exist if necessary
- if ( (m_dialogStyle & wxSAVE) &&
- (m_dialogStyle & wxOVERWRITE_PROMPT) &&
+ if ( HasFlag(wxFD_SAVE) && HasFlag(wxFD_OVERWRITE_PROMPT) &&
wxFileExists( filename ) )
{
wxString msg;
if (wxMessageBox(msg, _("Confirm"), wxYES_NO) != wxYES)
return;
}
- else if ( (m_dialogStyle & wxOPEN) &&
- (m_dialogStyle & wxFILE_MUST_EXIST) &&
+ else if ( HasFlag(wxFD_OPEN) && HasFlag(wxFD_FILE_MUST_EXIST) &&
!wxFileExists(filename) )
{
wxMessageBox(_("Please choose an existing file."), _("Error"),
SetPath( filename );
// change to the directory where the user went if asked
- if ( m_dialogStyle & wxCHANGE_DIR )
+ if ( HasFlag(wxFD_CHANGE_DIR) )
{
wxString cwd;
wxSplitPath(filename, &cwd, NULL, NULL);
}
}
- wxCommandEvent event;
- wxDialog::OnOK(event);
+ EndModal(wxID_OK);
}
void wxGenericFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
void wxGenericFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
{
+ ignoreChanges = true;
m_list->ChangeToListMode();
ms_lastViewStyle = wxLC_LIST;
m_list->SetFocus();
+ ignoreChanges = false;
}
void wxGenericFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
{
+ ignoreChanges = true;
m_list->ChangeToReportMode();
ms_lastViewStyle = wxLC_REPORT;
m_list->SetFocus();
+ ignoreChanges = false;
}
void wxGenericFileDialog::OnUp( wxCommandEvent &WXUNUSED(event) )
{
+ ignoreChanges = true;
m_list->GoToParentDir();
m_list->SetFocus();
UpdateControls();
+ ignoreChanges = false;
}
void wxGenericFileDialog::OnHome( wxCommandEvent &WXUNUSED(event) )
{
+ ignoreChanges = true;
m_list->GoToHomeDir();
m_list->SetFocus();
UpdateControls();
+ ignoreChanges = false;
}
void wxGenericFileDialog::OnNew( wxCommandEvent &WXUNUSED(event) )
{
+ ignoreChanges = true;
+
m_list->MakeDir();
+
+ ignoreChanges = false;
}
void wxGenericFileDialog::SetPath( const wxString& path )
{
// not only set the full path but also update filename and dir
m_path = path;
+
+#ifdef __WXWINCE__
+ if (m_path.empty())
+ m_path = wxFILE_SEP_PATH;
+#endif
+
if ( !path.empty() )
{
wxString ext;
wxString dir = m_list->GetDir();
#ifdef __UNIX__
if (dir != wxT("/"))
+#endif
+#ifdef __WXWINCE__
+ if (dir != wxT("/") && dir != wxT("\\"))
#endif
dir += wxFILE_SEP_PATH;
#endif // defined(__DOS__) || defined(__WINDOWS__) || defined(__OS2__)
}
-#ifdef USE_GENERIC_FILEDIALOG
+#ifdef wxUSE_GENERIC_FILEDIALOG
-IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog);
+IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog)
-#endif // USE_GENERIC_FILEDIALOG
+#endif // wxUSE_GENERIC_FILEDIALOG
#endif // wxUSE_FILEDLG
-
projects / wxWidgets.git / blobdiff