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

Correct some minor compile pbs with VC++1.52c & VC++4.1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Patrick Albert
1999-06-14 09:43:38 +00:00
parent 27a9bd487b
commit c0de7af40b
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/treectrl.h
View File

@@ -435,7 +435,7 @@ public:
void Unselect(); void Unselect();
void UnselectAll(); void UnselectAll();
// select this item // select this item
void SelectItem(const wxTreeItemId& item, bool unselect_others=true, bool extended_select=false); void SelectItem(const wxTreeItemId& item, bool unselect_others=TRUE, bool extended_select=FALSE);
// make sure this item is visible (expanding the parent item and/or // make sure this item is visible (expanding the parent item and/or
// scrolling to this item if necessary) // scrolling to this item if necessary)
void EnsureVisible(const wxTreeItemId& item); void EnsureVisible(const wxTreeItemId& item);

14
src/generic/treectrl.cpp
View File

@@ -957,7 +957,7 @@ bool wxTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem
size_t count = children.Count(); size_t count = children.Count();
for (size_t n=(size_t)(index+1); n<count; ++n) for (size_t n=(size_t)(index+1); n<count; ++n)
if (TagAllChildrenUntilLast(children[n], last_item, select)) return true; if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
return TagNextChildren(parent, last_item, select); return TagNextChildren(parent, last_item, select);
} }
@@ -967,17 +967,17 @@ bool wxTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericT
crt_item->SetHilight(select); crt_item->SetHilight(select);
RefreshLine(crt_item); RefreshLine(crt_item);
if (crt_item==last_item) return true; if (crt_item==last_item) return TRUE;
if (crt_item->HasChildren()) if (crt_item->HasChildren())
{ {
wxArrayGenericTreeItems& children = crt_item->GetChildren(); wxArrayGenericTreeItems& children = crt_item->GetChildren();
size_t count = children.Count(); size_t count = children.Count();
for ( size_t n = 0; n < count; ++n ) for ( size_t n = 0; n < count; ++n )
if (TagAllChildrenUntilLast(children[n], last_item, select)) return true; if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
} }
return false; return FALSE;
} }
void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2) void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
@@ -1016,8 +1016,8 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
// to keep going anyhow !!! // to keep going anyhow !!!
if (is_single) if (is_single)
{ {
unselect_others=true; unselect_others=TRUE;
extended_select=false; extended_select=FALSE;
} }
wxGenericTreeItem *item = itemId.m_pItem; wxGenericTreeItem *item = itemId.m_pItem;
@@ -1047,7 +1047,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
} }
else else
{ {
bool select=true; // the default bool select=TRUE; // the default
// Check if we need to toggle hilight (ctrl mode) // Check if we need to toggle hilight (ctrl mode)
if (!unselect_others) if (!unselect_others)

20
src/msw/utilsexc.cpp
View File

@@ -341,13 +341,31 @@ long wxExecute(char **argv, bool sync, wxProcess *handler)
bool wxGetFullHostName(wxChar *buf, int maxSize) bool wxGetFullHostName(wxChar *buf, int maxSize)
{ {
DWORD nSize = maxSize; #if defined(__WIN32__) && !defined(__TWIN32__)
DWORD nSize = maxSize ;
if ( !::GetComputerName(buf, &nSize) ) if ( !::GetComputerName(buf, &nSize) )
{ {
wxLogLastError("GetComputerName"); wxLogLastError("GetComputerName");
return FALSE; return FALSE;
} }
#else
char *sysname;
const char *default_host = "noname";
static const char WX_SECTION[] = "wxWindows";
static const char eHOSTNAME[] = "HostName";
if ((sysname = getenv("SYSTEM_NAME")) == NULL) {
GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1);
} else
strncpy(buf, sysname, maxSize - 1);
buf[maxSize] = '\0';
if ( *buf == '\0' )
{
wxLogLastError("GetComputerName");
return FALSE;
}
#endif
return TRUE; return TRUE;
} }