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

wxGTK compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-07-25 18:47:58 +00:00
parent 3509d340e2
commit 3fa4bd0e78
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/generic/dirctrlg.cpp
View File

@@ -10,7 +10,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
#pragma implementation "dirctrl.h" #pragma implementation "dirctrlg.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
@@ -38,6 +38,7 @@
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
#include "wx/dir.h" #include "wx/dir.h"
#include "wx/settings.h"
#if wxUSE_STATLINE #if wxUSE_STATLINE
#include "wx/statline.h" #include "wx/statline.h"
@@ -439,7 +440,6 @@ void wxGenericDirCtrl::Init()
{ {
m_showHidden = FALSE; m_showHidden = FALSE;
m_imageList = NULL; m_imageList = NULL;
m_rootId = 0;
m_currentFilter = 0; m_currentFilter = 0;
m_currentFilterStr = wxEmptyString; // Default: any file m_currentFilterStr = wxEmptyString; // Default: any file
m_treeCtrl = NULL; m_treeCtrl = NULL;
@@ -456,7 +456,7 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in
#else #else
// Unix: sections are displayed as folders // Unix: sections are displayed as folders
wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, 0, -1, dir_item); wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, 0, -1, dir_item);
SetItemImage( id, 1, wxTreeItemIcon_Expanded ); m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded );
#endif #endif
// TODO: other operating systems. // TODO: other operating systems.
@@ -535,16 +535,14 @@ void wxGenericDirCtrl::SetupSections()
#endif #endif
#else #else
wxString home; AddSection(wxT("/"), _("The Computer"), 0);
AddSection(wxT("/"), _("The Computer"), 0) AddSection(wxGetHomeDir(), _("My Home"), 0 );
wxGetHomeDir(&home); AddSection(wxT("/mnt"), _("Mounted Devices"), 0 );
AddSection(home, _("My Home"), 0 ) AddSection(wxT("/usr/local"), _("User Local"), 0 );
AddSection(wxT("/mnt"), _("Mounted Devices"), 0 ) AddSection(wxT("/usr"), _("User"), 0 );
AddSection(wxT("/usr/local"), _("User Local"), 0 ) AddSection(wxT("/var"), _("Variables"), 0 );
AddSection(wxT("/usr"), _("User"), 0 ) AddSection(wxT("/etc"), _("Etcetera"), 0 );
AddSection(wxT("/var"), _("Variables"), 0 ) AddSection(wxT("/tmp"), _("Temporary"), 0 );
AddSection(wxT("/etc"), _("Etcetera"), 0 )
AddSection(wxT("/tmp"), _("Temporary"), 0 )
#endif #endif
} }
@@ -773,7 +771,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
path += eachFilename; path += eachFilename;
//path = dirName + wxString(wxT("/")) + eachFilename; //path = dirName + wxString(wxT("/")) + eachFilename;
wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,FALSE); wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,FALSE);
wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item); (void)m_treeCtrl->AppendItem( parentId, eachFilename, 2, -1, dir_item);
} }
} }
} }
@@ -830,7 +828,8 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
childId = m_treeCtrl->GetNextChild(childId, cookie); childId = m_treeCtrl->GetNextChild(childId, cookie);
} }
return 0; wxTreeItemId invalid;
return invalid;
} }
// Try to expand as much of the given path as possible, // Try to expand as much of the given path as possible,