#pragma hdrstop
#endif
-#if wxUSE_FILEDLG && !defined(__WXGTK24__)
+#if wxUSE_FILEDLG
// NOTE : it probably also supports MAC, untested
#if !defined(__UNIX__) && !defined(__DOS__) && !defined(__WIN32__) && !defined(__OS2__)
return fd1->GetDateTime().IsLaterThan(fd2->GetDateTime()) ? int(data) : -int(data);
}
-#if defined(__UNIX__) && !defined(__OS2__)
-#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);
+#define IsTopMostDir(dir) (dir.empty())
+#else
+#define IsTopMostDir(dir) (dir == wxT("/"))
#endif
// defined in src/generic/dirctrlg.cpp
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 _("<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;
break;
case FileList_Time:
- if (!IsDrive())
+ if (!IsDrive())
s = GetModificationTime();
break;
#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; 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__)
{
{
wxString p(wxPathOnly(m_dirName));
#if defined(__UNIX__) && !defined(__OS2__)
- if (p.IsEmpty()) p = wxT("/");
+ 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;
}
{
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;
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)
{
SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( id );
wxFileData *fd = (wxFileData*)event.m_item.m_data;
wxASSERT( fd );
- if ((event.GetLabel().IsEmpty()) ||
+ if ((event.GetLabel().empty()) ||
(event.GetLabel() == _(".")) ||
(event.GetLabel() == _("..")) ||
(event.GetLabel().First( wxFILE_SEP_PATH ) != wxNOT_FOUND))
#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,
- const wxPoint& pos )
- :wxFileDialogBase(parent, message, defaultDir, defaultFile, wildCard, style, pos)
+ long style,
+ const wxPoint& pos,
+ bool bypassGenericImpl ) : wxFileDialogBase()
+{
+ Init();
+ Create( parent, message, defaultDir, defaultFile, wildCard, style, pos, bypassGenericImpl );
+}
+
+bool wxGenericFileDialog::Create( wxWindow *parent,
+ const wxString& message,
+ const wxString& defaultDir,
+ const wxString& defaultFile,
+ const wxString& wildCard,
+ long style,
+ const wxPoint& pos,
+ bool bypassGenericImpl )
{
- 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))
+ {
+ return false;
+ }
+
+ if (m_bypassGenericImpl)
+ return true;
+
+ if (!wxDialog::Create( parent, wxID_ANY, message, pos, wxDefaultSize,
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER ))
+ {
+ return false;
+ }
if (wxConfig::Get(false))
{
style2 |= wxLC_SINGLE_SEL;
m_list = new wxFileCtrl( this, ID_LIST_CTRL,
- _T(""), ms_lastShowHidden,
+ wxEmptyString, ms_lastShowHidden,
wxDefaultPosition, wxSize(540,200),
style2);
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);
+ }
}
}
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] ) );
}
{
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"
}
#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))
#endif // USE_GENERIC_FILEDIALOG
-#endif // wxUSE_FILEDLG && !defined(__WXGTK24__)
+#endif // wxUSE_FILEDLG
projects / wxWidgets.git / blobdiff