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

Minor compilation fixes for Borland.

Browse Source 
Changed tabs to spaces.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2000-08-06 03:15:14 +00:00
parent 0e67e9e2d0
commit 33fed83514
1 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
src/generic/dirctrlg.cpp
View File

@@ -121,9 +121,9 @@ static char * icon3_xpm[] = {
/* width height ncolors chars_per_pixel */ /* width height ncolors chars_per_pixel */
"16 16 3 1", "16 16 3 1",
/* colors */ /* colors */
" s None c None", " s None c None",
". c #000000", ". c #000000",
"+ c #ffffff", "+ c #ffffff",
/* pixels */ /* pixels */
" ", " ",
" ........ ", " ........ ",
@@ -145,13 +145,13 @@ static char * icon3_xpm[] = {
/* Computer */ /* Computer */
static char * icon4_xpm[] = { static char * icon4_xpm[] = {
"16 16 7 1", "16 16 7 1",
" s None c None", " s None c None",
". c #808080", ". c #808080",
"X c #c0c0c0", "X c #c0c0c0",
"o c Black", "o c Black",
"O c Gray100", "O c Gray100",
"+ c #008080", "+ c #008080",
"@ c Blue", "@ c Blue",
" ........... ", " ........... ",
" .XXXXXXXXXX.o", " .XXXXXXXXXX.o",
" .OOOOOOOOO..o", " .OOOOOOOOO..o",
@@ -172,13 +172,13 @@ static char * icon4_xpm[] = {
/* Drive */ /* Drive */
static char * icon5_xpm[] = { static char * icon5_xpm[] = {
"16 16 7 1", "16 16 7 1",
" s None c None", " s None c None",
". c #808080", ". c #808080",
"X c #c0c0c0", "X c #c0c0c0",
"o c Black", "o c Black",
"O c Gray100", "O c Gray100",
"+ c Green", "+ c Green",
"@ c #008000", "@ c #008000",
" ", " ",
" ", " ",
" ", " ",
@@ -199,16 +199,16 @@ static char * icon5_xpm[] = {
/* CD-ROM */ /* CD-ROM */
static char *icon6_xpm[] = { static char *icon6_xpm[] = {
"16 16 10 1", "16 16 10 1",
" s None c None", " s None c None",
". c #808080", ". c #808080",
"X c #c0c0c0", "X c #c0c0c0",
"o c Yellow", "o c Yellow",
"O c Blue", "O c Blue",
"+ c Black", "+ c Black",
"@ c Gray100", "@ c Gray100",
"# c #008080", "# c #008080",
"$ c Green", "$ c Green",
"% c #008000", "% c #008000",
" ... ", " ... ",
" ..XoX.. ", " ..XoX.. ",
" .O.XoXXX+ ", " .O.XoXXX+ ",
@@ -229,13 +229,13 @@ static char *icon6_xpm[] = {
/* Floppy */ /* Floppy */
static char * icon7_xpm[] = { static char * icon7_xpm[] = {
"16 16 7 1", "16 16 7 1",
" s None c None", " s None c None",
". c #808080", ". c #808080",
"X c Gray100", "X c Gray100",
"o c #c0c0c0", "o c #c0c0c0",
"O c Black", "O c Black",
"+ c Cyan", "+ c Cyan",
"@ c Red", "@ c Red",
" ......X", " ......X",
" .ooooooO", " .ooooooO",
" .+++++OO", " .+++++OO",
@@ -256,13 +256,13 @@ static char * icon7_xpm[] = {
/* Removeable */ /* Removeable */
static char * icon8_xpm[] = { static char * icon8_xpm[] = {
"16 16 7 1", "16 16 7 1",
" s None c None", " s None c None",
". c #808080", ". c #808080",
"X c #c0c0c0", "X c #c0c0c0",
"o c Black", "o c Black",
"O c Gray100", "O c Gray100",
"+ c Red", "+ c Red",
"@ c #800000", "@ c #800000",
" ", " ",
" ", " ",
" ", " ",
@@ -292,17 +292,17 @@ static const int ID_NEW = 1004;
static bool wxIsDriveAvailable(const wxString dirName) static bool wxIsDriveAvailable(const wxString dirName)
{ {
#ifdef __WIN32__ #ifdef __WIN32__
UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); UINT errorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
#endif #endif
bool success = TRUE; bool success = TRUE;
// Check if this is a root directory and if so, // Check if this is a root directory and if so,
// whether the drive is avaiable. // whether the drive is avaiable.
if (dirName.Len() == 3 && dirName[1] == wxT(':')) if (dirName.Len() == 3 && dirName[(size_t)1] == wxT(':'))
{ {
wxString dirNameLower(dirName.Lower()); wxString dirNameLower(dirName.Lower());
int currentDrive = _getdrive(); int currentDrive = _getdrive();
int thisDrive = (int) (dirNameLower[0] - 'a' + 1) ; int thisDrive = (int) (dirNameLower[(size_t)0] - 'a' + 1) ;
int err = _chdrive( thisDrive ) ; int err = _chdrive( thisDrive ) ;
_chdrive( currentDrive ); _chdrive( currentDrive );
@@ -312,10 +312,10 @@ static bool wxIsDriveAvailable(const wxString dirName)
} }
} }
#ifdef __WIN32__ #ifdef __WIN32__
(void) SetErrorMode(errorMode); (void) SetErrorMode(errorMode);
#endif #endif
return success; return success;
} }
#endif #endif
@@ -350,23 +350,23 @@ void wxDirItemDataEx::SetNewDirName( wxString path )
bool wxDirItemDataEx::HasSubDirs() bool wxDirItemDataEx::HasSubDirs()
{ {
if (m_path.IsEmpty()) if (m_path.IsEmpty())
return TRUE; return TRUE;
// On WIN32, must check if this volume is mounted or // On WIN32, must check if this volume is mounted or
// we get an error dialog for e.g. drive a: // we get an error dialog for e.g. drive a:
#ifdef __WIN32__ #ifdef __WIN32__
if (!wxIsDriveAvailable(m_path)) if (!wxIsDriveAvailable(m_path))
return FALSE; return FALSE;
#endif #endif
wxString search = m_path; wxString search = m_path;
if (m_path.Last() != wxFILE_SEP_PATH) if (m_path.Last() != wxFILE_SEP_PATH)
{ {
search += wxString(wxFILE_SEP_PATH); search += wxString(wxFILE_SEP_PATH);
} }
search += wxT("*"); search += wxT("*");
wxLogNull log; wxLogNull log;
wxString path = wxFindFirstFile( search, wxDIR ); wxString path = wxFindFirstFile( search, wxDIR );
@@ -568,7 +568,7 @@ void wxGenericDirCtrl::SetupSections()
path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1)); path.Printf(wxT("%c:\\"), (char) (drive + 'a' - 1));
name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1)); name.Printf(wxT("(%c:)"), (char) (drive + 'a' - 1));
if (wxIsDriveAvailable(path)) if (wxIsDriveAvailable(path))
{ {
AddSection(path, name); AddSection(path, name);
@@ -700,12 +700,12 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
#ifdef __WXMSW__ #ifdef __WXMSW__
// Check if this is a root directory and if so, // Check if this is a root directory and if so,
// whether the drive is avaiable. // whether the drive is avaiable.
if (!wxIsDriveAvailable(dirName)) if (!wxIsDriveAvailable(dirName))
{ {
data->m_isExpanded = FALSE; data->m_isExpanded = FALSE;
wxMessageBox(wxT("Sorry, this drive is not available.")); wxMessageBox(wxT("Sorry, this drive is not available."));
return; return;
} }
#endif #endif
// This may take a longish time. Go to busy cursor // This may take a longish time. Go to busy cursor
@@ -797,7 +797,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
{ {
m_treeCtrl->SetItemHasChildren(id); m_treeCtrl->SetItemHasChildren(id);
} }
} }
} }
// Add the sorted filenames // Add the sorted filenames