root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.0 476

Browse Source 
Files correlati     : xvaga.dll
Ricompilazione Demo : [ ]
Commento            :

Corretti conflitti


git-svn-id: svn://10.65.10.50/trunk@11173 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2003-05-22 15:47:31 +00:00
parent 9d7cb84959
commit 8403d877c2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xvaga/xvaga.cpp
View File

@ -1199,8 +1199,8 @@ void xvt_app_create(int argc, char **argv, unsigned long flags,
for (int i= 0; i < 3; i++) for (int i= 0; i < 3; i++)
pMenubar->Append(Menus[i], Title[i]); pMenubar->Append(Menus[i], Title[i]);
((wxFrame*)_task_win)->SetMenuBar(pMenubar);
#endif #endif
((wxFrame*)_task_win)->SetMenuBar(pMenubar);
_task_win->Show(); _task_win->Show();
if (style & wxMAXIMIZE) if (style & wxMAXIMIZE)
@ -2524,7 +2524,7 @@ static unsigned long compute_disk_size(const char* path, bool tot, char unit)
{ {
#ifdef WIN32 #ifdef WIN32
char drive[_MAX_DRIVE+1]; 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, "/"); strcat(drive, "/");
DWORD nSecPerClust, nBytePerSec, nFreeClust, nTotalClust; DWORD nSecPerClust, nBytePerSec, nFreeClust, nTotalClust;
::GetDiskFreeSpace(drive, &nSecPerClust, &nBytePerSec, &nFreeClust, &nTotalClust); ::GetDiskFreeSpace(drive, &nSecPerClust, &nBytePerSec, &nFreeClust, &nTotalClust);