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

Patch level : 10.0

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Corretta centratura icone per Windows 7


git-svn-id: svn://10.65.10.50/branches/R_10_00@22005 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2011-04-21 10:33:20 +00:00
parent 76084c8244
commit 72ee010211
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/controls.cpp
View File

@ -1697,8 +1697,8 @@ void TButton_control::set_icon(unsigned int icon_up, unsigned int icon_dn)
_obj->v.btn->drawable = false; _obj->v.btn->drawable = false;
const XI_RCT& rct = _obj->v.btn->rct; const XI_RCT& rct = _obj->v.btn->rct;
_obj->v.btn->icon_x = (rct.right - rct.left - 32) / 2 - 5; _obj->v.btn->icon_x = short(rct.right - rct.left - xvt_vobj_get_attr(NULL_WIN, ATTR_ICON_WIDTH)) / 2 - 5;
_obj->v.btn->icon_y = (rct.bottom - rct.top - 32) / 2 - 5; _obj->v.btn->icon_y = short(rct.bottom - rct.top - xvt_vobj_get_attr(NULL_WIN, ATTR_ICON_HEIGHT)) / 2 - 5;
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -1710,7 +1710,6 @@ TPushbutton_control::TPushbutton_control(WINDOW win, short cid,
const char* flags, const char* text, const char* flags, const char* text,
int bmp_up, int bmp_dn) int bmp_up, int bmp_dn)
: _bmp_up(bmp_up), _bmp_dn(bmp_dn) : _bmp_up(bmp_up), _bmp_dn(bmp_dn)
{ {
const bool drawable = bmp_up > 0; const bool drawable = bmp_up > 0;
create(win, cid, left, top, width, height, flags, text, WC_PUSHBUTTON, NULL, drawable); create(win, cid, left, top, width, height, flags, text, WC_PUSHBUTTON, NULL, drawable);

8
include/golem.cpp
View File

@ -13,7 +13,6 @@
#include <urldefid.h> #include <urldefid.h>
#include <utility.h> #include <utility.h>
#ifdef WIN32 #ifdef WIN32
#include <mapi.h> #include <mapi.h>
#include <shellapi.h> #include <shellapi.h>
@ -410,12 +409,11 @@ bool TGolem_field::autosave(TRelation& r)
if (old_file != new_file) if (old_file != new_file)
{ {
const bool was_stored = old_row.get_char(2) <= ' ' && const bool was_stored = old_row.get_char(2) <= ' ' && old_file.starts_with(golem_path, true);
golem_path.compare(old_file, golem_path.len(), true) == 0;
const bool tobe_stored = new_row.get_char(2) <= ' '; const bool tobe_stored = new_row.get_char(2) <= ' ';
if (was_stored && fexist(old_file)) if (was_stored && fexist(old_file))
old_file.fremove(); old_file.fremove();
if (tobe_stored && !new_file.blank()) if (tobe_stored && new_file.full())
{ {
char ext[_MAX_EXT]; char ext[_MAX_EXT];
xvt_fsys_parse_pathname(new_file, NULL, NULL, NULL, ext, NULL); xvt_fsys_parse_pathname(new_file, NULL, NULL, NULL, ext, NULL);
@ -428,7 +426,7 @@ bool TGolem_field::autosave(TRelation& r)
// Cancella il file originale se temporaneo // Cancella il file originale se temporaneo
TFilename tmp; tmp.tempdir(); TFilename tmp; tmp.tempdir();
if (tmp.compare(new_file, tmp.len(), true) == 0) if (new_file.starts_with(tmp, true))
new_file.fremove(); new_file.fremove();
} }
} }

2
include/reprint.cpp
View File

@ -2609,7 +2609,7 @@ bool TReport_book::init(TReport& rep)
{ {
TPrinter& pr = printer(); TPrinter& pr = printer();
bool save_profile = rep.save_last_printer(); bool save_profile = rep.save_last_printer() && (pr.printtype() < exportprinter);
if (save_profile && !pr.manual_setup()) if (save_profile && !pr.manual_setup())
{ {
const TString profile = rep.filename().name(); const TString profile = rep.filename().name();