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

Migliorata gestione cursore di attesa

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@23079 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2015-05-07 11:01:28 +00:00
parent c1f34b5518
commit 4169ad44c7
4 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xvaga/xvaga.cpp
View File

@ -3051,7 +3051,12 @@ SLIST xvt_scr_list_wins()
void xvt_scr_set_busy_cursor()
{
xvt_win_set_cursor(TASK_WIN, CURSOR_WAIT);
wxBeginBusyCursor();
}
void xvt_scr_reset_busy_cursor()
{
wxEndBusyCursor();
}
void xvt_scr_set_focus_vobj(WINDOW win)
@ -4443,7 +4448,7 @@ void xvt_win_release_pointer(void)
void xvt_win_set_cursor(WINDOW win, CURSOR cursor)
{
if (xvt_vobj_is_valid(win)) // Ignore seting cursor on invalid windows
if (xvt_vobj_is_valid(win)) // Ignore setting cursor on invalid windows
{
CAST_WIN(win, w);
wxCursor cur;

1
xvaga/xvt.h
View File

@ -345,6 +345,7 @@ XVTDLL void xvt_scr_beep(void);
XVTDLL WINDOW xvt_scr_get_focus_topwin(void);
XVTDLL WINDOW xvt_scr_get_focus_vobj(void);
XVTDLL SLIST xvt_scr_list_wins();
XVTDLL void xvt_scr_reset_busy_cursor();
XVTDLL void xvt_scr_set_busy_cursor();
XVTDLL void xvt_scr_set_focus_vobj(WINDOW win);

22
xvaga/xvtextra.cpp
View File

@ -1178,7 +1178,7 @@ const char* xvt_fsys_get_campo_ini()
xvt_fsys_get_default_dir(&dir);
xvt_fsys_convert_dir_to_str(&dir, exedir, sizeof(exedir));
#ifdef WIN32
if (xvt_fsys_is_network_drive(exedir))
bFound = xvt_fsys_get_campo_stp_value("CampoIni", path, sizeof(path));
@ -1200,27 +1200,7 @@ const char* xvt_fsys_get_campo_ini()
if (!bFound)
xvt_fsys_build_pathname(path, NULL, exedir, "campo", "ini", NULL);
#else
if (!bFound)
{
char username[32];
char ininame[_MAX_FNAME];
xvt_sys_get_user_name(username, sizeof(username));
if (xvt_str_compare_ignoring_case(username, "root") == 0)
*username = '\0';
sprintf(ininame, "campo%s", username);
xvt_fsys_build_pathname(path, NULL, exedir, ininame, "ini", NULL);
if (!xvt_fsys_file_exists(path) && *username > ' ')
{
char pathstd[_MAX_PATH];
xvt_fsys_build_pathname(pathstd, NULL, exedir, "campo", "ini", NULL);
if (xvt_fsys_file_exists(pathstd))
wxCopyFile(pathstd, path);
}
}
#endif
if (!xvt_fsys_file_exists(path))
{
char msg[_MAX_PATH];

35
xvaga/xvtwin.cpp
View File

@ -102,23 +102,30 @@ void TwxCaret::Toggle()
_drawn = !_drawn;
DRAW_CTOOLS dct;
xvt_dwin_get_draw_ctools(_owner, &dct);
if (_nice_windows.Get(_owner))
{
DRAW_CTOOLS dct;
xvt_dwin_get_draw_ctools(_owner, &dct);
CPEN pen;
pen.width = _size.x;
pen.pat = PAT_SOLID;
pen.style = P_SOLID;
pen.color = dct.fore_color;
xvt_dwin_set_draw_mode(_owner, M_NOT_XOR);
CPEN pen;
pen.width = _size.x;
pen.pat = PAT_SOLID;
pen.style = P_SOLID;
pen.color = dct.fore_color;
xvt_dwin_set_draw_mode(_owner, M_NOT_XOR);
xvt_dwin_set_cpen(_owner, &pen);
xvt_dwin_draw_set_pos(_owner, _pos);
PNT p = _pos; p.v -= _size.y-1;
xvt_dwin_set_cpen(_owner, &pen);
xvt_dwin_draw_set_pos(_owner, _pos);
PNT p = _pos; p.v -= _size.y-1;
xvt_dwin_set_clip(_owner, NULL); // Non si sa mai!
xvt_dwin_draw_line(_owner, p);
xvt_dwin_set_draw_ctools(_owner, &dct);
xvt_dwin_set_clip(_owner, NULL); // Non si sa mai!
xvt_dwin_draw_line(_owner, p);
xvt_dwin_set_draw_ctools(_owner, &dct);
}
else
{
_owner = NULL_WIN;
}
}
void xvt_win_set_caret_size(WINDOW win, int width, int height)