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

Patch level : 10.0

Browse Source 
Files correlati     : ba0 ba1 ba7 ba8
Ricompilazione Demo : [ ]
Commento            :
Allineata nuova sintassi TWindow:handler


git-svn-id: svn://10.65.10.50/trunk@19479 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2009-10-20 15:23:26 +00:00
parent 3d6a0f9bae
commit b90437ca1c
11 changed files with 54 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ba/ba0102.cpp
View File

@ -474,7 +474,7 @@ private:
protected:
virtual void update();
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
virtual bool on_key(KEY k);
void synchronize_buddy_tree() const;
@ -666,7 +666,7 @@ void TMenulist_window::click_on(int index)
}
}
void TMenulist_window::handler(WINDOW w, EVENT* ep)
long TMenulist_window::handler(WINDOW w, EVENT* ep)
{
switch (ep->type)
{
@ -722,7 +722,7 @@ void TMenulist_window::handler(WINDOW w, EVENT* ep)
break;
}
TField_window::handler(w, ep);
return TField_window::handler(w, ep);
}
void TMenulist_window::select(int s, int direction)
@ -1119,11 +1119,11 @@ void TExplorer_mask::update()
}
}
void TExplorer_mask::handler(WINDOW win, EVENT* ep)
long TExplorer_mask::handler(WINDOW win, EVENT* ep)
{
if (ep->type == E_MOUSE_MOVE)
draw_spider(toolwin(), 0x3, ep->v.mouse.where);
TSpidey_mask::handler(win, ep);
return TSpidey_mask::handler(win, ep);
}
void TExplorer_mask::select_tree_current()

2
ba/ba0102.h
View File

@ -108,7 +108,7 @@ class TExplorer_mask : public TSpidey_mask
protected: // TMask
virtual void update();
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
virtual bool on_key(KEY k);
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);

22
ba/ba0103.cpp
View File

@ -25,7 +25,7 @@ class TApp_window : public TWindow
TString _appname;
protected:
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
public:
const TString& app_name() const { return _appname; }
@ -39,7 +39,7 @@ class TBook_window : public TControl_host_window
protected:
virtual void update();
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
void force_page(short page);
void erode_antipa();
@ -61,7 +61,7 @@ public:
// TApp_window
///////////////////////////////////////////////////////////
void TApp_window::handler(WINDOW win, EVENT* ep)
long TApp_window::handler(WINDOW win, EVENT* ep)
{
switch (ep->type)
{
@ -88,7 +88,7 @@ void TApp_window::handler(WINDOW win, EVENT* ep)
default:
break;
}
TWindow::handler(win, ep);
return TWindow::handler(win, ep);
}
TApp_window::TApp_window(TBook_window* owner, const char* appname) : _owner(owner), _appname(appname)
@ -144,7 +144,7 @@ void TBook_window::force_page(short page)
xvt_win_enum_wins(w, hell_riser, 0, 0);
}
void TBook_window::handler(WINDOW win, EVENT* ep)
long TBook_window::handler(WINDOW win, EVENT* ep)
{
switch (ep->type)
{
@ -153,10 +153,10 @@ void TBook_window::handler(WINDOW win, EVENT* ep)
draw_spider(win, 0x3, ep->v.mouse.where);
break;
case E_CONTROL:
if (ep->v.ctl.ci.win == _ctrl)
if (ep->type == WC_NOTEBK && ep->v.ctl.ci.win == _ctrl)
{
force_page(ep->v.ctl.ci.v.notebk.tab_no);
return;
force_page(ep->v.ctl.ci.v.notebk.page_new);
return 0L;
}
break;
case E_SIZE:
@ -166,7 +166,7 @@ void TBook_window::handler(WINDOW win, EVENT* ep)
default:
break;
}
TControl_host_window::handler(win, ep);
return TControl_host_window::handler(win, ep);
}
WINDOW TBook_window::page_win(short pg)
@ -423,7 +423,7 @@ void TOutlook_mask::set_page_caption(short page, const TString& caption, int ico
bf.set_page_caption(page, caption, icon);
}
void TOutlook_mask::handler(WINDOW w, EVENT* ep)
long TOutlook_mask::handler(WINDOW w, EVENT* ep)
{
if (ep->type == E_COMMAND)
{
@ -462,7 +462,7 @@ void TOutlook_mask::handler(WINDOW w, EVENT* ep)
default : break;
}
}
TSpidey_mask::handler(w, ep);
return TSpidey_mask::handler(w, ep);
}
bool TOutlook_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)

2
ba/ba0103.h
View File

@ -19,7 +19,7 @@ class TOutlook_mask : public TSpidey_mask
TString _last_search;
protected:
virtual void handler(WINDOW w, EVENT* ep);
virtual long handler(WINDOW w, EVENT* ep);
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
virtual bool can_be_closed() const;

6
ba/ba1800.cpp
View File

@ -101,7 +101,7 @@ class TColumnizer_win : public TField_window
bool _clickable; // E' possibile cliccare
protected: // TScroll_window
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
virtual void update();
protected: // Internal use
@ -273,7 +273,7 @@ void TColumnizer_win::update()
_pixmap = FALSE;
}
void TColumnizer_win::handler(WINDOW win, EVENT* ep)
long TColumnizer_win::handler(WINDOW win, EVENT* ep)
{
switch(ep->type)
{
@ -287,9 +287,9 @@ void TColumnizer_win::handler(WINDOW win, EVENT* ep)
}
break;
default:
TField_window::handler(win, ep);
break;
}
return TField_window::handler(win, ep);
}
void TColumnizer_win::recalc_layout(int dx, int dy)

14
ba/ba7100.cpp
View File

@ -479,7 +479,7 @@ class TMailer_mask : public TAutomask
protected:
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
protected:
bool file2app(const TString& file, TString& app) const;
@ -1463,11 +1463,9 @@ bool TMailer_mask::unattended() const
return (clock()-_last_use) > 10*CLOCKS_PER_SEC;
}
void TMailer_mask::handler(WINDOW win, EVENT* ep)
long TMailer_mask::handler(WINDOW win, EVENT* ep)
{
if (ep->type == E_TIMER)
{
if (ep->v.timer.id == _timer_id)
if (ep->type == E_TIMER && ep->v.timer.id == _timer_id)
{
_secs++;
if (_secs >= _interval)
@ -1476,9 +1474,9 @@ void TMailer_mask::handler(WINDOW win, EVENT* ep)
if (_mail_semaphore == 0 && unattended())
auto_save_all();
}
return 0L;
}
}
TAutomask::handler(win, ep);
return TAutomask::handler(win, ep);
}
void TMailer_mask::save() const
@ -1556,9 +1554,11 @@ void TMailer::main_loop()
int ba7100(int argc, char* argv[])
{
#if XVT_OS==XVT_OS_WIN32
long style = xvt_vobj_get_attr(NULL_WIN, ATTR_WIN_PM_TWIN_STARTUP_STYLE);
style |= WSF_NO_TASKBAR;
xvt_vobj_set_attr(NULL_WIN, ATTR_WIN_PM_TWIN_STARTUP_STYLE, style);
#endif
TMailer app;
app.run(argc, argv, appname);
return 0;

6
ba/ba8200.cpp
View File

@ -294,7 +294,7 @@ class TQuery_mask : public TAutomask
bool _sql_dirty; // Query modificata manualmente
protected:
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
protected:
@ -1377,7 +1377,7 @@ bool TQuery_mask::on_field_event(TOperable_field& o, TField_event e, long jolly)
}
// Gestione eventi di trascinamento
void TQuery_mask::handler(WINDOW wnd, EVENT* ep)
long TQuery_mask::handler(WINDOW wnd, EVENT* ep)
{
switch (ep->type)
{
@ -1412,7 +1412,7 @@ void TQuery_mask::handler(WINDOW wnd, EVENT* ep)
default:
break;
}
TAutomask::handler(wnd, ep);
return TAutomask::handler(wnd, ep);
}
TQuery_mask::TQuery_mask() : TAutomask("ba8200a"), _curr_num(0), _is_dirty(false)

16
ba/ba8300.cpp
View File

@ -576,7 +576,7 @@ protected:
virtual TMask_field* parse_field(TScanner& scanner);
virtual void notify_focus_field(short id);
virtual bool on_field_event(TOperable_field& o, TField_event e, long jolly);
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
protected:
bool select_report();
@ -1213,7 +1213,7 @@ bool TReport_mask::on_field_event(TOperable_field& o, TField_event e, long jolly
return true;
}
void TReport_mask::handler(WINDOW win, EVENT* ep)
long TReport_mask::handler(WINDOW win, EVENT* ep)
{
if (ep->type == E_COMMAND)
{
@ -1253,12 +1253,12 @@ TReport_mask::TReport_mask() : _tree(_report), _is_dirty(false)
read_mask("ba8300a", 0, -1);
TOutlook_field& of = (TOutlook_field&)field(F_TOOLS);
of.add_item(10221, PR("Nuovo Campo"), 0);
of.add_item(10222, PR("Proprieta' Campo"), 0);
of.add_item(10223, PR("Nuova Sezione"), 0);
of.add_item(10224, PR("Proprieta' Sezione"), 0);
of.add_item(10225, PR("Proprieta' Report"), 0);
of.add_item(10214, PR("Query Principale"), 0);
of.add_item(10221, TR("Nuovo Campo"), 0);
of.add_item(10222, TR("Proprieta' Campo"), 0);
of.add_item(10223, TR("Nuova Sezione"), 0);
of.add_item(10224, TR("Proprieta' Sezione"), 0);
of.add_item(10225, TR("Proprieta' Report"), 0);
of.add_item(10214, TR("Query Principale"), 0);
TTree_field& albero = tfield(F_SECTIONS);
RCT rct_sec; albero.get_rect(rct_sec);

2
ba/ba8300b.uml
View File

@ -151,6 +151,8 @@ STRING F_RADIUS 4
BEGIN
PROMPT 32 7 "Raggio smussatura "
FLAGS "UR"
NUM_EXPR #THIS_FIELD>=0
WARNING "Il raggio deve essere positivo"
END
LIST F_PATTERN 1 18

4
ba/ba8300c.uml
View File

@ -128,10 +128,12 @@ BEGIN
ITEM "4|Molto spesso"
END
STRING F_RADIUS 4
NUMBER F_RADIUS 4
BEGIN
PROMPT 26 1 "Raggio smussatura "
FLAGS "UR"
NUM_EXPR #THIS_FIELD>=0
WARNING "Il raggio deve essere positivo"
END
BUTTON F_FGCOLOR 14 1

8
ba/ba8301.cpp
View File

@ -844,7 +844,7 @@ class TReport_window : public TField_window
static TArray _clipboard;
protected:
virtual void handler(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
virtual void update();
virtual bool on_key(KEY k);
@ -1270,7 +1270,7 @@ bool TReport_window::add_field(const TRectangle& rct)
return ok;
}
void TReport_window::handler(WINDOW win, EVENT* ep)
long TReport_window::handler(WINDOW win, EVENT* ep)
{
switch (ep->type)
{
@ -1329,7 +1329,7 @@ void TReport_window::handler(WINDOW win, EVENT* ep)
break;
}
owner().mask().notify_focus_field(owner().dlg());
return; // Termina qui la gestione del bottone
return 0L; // Termina qui la gestione del bottone
case E_MOUSE_MOVE:
{
TMask& m = owner().mask();
@ -1495,7 +1495,7 @@ void TReport_window::handler(WINDOW win, EVENT* ep)
default:
break;
}
TField_window::handler(win, ep);
return TField_window::handler(win, ep);
}
PNT TReport_window::log2dev(long x, long y) const