Cambiato XVT_OS in XVT , XVT4.00

git-svn-id: svn://10.65.10.50/trunk@1177 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1995-03-27 14:46:49 +00:00
parent dfa98abb64
commit b71a13da62
9 changed files with 137 additions and 114 deletions

View File

@ -3,13 +3,15 @@
#include <stdlib.h>
#ifdef FOXPRO
#undef XVT_OS
#undef XVT
#include <windows.h>
#include <pro_ext.h>
#endif
#ifdef XVT_OS
#ifdef XVT
#ifndef XVT_INCL_XVT
#include <xvt.h>
#endif
#if XVT_OS == XVT_OS_WIN
#include <windows.h>
#include <keys.h>
@ -17,7 +19,7 @@
#include <xvtility.h>
#endif
#include <applicat.h>
#endif /* XVT_OS */
#endif /* XVT */
#include <checks.h>

View File

@ -1,4 +1,3 @@
#include <direct.h>
#include <stdlib.h>
#include <xvt.h>

View File

@ -1,4 +1,4 @@
S1=$(LOCAL)/xvtch/include/xvt.h
S1=$(LOCAL)/xvtdsc2/ch_x86_sco/ptk/include/xvt.h
S2=$(DEVHOME)/mathlib/gmsys1.h $(DEVHOME)/mathlib/gfd.h $(DEVHOME)/mathlib/gmfequs.h $(DEVHOME)/mathlib/gmfuncts.h
S2=$(DEVHOME)/mathlib/gm.h
I1=$(IP)stdtypes.h

View File

@ -1,4 +1,4 @@
// $Id: mailbox.cpp,v 1.12 1995-03-16 13:43:55 alex Exp $
// $Id: mailbox.cpp,v 1.13 1995-03-27 14:45:05 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() : TString(from);
_from = (from == NULL || *from == '\0') ? main_app().name() : from;
_flags = 0x00; _number = -1;
}

View File

@ -1,5 +1,9 @@
#include <stdlib.h>
#include <strstream.h>
#include <xvt.h>
#if XVT_OS==XVT_OS_SCOUNIX
#include <unistd.h>
#include <sys/types.h>
@ -8,9 +12,6 @@
#include <stdio.h>
#endif
#include <strstream.h>
#include <xvt.h>
#define STYLE_NUM 4
#include <applicat.h>
@ -704,7 +705,10 @@ HIDDEN bool set_windows_print_device (TMask_field& f, KEY key)
TPrinter::TPrinter()
: _date (TODAY), _multiple_link (FALSE), _frozen (FALSE), _isgraphics (TRUE),
_lines_per_inch (6), _ch_size (12), _ncopies(1), _print_rcd(NULL)
_lines_per_inch (6), _ch_size (12), _ncopies(1)
#if XVT_OS == XVT_OS_WIN
, _print_rcd(NULL)
#endif
{
_footerhandler = _headerhandler = NULL;
@ -1268,7 +1272,9 @@ void TPrinter::set()
}
((TList_field &)(mask.field (MSK_1_CODES))).replace_items(pn1, pn2);
#if XVT_OS == XVT_OS_WIN
mask.xvt_win_set_handler (MSK_1_PRINTERS, printers_on_key);
#endif
if (_printertype == fileprinter)
mask.set (MSK_1_TYPE, "1");
else if (_printertype == screenvis)
@ -1276,8 +1282,8 @@ void TPrinter::set()
else
mask.set (MSK_1_TYPE, "0");
mask.set(MSK_1_PRINTERS, _curprn));
mask.set(MSK_1_CODES, _curcode));
mask.set(MSK_1_PRINTERS, _curprn);
mask.set(MSK_1_CODES, _curcode);
KEY k;
if ((k = mask.run()) == K_ESC)

View File

@ -218,11 +218,12 @@ TPrintwin::TPrintwin(TTextfile& txt)
{
TPrinter& p = main_app().printer();
#if XVT_OS != XVT_OS_SCOUNIX
_printrcd = p.get_printrcd();
WINDOW prwin = xvt_print_create_win(_printrcd, (char*)(const char*)main_app().title());
set_win(prwin);
#endif
_char_size = p.get_char_size();
set_font(XVT_FFN_FIXED, XVT_FS_NONE, _char_size);
@ -231,6 +232,9 @@ TPrintwin::TPrintwin(TTextfile& txt)
#endif
_inited = TRUE;
_formlen = p.formlen();
_formwidth = p.formwidth();
#if XVT_OS != XVT_OS_SCOUNIX
if (prwin != NULL_WIN)
{
xvt_dwin_get_font_metrics(prwin, &_lead, &_ascent, &_descent);
@ -238,12 +242,11 @@ TPrintwin::TPrintwin(TTextfile& txt)
_bg = &p.getbgdesc();
_chary = p.get_dots_per_line();
_formlen = p.formlen();
_formwidth = p.formwidth();
_hofs = p.get_horz_offset();
_vofs = p.get_vert_offset();
}
else _aborted = TRUE;
#endif
}

View File

@ -1,6 +1,12 @@
#ifndef __STDTYPES_H
#define __STDTYPES_H
#ifdef XVT
#ifndef XVT_INCL_XVTENV
#include <xvt_env.h>
#endif
#endif
// @M
#define pure =0

View File

@ -1,10 +1,15 @@
#include <ctype.h>
#include <direct.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <xvt.h>
#if XVT_OS == XVT_OS_WIN
#include <direct.h>
#else
#include <sys/types.h>
#include <sys/stat.h>
#endif
#define __UTILITY_CPP
#include <utility.h>

View File

@ -671,8 +671,8 @@ XVT_FNTID xvt_default_font()
CHARY = tm.tmHeight;
BASEY = tm.tmAscent;
if (CHARY > ROWY-2) CHARY = ROWY-2;
}
#endif
}
return DEF_FONT;
}
@ -681,6 +681,7 @@ void xvt_set_font(WINDOW win, const char* family, int style, int dim)
{
CHECK(win != NULL_WIN, "Can't set the font in a NULL window");
#if XVT_OS != XVT_OS_SCOUNIX
XVT_FNTID font = xvt_dwin_get_font(TASK_WIN);
if (family && *family) xvt_font_set_family(font, (char*)family);
if (dim != 0) xvt_font_set_size(font, dim);
@ -691,6 +692,7 @@ void xvt_set_font(WINDOW win, const char* family, int style, int dim)
xvt_dwin_set_font(win, font);
xvt_font_destroy(font);
#endif
}