-/////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
// Name: filedlgg.cpp
// Purpose: wxGenericFileDialog
// Author: Robert Roebling
#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"
// 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 )
{
m_fileName = fileName;
ReadData();
}
+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 = GetImageId();
+}
+
void wxFileData::ReadData()
{
if (IsDrive())
// 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;
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;
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;
}
wxBusyCursor bcur; // this may take a while...
- FreeAllItemsData();
DeleteAllItems();
wxListItem item;
for (n=0; n<count; n++)
{
wxFileData *fd = new wxFileData(paths[n], names[n], wxFileData::is_drive, icons[n]);
- Add(fd, item);
+ if (Add(fd, item) != -1)
item.m_itemId++;
+ else
+ delete fd;
}
}
else
if (p.IsEmpty()) p = wxT("/");
#endif // __UNIX__
wxFileData *fd = new wxFileData(p, wxT(".."), wxFileData::is_dir, wxFileIconsTable::folder);
- Add(fd, item);
+ if (Add(fd, item) != -1)
item.m_itemId++;
+ else
+ delete fd;
}
wxString dirname(m_dirName);
while (cont)
{
wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_dir, wxFileIconsTable::folder);
- Add(fd, item);
+ if (Add(fd, item) != -1)
item.m_itemId++;
+ else
+ delete fd;
+
cont = dir.GetNext(&f);
}
while (cont)
{
wxFileData *fd = new wxFileData(dirPrefix + f, f, wxFileData::is_file, wxFileIconsTable::file);
- Add(fd, item);
+ if (Add(fd, item) != -1)
item.m_itemId++;
+ else
+ delete fd;
+
cont = dir.GetNext(&f);
}
}
EnsureVisible( id );
EditLabel( id );
}
+ else
+ delete fd;
}
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())
EnsureVisible( 0 );
}
-void wxFileCtrl::FreeItemData(const wxListItem& item)
+void wxFileCtrl::FreeItemData(wxListItem& item)
{
- wxFileData *fd = (wxFileData*)item.m_data;
- delete fd;
+ if ( item.m_data )
+ {
+ wxFileData *fd = (wxFileData*)item.m_data;
+ delete fd;
+
+ item.m_data = 0;
+ }
}
void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
FreeItemData(event.m_item);
}
+void wxFileCtrl::OnListDeleteAllItems( wxListEvent & WXUNUSED(event) )
+{
+ FreeAllItemsData();
+}
+
void wxFileCtrl::FreeAllItemsData()
{
wxListItem item;
wxFileCtrl::~wxFileCtrl()
{
- FreeAllItemsData();
}
//-----------------------------------------------------------------------------
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,
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);
// interpret wildcards
wxArrayString wildDescriptions, wildFilters;
- if ( !ParseWildcard(m_wildCard, wildDescriptions, wildFilters) )
+ if ( !wxParseCommonDialogsFilter(m_wildCard, wildDescriptions, wildFilters) )
{
wxFAIL_MSG( wxT("Wrong file type description") );
}
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 );
// 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 );
}
SetFilterIndex( 0 );
- SetAutoLayout( TRUE );
+ SetAutoLayout( true );
SetSizer( mainsizer );
mainsizer->Fit( this );
wxGenericFileDialog::~wxGenericFileDialog()
{
- if (wxConfig::Get(FALSE))
+ if (wxConfig::Get(false))
{
wxConfig::Get()->Write(wxT("/wxWindows/wxFileDialog/ViewStyle"),
ms_lastViewStyle);
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 );
GetEventHandler()->ProcessEvent( cevent );
}
-static bool ignoreChanges = FALSE;
+static bool ignoreChanges = false;
void wxGenericFileDialog::OnTextChange( wxCommandEvent &WXUNUSED(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 )
projects / wxWidgets.git / blobdiff