From 8403d877c278073e49da69574a9f392448c31cff Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 22 May 2003 15:47:31 +0000 Subject: [PATCH] Patch level : 2.0 476 Files correlati : xvaga.dll Ricompilazione Demo : [ ] Commento : Corretti conflitti git-svn-id: svn://10.65.10.50/trunk@11173 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- xvaga/xvaga.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp index f0fd0abbe..3416f0826 100755 --- a/xvaga/xvaga.cpp +++ b/xvaga/xvaga.cpp @@ -1199,8 +1199,8 @@ void xvt_app_create(int argc, char **argv, unsigned long flags, for (int i= 0; i < 3; i++) pMenubar->Append(Menus[i], Title[i]); - ((wxFrame*)_task_win)->SetMenuBar(pMenubar); #endif + ((wxFrame*)_task_win)->SetMenuBar(pMenubar); _task_win->Show(); if (style & wxMAXIMIZE) @@ -2524,7 +2524,7 @@ static unsigned long compute_disk_size(const char* path, bool tot, char unit) { #ifdef WIN32 char drive[_MAX_DRIVE+1]; - xvt_sys_splitpath(path, drive, NULL, NULL, NULL); + xvt_fsys_parse_pathname(path, drive, NULL, NULL, NULL, NULL); strcat(drive, "/"); DWORD nSecPerClust, nBytePerSec, nFreeClust, nTotalClust; ::GetDiskFreeSpace(drive, &nSecPerClust, &nBytePerSec, &nFreeClust, &nTotalClust);