Aggiunto XVT_CALLCONV1 e supporto per WATCOM C++

git-svn-id: svn://10.65.10.50/trunk@1142 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1995-03-16 13:44:11 +00:00
parent c02e718e32
commit c40612059d
10 changed files with 18 additions and 12 deletions

View File

@ -45,7 +45,7 @@ class TApplication
protected:
const char* get_module_name() const;
static long task_eh(WINDOW win, EVENT* ep);
static long XVT_CALLCONV1 task_eh(WINDOW win, EVENT* ep);
virtual long handler(WINDOW win, EVENT* ep);
virtual bool extended_firm() const { return FALSE; } // Extended set_firm dialog box
@ -113,4 +113,4 @@ public:
bool xvt_running(); // xvt is running?
TApplication& main_app();
#endif // __APPLICATION_H
#endif /* __APPLICATION_H */

View File

@ -286,7 +286,7 @@ TControl::~TControl()
{}
long TControl::handler(WINDOW win, EVENT* ep)
long XVT_CALLCONV1 TControl::handler(WINDOW win, EVENT* ep)
{
static bool tracking = FALSE;
static bool pressed = FALSE;

View File

@ -68,7 +68,7 @@ WINDOW xvt_create_checkbox(
bool _multiple : 1;
protected:
static long handler(WINDOW win, EVENT* ep);
static long XVT_CALLCONV1 handler(WINDOW win, EVENT* ep);
void create(short left, short top, short right, short bottom,
const char* caption,

View File

@ -1,4 +1,4 @@
// $Id: mailbox.cpp,v 1.11 1995-01-16 15:10:23 guy Exp $
// $Id: mailbox.cpp,v 1.12 1995-03-16 13:43:55 alex Exp $
#include <stdlib.h>
#include <fstream.h>
@ -25,7 +25,7 @@ TMessage::TMessage(const char* to, const char* sub,
_to = rec;
_subject = sub;
_text = text;
_from = (from == NULL || *from == '\0') ? main_app().name() : from;
_from = (from == NULL || *from == '\0') ? main_app().name() : TString(from);
_flags = 0x00; _number = -1;
}

View File

@ -58,7 +58,7 @@ void TPrinter::_get_windows_printer_names (TToken_string & t)
delete buf;
}
BOOLEAN TPrinter::start_winprint (long data)
BOOLEAN XVT_CALLCONV1 TPrinter::start_winprint (long data)
{
PrDesc *pd = (PrDesc *) data;
TTextfile& txt = *(pd->_txt);

View File

@ -188,7 +188,7 @@ public:
virtual ~TPrinter();
#if XVT_OS == XVT_OS_WIN
static BOOLEAN start_winprint(long);
static BOOLEAN XVT_CALLCONV1 start_winprint(long);
#endif
void set_config_file (const char * ffile) { _config = ffile ; }

View File

@ -1,4 +1,4 @@
// $Id: value.h,v 1.2 1994-12-29 14:51:40 villa Exp $
// $Id: value.h,v 1.3 1995-03-16 13:44:07 alex Exp $
// language types for Simulation and SimulationManager
// -------------------------------------------------------------------------
@ -13,7 +13,10 @@
#ifndef _iostream_h
#include <iostream.h>
#endif
#ifdef __WATCOMC__
#include stdlib.h
#endif
enum basetype
{

View File

@ -181,7 +181,7 @@ TWindow::TWindow()
{}
long TWindow::window_handler(WINDOW win, EVENT* ep)
long XVT_CALLCONV1 TWindow::window_handler(WINDOW win, EVENT* ep)
{
TWindow* w = (TWindow*)get_app_data(win);
CHECK(w != NULL, "Invalid window");

View File

@ -65,7 +65,7 @@ protected:
bool _pixmap : 1; // Se se le coordiante sono in pixel
// @FPROT
static long window_handler(WINDOW win, EVENT* ep);
static long XVT_CALLCONV1 window_handler(WINDOW win, EVENT* ep);
virtual WINDOW create(short x, short y, short dx, short dy,
const char* title = "", long flags = WSF_NONE,
WIN_TYPE rt = W_DOC, WINDOW parent = NULL_WIN, int menu = 0) ;

View File

@ -59,9 +59,12 @@ HIDDEN COLOR RGB2COLOR(COLORREF c)
return MAKE_COLOR(red, gre, blu);
}
#ifndef XVT_CALLCONV1
#define XVT_CALLCONV1
#endif
extern "C" {
WINDOW xvtwi_hwnd_to_window(HWND);
WINDOW XVT_CALLCONV1 xvtwi_hwnd_to_window(HWND);
#include <statbar.h>
}
#include <controls.h>