From 41b36659a819f13d0c6ad0888c28b95f0dc91b2d Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 17 Apr 2003 12:53:36 +0000 Subject: [PATCH] Patch level : 2.0 nopatch Files correlati : Ricompilazione Demo : [ ] Commento : Aggiunta xvt_vobj_minimize git-svn-id: svn://10.65.10.50/trunk@11030 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- xvaga/xvaga.cpp | 9 +++++++++ xvaga/xvt.h | 1 + xvaga/xvtextra.cpp | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp index 6a55f08d2..77a7a1bdd 100755 --- a/xvaga/xvaga.cpp +++ b/xvaga/xvaga.cpp @@ -3719,6 +3719,15 @@ void xvt_vobj_maximize(WINDOW win) pMain->Maximize(); } +void xvt_vobj_minimize(WINDOW win) +{ + wxFrame* pMain = (wxFrame*)_task_win; + if (win == (WINDOW)pMain) + pMain->Iconize(); + else + SORRY_BOX(); +} + void xvt_vobj_move(WINDOW win, RCT *rctp) { CAST_WIN(win, w); diff --git a/xvaga/xvt.h b/xvaga/xvt.h index 8ad2fd654..aebe0e43a 100755 --- a/xvaga/xvt.h +++ b/xvaga/xvt.h @@ -272,6 +272,7 @@ WINDOW xvt_vobj_get_parent(WINDOW win); char* xvt_vobj_get_title(WINDOW win, char *title, int sz_title); WIN_TYPE xvt_vobj_get_type(WINDOW win); void xvt_vobj_maximize(WINDOW win); // Added by XVAGA +void xvt_vobj_minimize(WINDOW win); // Added by XVAGA void xvt_vobj_move(WINDOW win, RCT *rctp); void xvt_vobj_raise(WINDOW win); void xvt_vobj_set_attr(WINDOW win, long data, long value); diff --git a/xvaga/xvtextra.cpp b/xvaga/xvtextra.cpp index d8d1f483e..785aea6f7 100755 --- a/xvaga/xvtextra.cpp +++ b/xvaga/xvtextra.cpp @@ -375,21 +375,16 @@ SLIST xvt_print_list_devices() { SLIST list = xvt_slist_create(); #ifdef WIN32 - char buf[4096]; // ammazzao' + char buf[4096]; memset(buf, 0, sizeof(buf)); GetProfileString("devices", NULL, "", buf, sizeof(buf)); int start = 0; - for (int i = 0; i < sizeof(buf); i++) + for (int i = 0; i < sizeof(buf); i++) if (buf[i] == '\0') { - if (buf[i] == '\0') - { - if (buf[i+1] != '\0') - { - xvt_slist_add_at_elt(list, NULL, buf+start, NULL); - start = i+1; - } - else - break; - } + const char* pname = buf+start; + if (*pname == '\0') + break; + xvt_slist_add_at_elt(list, NULL, pname, NULL); + start = i+1; } #else xvt_slist_add_at_elt(list, NULL, "/dev/prn", NULL); // TBI @@ -407,10 +402,10 @@ BOOLEAN xvt_print_set_default_device(const char* name) if (pdev.Find(',') < 0) { char szDevice[256]; - GetProfileString ("devices", pdev, "", szDevice, sizeof(szDevice)); + ::GetProfileString ("devices", pdev, "", szDevice, sizeof(szDevice)); pdev << ',' << szDevice; } - ok = WriteProfileString("windows", "device", pdev) != 0; + ok = ::WriteProfileString("windows", "device", pdev) != 0; } #endif return ok; @@ -418,7 +413,12 @@ BOOLEAN xvt_print_set_default_device(const char* name) BOOLEAN xvt_print_get_default_device(char* name, int namesize) { - bool ok = GetProfileString ("windows", "device", ",,,", name, namesize) != 0; + bool ok = TRUE; +#ifdef WIN32 + ok = ::GetProfileString ("windows", "device", ",,,", name, namesize) != 0; +#else + strcpy(name, "/dev/prn"); +#endif return ok; }