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

Patch level : 10.0

Browse Source 
Files correlati     : maschere con sheet
Ricompilazione Demo : [ ]
Commento            :
Coretto allineamento icona in testa alla prima colonna degli spreadscheet


git-svn-id: svn://10.65.10.50/trunk@17414 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2008-10-10 15:10:38 +00:00
parent c6a114ab99
commit 535d60ad4b
7 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/colors.h
View File

@ -41,11 +41,11 @@ extern int TOOL_SIZE;
extern bool TOOL_TEXT; extern bool TOOL_TEXT;
extern bool EASY_RIDER; extern bool EASY_RIDER;
const COLOR COLOR_DKCYAN = MAKE_COLOR(0,128,128); const COLOR COLOR_DKCYAN = XVT_MAKE_COLOR(0,128,128);
const COLOR COLOR_DKYELLOW = MAKE_COLOR(128,128, 0); const COLOR COLOR_DKYELLOW = XVT_MAKE_COLOR(128,128, 0);
const COLOR COLOR_DKGREEN = MAKE_COLOR(0,128, 0); const COLOR COLOR_DKGREEN = XVT_MAKE_COLOR(0,128, 0);
const COLOR COLOR_DKBLUE = MAKE_COLOR(0,0,128); const COLOR COLOR_DKBLUE = XVT_MAKE_COLOR(0,0,128);
const COLOR COLOR_DKRED = MAKE_COLOR(128,0, 0); const COLOR COLOR_DKRED = XVT_MAKE_COLOR(128,0, 0);
const COLOR COLOR_DKMAGENTA = MAKE_COLOR(128,0,128); const COLOR COLOR_DKMAGENTA = XVT_MAKE_COLOR(128,0,128);
#endif #endif

10
include/currency.cpp
View File

@ -30,11 +30,11 @@ class TDowJones : public TFile_cache
return d; return d;
} }
TExchangeData() TExchangeData()
: _chg(1.0), _dec(0), _dec_prices(0), _is_euro(FALSE), _et(_exchange_base) { } : _chg(UNO), _dec(0), _dec_prices(0), _is_euro(false), _et(_exchange_base) { }
}; };
long _codditta; long _codditta;
TString16 _base_val, _firm_val, _euro_val; TString4 _base_val, _firm_val, _euro_val;
real _euro_chg; real _euro_chg;
protected: protected:
@ -88,7 +88,7 @@ TObject* TDowJones::rec2obj(const TRectype& rec) const
statbar_set_title(TASK_WIN, msg); statbar_set_title(TASK_WIN, msg);
} }
#endif #endif
data->_chg = 1.0; data->_chg = UNO;
} }
} }
@ -130,7 +130,7 @@ void TDowJones::test_cache()
FOR_EACH_ASSOC_OBJECT(_cache, hash, key, obj) if (*key) FOR_EACH_ASSOC_OBJECT(_cache, hash, key, obj) if (*key)
{ {
const TExchangeData& data = *(const TExchangeData*)obj; const TExchangeData& data = *(const TExchangeData*)obj;
if ((_base_val.empty() || strcmp(key, "LIT") == 0) && data._chg == 1.0) if ((_base_val.empty() || strcmp(key, "LIT") == 0) && data._chg == UNO)
_base_val = key; _base_val = key;
if (data._is_euro && _euro_val.empty()) if (data._is_euro && _euro_val.empty())
_euro_val = key; _euro_val = key;
@ -148,7 +148,7 @@ void TDowJones::test_cache()
if (_base_val.empty()) // Si son dimenticati delle LIRE? if (_base_val.empty()) // Si son dimenticati delle LIRE?
{ {
TExchangeData* lira = new TExchangeData; TExchangeData* lira = new TExchangeData;
lira->_chg = 1.0; lira->_dec = lira->_dec_prices = 0; lira->_chg = UNO; lira->_dec = lira->_dec_prices = 0;
lira->_is_euro = FALSE; lira->_et = _exchange_base; lira->_is_euro = FALSE; lira->_et = _exchange_base;
_base_val = "LIT"; _base_val = "LIT";
_cache.add(_base_val, lira); _cache.add(_base_val, lira);

1
include/mask.cpp
View File

@ -1227,6 +1227,7 @@ WINDOW TMask::create_book(bool single)
CHECK(_notebook == NULL_WIN, "One single notebook, please!"); CHECK(_notebook == NULL_WIN, "One single notebook, please!");
WIN_DEF wd; memset(&wd, 0, sizeof(wd)); WIN_DEF wd; memset(&wd, 0, sizeof(wd));
wd.wtype = WC_NOTEBK; wd.wtype = WC_NOTEBK;
wd.v.ctl.flags = CTL_FLAG_TAB_DEFAULT | CTL_FLAG_TAB_TOP;
xvt_vobj_get_client_rect(parent, &wd.rct); xvt_vobj_get_client_rect(parent, &wd.rct);
_notebook = xvt_ctl_create_def(&wd, parent, long(this)); _notebook = xvt_ctl_create_def(&wd, parent, long(this));
xvt_pane_add(parent, _notebook, "_MainNoteBook_", 0, 0); xvt_pane_add(parent, _notebook, "_MainNoteBook_", 0, 0);

3
include/msksheet.cpp
View File

@ -539,7 +539,8 @@ TSpreadsheet::TSpreadsheet(
if (attr & XI_ATR_SELECTABLE) if (attr & XI_ATR_SELECTABLE)
{ {
coldef->v.column->icon_rid = ICO_SEARCH; coldef->v.column->icon_rid = ICO_SEARCH;
coldef->v.column->icon_x = 2; coldef->v.column->icon_x = -4; // l'icona e' 32x32 ma e' disegnata solo al centro
coldef->v.column->icon_y = -8;
if (listdef->v.list->min_heading_height < 20) if (listdef->v.list->min_heading_height < 20)
listdef->v.list->min_heading_height = 20; listdef->v.list->min_heading_height = 20;
} }

2
include/report.cpp
View File

@ -744,7 +744,7 @@ void TReport_section::load(const TXmlItem& sec)
gb->GetEnclosedText(str); gb->GetEnclosedText(str);
group_by(str); group_by(str);
} }
if (level() > 10) if (level() > 10 && type() == 'B') // Solo body dei pulcini hanno la query
{ {
const TXmlItem* sql = sec.FindFirstChild("sql"); const TXmlItem* sql = sec.FindFirstChild("sql");
if (sql != NULL) if (sql != NULL)

2
include/sheet.cpp
View File

@ -767,7 +767,7 @@ bool TSheet_control::event_handler(XI_OBJ* itf, XI_EVENT *xiev)
} }
break; break;
case 'M': // Set value for "roman" cell case 'M': // Set value for "roman" cell
src = itor(atoi(row(rec).get(col))); src = itor(row(rec).get_int(col));
break; break;
case 'V': // Set value for "value" cell case 'V': // Set value for "value" cell
{ {

4
include/xvtility.h
View File

@ -5,10 +5,6 @@
#include <xvt.h> #include <xvt.h>
#endif #endif
#ifndef __STDTYPES_H
#include <stdtypes.h>
#endif
#ifndef __KEYS_H #ifndef __KEYS_H
#include <keys.h> #include <keys.h>
#endif #endif