Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extra consts removed here and there

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-09-18 16:39:08 +00:00
parent 284b4c8866
commit c8c0e54c70
2 changed files with 146 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/wx/generic/filedlgg.h
View File

@@ -6,7 +6,7 @@
// Created: 8/17/99 // Created: 8/17/99
// Copyright: (c) Robert Roebling // Copyright: (c) Robert Roebling
// RCS-ID: $Id$ // RCS-ID: $Id$
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FILEDLGG_H_ #ifndef _WX_FILEDLGG_H_
@@ -62,12 +62,12 @@ private:
bool m_isExe; bool m_isExe;
public: public:
wxFileData() {} wxFileData() { }
wxFileData( const wxString &name, const wxString &fname ); wxFileData( const wxString &name, const wxString &fname );
wxString GetName() const; wxString GetName() const;
wxString GetFullName() const; wxString GetFullName() const;
wxString GetHint() const; wxString GetHint() const;
wxString GetEntry( const int num ); wxString GetEntry( int num );
bool IsDir(); bool IsDir();
bool IsLink(); bool IsLink();
bool IsExe(); bool IsExe();
@@ -92,11 +92,15 @@ private:
public: public:
wxFileCtrl(); wxFileCtrl();
wxFileCtrl( wxWindow *win, const wxWindowID id, wxFileCtrl( wxWindow *win,
const wxString &dirName, const wxString &wild, wxWindowID id,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, const wxString &dirName,
const long style = wxLC_LIST, const wxValidator &validator = wxDefaultValidator, const wxString &wild,
const wxString &name = _T("filelist") ); const wxPoint &pos = wxDefaultPosition,
const wxSize &size = wxDefaultSize,
long style = wxLC_LIST,
const wxValidator &validator = wxDefaultValidator,
const wxString &name = _T("filelist") );
void ChangeToListMode(); void ChangeToListMode();
void ChangeToReportMode(); void ChangeToReportMode();
void ChangeToIconMode(); void ChangeToIconMode();
@@ -182,11 +186,14 @@ private:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#define wxOPEN 1 enum
#define wxSAVE 2 {
#define wxOVERWRITE_PROMPT 4 wxOPEN = 1,
#define wxHIDE_READONLY 8 wxSAVE = 2,
#define wxFILE_MUST_EXIST 16 wxOVERWRITE_PROMPT = 4,
wxHIDE_READONLY = 8,
wxFILE_MUST_EXIST = 16
}
// File selector - backward compatibility // File selector - backward compatibility
WXDLLEXPORT wxString WXDLLEXPORT wxString

143
src/generic/filedlgg.cpp
View File

@@ -6,7 +6,7 @@
// Created: 12/12/98 // Created: 12/12/98
// RCS-ID: $Id$ // RCS-ID: $Id$
// Copyright: (c) Robert Roebling // Copyright: (c) Robert Roebling
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -56,12 +56,12 @@ static char * folder_xpm[] = {
/* width height ncolors chars_per_pixel */ /* width height ncolors chars_per_pixel */
"16 16 6 1", "16 16 6 1",
/* colors */ /* colors */
" s None c None", " s None c None",
". c #000000", ". c #000000",
"+ c #c0c0c0", "+ c #c0c0c0",
"@ c #808080", "@ c #808080",
"# c #ffff00", "# c #ffff00",
"$ c #ffffff", "$ c #ffffff",
/* pixels */ /* pixels */
" ", " ",
" @@@@@ ", " @@@@@ ",
@@ -80,6 +80,22 @@ static char * folder_xpm[] = {
" ", " ",
" "}; " "};
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
static
int ListCompare( long data1, long data2, long WXUNUSED(data) )
{
wxFileData *fd1 = (wxFileData*)data1 ;
wxFileData *fd2 = (wxFileData*)data2 ;
if (fd1->GetName() == _T("..")) return -1;
if (fd2->GetName() == _T("..")) return 1;
if (fd1->IsDir() && !fd2->IsDir()) return -1;
if (fd2->IsDir() && !fd1->IsDir()) return 1;
return strcmp( fd1->GetName(), fd2->GetName() );
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxFileData // wxFileData
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -153,7 +169,7 @@ wxString wxFileData::GetHint() const
return s; return s;
}; };
wxString wxFileData::GetEntry( const int num ) wxString wxFileData::GetEntry( int num )
{ {
wxString s; wxString s;
switch (num) switch (num)
@@ -291,17 +307,6 @@ void wxFileCtrl::ShowHidden( bool show )
Update(); Update();
} }
int ListCompare( const long data1, const long data2, const long WXUNUSED(data) )
{
wxFileData *fd1 = (wxFileData*)data1 ;
wxFileData *fd2 = (wxFileData*)data2 ;
if (fd1->GetName() == _T("..")) return -1;
if (fd2->GetName() == _T("..")) return 1;
if (fd1->IsDir() && !fd2->IsDir()) return -1;
if (fd2->IsDir() && !fd1->IsDir()) return 1;
return strcmp( fd1->GetName(), fd2->GetName() );
}
long wxFileCtrl::Add( wxFileData *fd, wxListItem &item ) long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
{ {
long ret = -1; long ret = -1;
@@ -340,9 +345,9 @@ void wxFileCtrl::Update()
if (m_dirName != _T("/")) if (m_dirName != _T("/"))
{ {
wxString p( wxPathOnly(m_dirName) ); wxString p( wxPathOnly(m_dirName) );
if (p.IsEmpty()) p = _T("/"); if (p.IsEmpty()) p = _T("/");
fd = new wxFileData( _T(".."), p ); fd = new wxFileData( _T(".."), p );
Add( fd, item ); Add( fd, item );
item.m_itemId++; item.m_itemId++;
} }
@@ -355,7 +360,7 @@ void wxFileCtrl::Update()
wxString s = fd->GetName(); wxString s = fd->GetName();
if (m_showHidden || (s[0] != _T('.'))) if (m_showHidden || (s[0] != _T('.')))
{ {
Add( fd, item ); Add( fd, item );
item.m_itemId++; item.m_itemId++;
} }
f = wxFindNextFile(); f = wxFindNextFile();
@@ -370,7 +375,7 @@ void wxFileCtrl::Update()
wxString s = fd->GetName(); wxString s = fd->GetName();
if (m_showHidden || (s[0] != _T('.'))) if (m_showHidden || (s[0] != _T('.')))
{ {
Add( fd, item ); Add( fd, item );
item.m_itemId++; item.m_itemId++;
} }
f = wxFindNextFile(); f = wxFindNextFile();
@@ -395,24 +400,24 @@ void wxFileCtrl::MakeDir()
{ {
// try NewName0, NewName1 etc. // try NewName0, NewName1 etc.
int i = 0; int i = 0;
do { do {
new_name = _("NewName"); new_name = _("NewName");
wxString num; wxString num;
num.Printf( _T("%d"), i ); num.Printf( _T("%d"), i );
new_name += num; new_name += num;
path = m_dirName; path = m_dirName;
path += _T("/"); path += _T("/");
path += new_name; path += new_name;
i++; i++;
} while (wxFileExists(path)); } while (wxFileExists(path));
} }
wxLogNull log; wxLogNull log;
if (!wxMkdir(path)) if (!wxMkdir(path))
{ {
wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
dialog.ShowModal(); dialog.ShowModal();
return; return;
} }
@@ -425,7 +430,7 @@ void wxFileCtrl::MakeDir()
if (id != -1) if (id != -1)
{ {
SortItems( ListCompare, 0 ); SortItems( ListCompare, 0 );
id = FindItem( 0, (long)fd ); id = FindItem( 0, (long)fd );
EnsureVisible( id ); EnsureVisible( id );
EditLabel( id ); EditLabel( id );
} }
@@ -435,16 +440,16 @@ void wxFileCtrl::GoToParentDir()
{ {
if (m_dirName != _T("/")) if (m_dirName != _T("/"))
{ {
wxString fname( wxFileNameFromPath(m_dirName) ); wxString fname( wxFileNameFromPath(m_dirName) );
m_dirName = wxPathOnly( m_dirName ); m_dirName = wxPathOnly( m_dirName );
if (m_dirName.IsEmpty()) m_dirName = _T("/"); if (m_dirName.IsEmpty()) m_dirName = _T("/");
Update(); Update();
int id = FindItem( 0, fname ); int id = FindItem( 0, fname );
if (id != -1) if (id != -1)
{ {
SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); SetItemState( id, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( id ); EnsureVisible( id );
} }
} }
} }
@@ -484,12 +489,12 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
if ((event.GetLabel().IsEmpty()) || if ((event.GetLabel().IsEmpty()) ||
(event.GetLabel() == _(".")) || (event.GetLabel() == _(".")) ||
(event.GetLabel() == _("..")) || (event.GetLabel() == _("..")) ||
(event.GetLabel().First( _T("/") ) != wxNOT_FOUND)) (event.GetLabel().First( _T("/") ) != wxNOT_FOUND))
{ {
wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR ); wxMessageDialog dialog(this, _("Illegal directory name."), _("Error"), wxOK | wxICON_ERROR );
dialog.ShowModal(); dialog.ShowModal();
event.Veto(); event.Veto();
return; return;
} }
wxString new_name( wxPathOnly( fd->GetFullName() ) ); wxString new_name( wxPathOnly( fd->GetFullName() ) );
@@ -501,20 +506,20 @@ void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
if (wxFileExists(new_name)) if (wxFileExists(new_name))
{ {
wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR ); wxMessageDialog dialog(this, _("File name exists already."), _("Error"), wxOK | wxICON_ERROR );
dialog.ShowModal(); dialog.ShowModal();
event.Veto(); event.Veto();
} }
if (wxRenameFile(fd->GetFullName(),new_name)) if (wxRenameFile(fd->GetFullName(),new_name))
{ {
fd->SetNewName( new_name, event.GetLabel() ); fd->SetNewName( new_name, event.GetLabel() );
SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED ); SetItemState( event.GetItem(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
EnsureVisible( event.GetItem() ); EnsureVisible( event.GetItem() );
} }
else else
{ {
wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR ); wxMessageDialog dialog(this, _("Operation not permitted."), _("Error"), wxOK | wxICON_ERROR );
dialog.ShowModal(); dialog.ShowModal();
event.Veto(); event.Veto();
} }
} }
@@ -543,9 +548,9 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
EVT_BUTTON(ID_NEW_DIR, wxFileDialog::OnNew) EVT_BUTTON(ID_NEW_DIR, wxFileDialog::OnNew)
EVT_BUTTON(wxID_OK, wxFileDialog::OnListOk) EVT_BUTTON(wxID_OK, wxFileDialog::OnListOk)
EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxFileDialog::OnSelected) EVT_LIST_ITEM_SELECTED(ID_LIST_CTRL, wxFileDialog::OnSelected)
EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated) EVT_LIST_ITEM_ACTIVATED(ID_LIST_CTRL, wxFileDialog::OnActivated)
EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice) EVT_CHOICE(ID_CHOICE,wxFileDialog::OnChoice)
EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter) EVT_TEXT_ENTER(ID_TEXT,wxFileDialog::OnTextEnter)
END_EVENT_TABLE() END_EVENT_TABLE()
wxFileDialog::wxFileDialog(wxWindow *parent, wxFileDialog::wxFileDialog(wxWindow *parent,
@@ -565,7 +570,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
if (m_dir.IsEmpty()) if (m_dir.IsEmpty())
{ {
char buf[200]; char buf[200];
m_dir = getcwd( buf, sizeof(buf) ); m_dir = getcwd( buf, sizeof(buf) );
} }
m_path = defaultDir; m_path = defaultDir;
m_path += _T("/"); m_path += _T("/");
@@ -729,7 +734,7 @@ void wxFileDialog::OnListOk( wxCommandEvent &event )
m_list->SetFocus(); m_list->SetFocus();
m_list->GetDir( dir ); m_list->GetDir( dir );
m_static->SetLabel( dir ); m_static->SetLabel( dir );
return; return;
} }
if (filename == _T("~")) if (filename == _T("~"))
@@ -738,28 +743,28 @@ void wxFileDialog::OnListOk( wxCommandEvent &event )
m_list->SetFocus(); m_list->SetFocus();
m_list->GetDir( dir ); m_list->GetDir( dir );
m_static->SetLabel( dir ); m_static->SetLabel( dir );
return; return;
} }
if (filename[0] == _T('~')) if (filename[0] == _T('~'))
{ {
filename.Remove( 0, 1 ); filename.Remove( 0, 1 );
wxString tmp( wxGetUserHome() ); wxString tmp( wxGetUserHome() );
tmp += _T('/'); tmp += _T('/');
tmp += filename; tmp += filename;
filename = tmp; filename = tmp;
} }
if ((filename.Find(_T('*')) != wxNOT_FOUND) || if ((filename.Find(_T('*')) != wxNOT_FOUND) ||
(filename.Find(_T('?')) != wxNOT_FOUND)) (filename.Find(_T('?')) != wxNOT_FOUND))
{ {
if (filename.Find(_T('/')) != wxNOT_FOUND) if (filename.Find(_T('/')) != wxNOT_FOUND)
{ {
wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR ); wxMessageBox(_("Illegal file specification."), _("Error"), wxOK | wxICON_ERROR );
return; return;
} }
m_list->SetWild( filename ); m_list->SetWild( filename );
return; return;
} }
if (dir != _T("/")) dir += _T("/"); if (dir != _T("/")) dir += _T("/");
@@ -772,13 +777,13 @@ void wxFileDialog::OnListOk( wxCommandEvent &event )
if (wxDirExists(filename)) if (wxDirExists(filename))
{ {
m_list->GoToDir( filename ); m_list->GoToDir( filename );
if (filename == _T("/")) if (filename == _T("/"))
m_text->SetValue( _T("") ); m_text->SetValue( _T("") );
else else
m_text->SetValue( _T("..") ); m_text->SetValue( _T("..") );
m_list->GetDir( dir ); m_list->GetDir( dir );
m_static->SetLabel( dir ); m_static->SetLabel( dir );
return; return;
} }
if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) ) if ( (m_dialogStyle & wxSAVE) && (m_dialogStyle & wxOVERWRITE_PROMPT) )
@@ -849,11 +854,11 @@ void wxFileDialog::SetPath( const wxString& path )
{ {
wxString ext; wxString ext;
wxSplitPath(path, &m_dir, &m_fileName, &ext); wxSplitPath(path, &m_dir, &m_fileName, &ext);
if (!ext.IsEmpty()) if (!ext.IsEmpty())
{ {
m_fileName += _T("."); m_fileName += _T(".");
m_fileName += ext; m_fileName += ext;
} }
} }
} }