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

OS/2 updates (mostly executing MSW code)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-01-29 05:47:27 +00:00
parent 8bb6da4ae6
commit ec1b28a357
1 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/generic/dirctrlg.cpp
View File

@@ -57,6 +57,16 @@
#endif #endif
#ifdef __WXPM__
#define INCL_BASE
#include <os2.h>
#include <direct.h>
#include <stdlib.h>
#include <ctype.h>
#endif // __WXPM__
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#include "dos.h" #include "dos.h"
#endif #endif
@@ -66,7 +76,7 @@
#undef GetFirstChild #undef GetFirstChild
#endif #endif
#if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW #if !defined(__WXMSW__) || wxUSE_XPM_IN_MSW || wxUSE_XPM_IN_OS2
/* Closed folder */ /* Closed folder */
static char * icon1_xpm[] = { static char * icon1_xpm[] = {
/* width height ncolors chars_per_pixel */ /* width height ncolors chars_per_pixel */
@@ -297,7 +307,7 @@ static const int ID_CANCEL = 1003;
static const int ID_NEW = 1004; static const int ID_NEW = 1004;
//static const int ID_CHECK = 1005; //static const int ID_CHECK = 1005;
#if defined(__WXMSW__) #if defined(__WXMSW__) || defined(__WXPM__)
static bool wxIsDriveAvailable(const wxString dirName) static bool wxIsDriveAvailable(const wxString dirName)
{ {
#ifdef __WIN32__ #ifdef __WIN32__
@@ -448,7 +458,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
wxString rootName; wxString rootName;
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
rootName = _("Computer"); rootName = _("Computer");
#else #else
rootName = _("Sections"); rootName = _("Sections");
@@ -487,8 +497,8 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in
{ {
wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE); wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,name,TRUE);
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
// Windows: sections are displayed as drives // Windows and OS/2: sections are displayed as drives
wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item); wxTreeItemId id = m_treeCtrl->AppendItem( m_rootId, name, imageId, -1, dir_item);
#else #else
// Unix: sections are displayed as folders // Unix: sections are displayed as folders
@@ -502,7 +512,7 @@ void wxGenericDirCtrl::AddSection(const wxString& path, const wxString& name, in
void wxGenericDirCtrl::SetupSections() void wxGenericDirCtrl::SetupSections()
{ {
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
#ifdef __WIN32__ #ifdef __WIN32__
wxChar driveBuffer[256]; wxChar driveBuffer[256];
@@ -559,7 +569,7 @@ void wxGenericDirCtrl::SetupSections()
if (wxIsDriveAvailable(path)) if (wxIsDriveAvailable(path))
{ {
AddSection(path, name); AddSection(path, name);
} }
} }
@@ -686,7 +696,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
wxString dirName(data->m_path); wxString dirName(data->m_path);
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
// 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))
@@ -700,7 +710,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
// This may take a longish time. Go to busy cursor // This may take a longish time. Go to busy cursor
wxBusyCursor busy; wxBusyCursor busy;
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
if (dirName.Last() == ':') if (dirName.Last() == ':')
dirName += wxString(wxFILE_SEP_PATH); dirName += wxString(wxFILE_SEP_PATH);
#endif #endif
@@ -736,7 +746,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
wxLogNull log; wxLogNull log;
d.Open(dirName); d.Open(dirName);
if (d.IsOpened()) if (d.IsOpened())
{ {
if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES)) if (d.GetFirst(& eachFilename, m_currentFilterStr, wxDIR_FILES))
@@ -767,7 +777,7 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,TRUE); wxDirItemDataEx *dir_item = new wxDirItemDataEx(path,eachFilename,TRUE);
wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item); wxTreeItemId id = m_treeCtrl->AppendItem( parentId, eachFilename, 0, -1, dir_item);
m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded ); m_treeCtrl->SetItemImage( id, 1, wxTreeItemIcon_Expanded );
// Has this got any children? If so, make it expandable. // Has this got any children? If so, make it expandable.
int options = wxDIR_DEFAULT; int options = wxDIR_DEFAULT;
if (GetWindowStyle() & wxDIRCTRL_DIR_ONLY) // If only showing dirs, then we specify dirs only here if (GetWindowStyle() & wxDIRCTRL_DIR_ONLY) // If only showing dirs, then we specify dirs only here
@@ -812,36 +822,36 @@ void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)
wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path, bool& done) wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString& path, bool& done)
{ {
wxString path2(path); wxString path2(path);
// Make sure all separators are as per the current platform // Make sure all separators are as per the current platform
path2.Replace(wxT("\\"), wxString(wxFILE_SEP_PATH)); path2.Replace(wxT("\\"), wxString(wxFILE_SEP_PATH));
path2.Replace(wxT("/"), wxString(wxFILE_SEP_PATH)); path2.Replace(wxT("/"), wxString(wxFILE_SEP_PATH));
// Append a separator to foil bogus substring matching // Append a separator to foil bogus substring matching
path2 += wxString(wxFILE_SEP_PATH); path2 += wxString(wxFILE_SEP_PATH);
// In MSW, case is not significant // In MSW or PM, case is not significant
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
path2.MakeLower(); path2.MakeLower();
#endif #endif
long cookie; long cookie;
wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie); wxTreeItemId childId = m_treeCtrl->GetFirstChild(parentId, cookie);
while (childId.IsOk()) while (childId.IsOk())
{ {
wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId); wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);
if (data && data->m_path != "") if (data && data->m_path != "")
{ {
wxString childPath(data->m_path); wxString childPath(data->m_path);
if (childPath.Last() != wxFILE_SEP_PATH) if (childPath.Last() != wxFILE_SEP_PATH)
childPath += wxString(wxFILE_SEP_PATH); childPath += wxString(wxFILE_SEP_PATH);
// In MSW, case is not significant // In MSW and PM, case is not significant
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
childPath.MakeLower(); childPath.MakeLower();
#endif #endif
if (childPath.Len() <= path2.Len()) if (childPath.Len() <= path2.Len())
{ {
wxString path3 = path2.Mid(0, childPath.Len()); wxString path3 = path2.Mid(0, childPath.Len());
@@ -855,7 +865,7 @@ wxTreeItemId wxGenericDirCtrl::FindChild(wxTreeItemId parentId, const wxString&
} }
} }
} }
childId = m_treeCtrl->GetNextChild(childId, cookie); childId = m_treeCtrl->GetNextChild(childId, cookie);
} }
wxTreeItemId invalid; wxTreeItemId invalid;
@@ -893,7 +903,7 @@ bool wxGenericDirCtrl::ExpandPath(const wxString& path)
while (childId.IsOk()) while (childId.IsOk())
{ {
wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId); wxDirItemDataEx* data = (wxDirItemDataEx*) m_treeCtrl->GetItemData(childId);
if (data && data->m_path != "" && !data->m_isDir) if (data && data->m_path != "" && !data->m_isDir)
{ {
m_treeCtrl->SelectItem(childId); m_treeCtrl->SelectItem(childId);
@@ -970,7 +980,7 @@ void wxGenericDirCtrl::FindChildFiles(wxTreeItemId id, int dirFlags, wxArrayStri
wxString dirName(data->m_path); wxString dirName(data->m_path);
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
if (dirName.Last() == ':') if (dirName.Last() == ':')
dirName += wxString(wxFILE_SEP_PATH); dirName += wxString(wxFILE_SEP_PATH);
#endif #endif
@@ -1131,7 +1141,7 @@ void wxDirFilterListCtrl::OnSelFilter(wxCommandEvent& event)
int sel = GetSelection(); int sel = GetSelection();
wxString currentPath = m_dirCtrl->GetPath(); wxString currentPath = m_dirCtrl->GetPath();
m_dirCtrl->SetFilterIndex(sel); m_dirCtrl->SetFilterIndex(sel);
// If the filter has changed, the view is out of date, so // If the filter has changed, the view is out of date, so