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

Porting a 32 Bit

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@4485 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 1997-06-02 09:59:21 +00:00
parent 4265125994
commit 0e6df8119c
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/archives.cpp
View File

@ -539,7 +539,7 @@ TProgress_win::TProgress_win(const char* title, TArchive* arc)
add_button(DLG_USER, 0, "Cancel", -11, -1, 10, 2, "", BMP_CANCEL); add_button(DLG_USER, 0, "Cancel", -11, -1, 10, 2, "", BMP_CANCEL);
set_handler(DLG_USER, cancel_handler); set_handler(DLG_USER, cancel_handler);
#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_NT #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
HWND txt = (HWND)xvt_vobj_get_attr(wtxt, ATTR_NATIVE_WINDOW); HWND txt = (HWND)xvt_vobj_get_attr(wtxt, ATTR_NATIVE_WINDOW);
HWND num = (HWND)xvt_vobj_get_attr(wnum, ATTR_NATIVE_WINDOW); HWND num = (HWND)xvt_vobj_get_attr(wnum, ATTR_NATIVE_WINDOW);
_monitor = new ALWindowsMessage(AL_MONITOR_OBJECTS, txt, AL_SEND_RATIO, num); _monitor = new ALWindowsMessage(AL_MONITOR_OBJECTS, txt, AL_SEND_RATIO, num);

2
include/cfiles.h
View File

@ -58,7 +58,7 @@ typedef struct
/* @(:) 2.3.01.temp */ /* @(:) 2.3.01.temp */
} RecFieldDes ; } RecFieldDes ;
#if XVT_OS == XVT_OS_DOS || XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS_WIN32
#pragma pack(2) #pragma pack(2)
#endif #endif

16
include/checks.cpp
View File

@ -7,7 +7,7 @@
#define STRICT #define STRICT
#include <xvt.h> #include <xvt.h>
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
#include <keys.h> #include <keys.h>
#else #else
#include <xvtility.h> #include <xvtility.h>
@ -35,7 +35,7 @@ int fatal_box(
{ {
buildmsg(); buildmsg();
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
MessageBeep(MB_ICONHAND); MessageBeep(MB_ICONHAND);
MessageBox(GetFocus(), msg, "ERRORE FATALE", MB_OK | MB_ICONHAND | MB_SYSTEMMODAL); MessageBox(GetFocus(), msg, "ERRORE FATALE", MB_OK | MB_ICONHAND | MB_SYSTEMMODAL);
@ -70,7 +70,7 @@ int error_box(
{ {
buildmsg(); buildmsg();
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
MessageBeep(MB_ICONEXCLAMATION); MessageBeep(MB_ICONEXCLAMATION);
MessageBox(GetFocus(), msg, "ERRORE", MB_OK | MB_ICONEXCLAMATION); MessageBox(GetFocus(), msg, "ERRORE", MB_OK | MB_ICONEXCLAMATION);
#else #else
@ -98,7 +98,7 @@ int warning_box(
{ {
buildmsg(); buildmsg();
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
MessageBeep(MB_ICONQUESTION); MessageBeep(MB_ICONQUESTION);
MessageBox(GetFocus(), msg, "ATTENZIONE", MB_OK | MB_ICONQUESTION); MessageBox(GetFocus(), msg, "ATTENZIONE", MB_OK | MB_ICONQUESTION);
#else #else
@ -121,7 +121,7 @@ int message_box(
{ {
buildmsg(); buildmsg();
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
MessageBox(GetFocus(), msg, "INFORMAZIONE", MB_OK | MB_ICONINFORMATION); MessageBox(GetFocus(), msg, "INFORMAZIONE", MB_OK | MB_ICONINFORMATION);
#else #else
xvt_dm_post_note("%s", msg); xvt_dm_post_note("%s", msg);
@ -142,7 +142,7 @@ int sorry_box(
{ {
buildmsg(); buildmsg();
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
MessageBeep(MB_ICONINFORMATION); MessageBeep(MB_ICONINFORMATION);
MessageBox(GetFocus(), msg, "SPIACENTE", MB_OK | MB_ICONINFORMATION); MessageBox(GetFocus(), msg, "SPIACENTE", MB_OK | MB_ICONINFORMATION);
#else #else
@ -171,7 +171,7 @@ int yesno_box(
{ {
buildmsg(); buildmsg();
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
MessageBeep(MB_ICONQUESTION); MessageBeep(MB_ICONQUESTION);
int r = MessageBox(GetFocus(), msg, "RICHIESTA", MB_YESNO | MB_ICONQUESTION); int r = MessageBox(GetFocus(), msg, "RICHIESTA", MB_YESNO | MB_ICONQUESTION);
return r == IDYES; return r == IDYES;
@ -234,7 +234,7 @@ int yesnocancel_box(
{ {
buildmsg(); buildmsg();
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
int r = MessageBox(GetFocus(), msg, "RICHIESTA", MB_YESNOCANCEL | MB_ICONQUESTION); int r = MessageBox(GetFocus(), msg, "RICHIESTA", MB_YESNOCANCEL | MB_ICONQUESTION);
if (r == IDYES) r = K_YES; if (r == IDYES) r = K_YES;
else else

4
include/colors.cpp
View File

@ -3,7 +3,7 @@
#include <colors.h> #include <colors.h>
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
#include <commdlg.h> #include <commdlg.h>
#endif #endif
@ -37,7 +37,7 @@ COLOR choose_color(COLOR col, WINDOW win)
{ {
int ok = FALSE; int ok = FALSE;
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
CHOOSECOLOR cc; CHOOSECOLOR cc;
memset(&cc, 0, sizeof(cc)); // Azzera struttura memset(&cc, 0, sizeof(cc)); // Azzera struttura

6
include/controls.cpp
View File

@ -1,8 +1,8 @@
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS_WIN32
#define STRICT #define STRICT
#define XVT_INCL_NATIVE #define XVT_INCL_NATIVE
#endif #endif
#include <colors.h> #include <colors.h>
#include <config.h> #include <config.h>
#include <controls.h> #include <controls.h>
@ -153,7 +153,7 @@ XVT_FNTID xvt_default_font(bool bold)
xvt_font_map_using_default(FAT_FONT); xvt_font_map_using_default(FAT_FONT);
CHECK(xvt_font_is_mapped(FAT_FONT), "Can't map native font"); CHECK(xvt_font_is_mapped(FAT_FONT), "Can't map native font");
// Get true text size // Get true text size
#if XVT_OS == XVT_OS_WIN #if XVT_OS == XVT_OS_WIN || XVT_OS_WIN32
TEXTMETRIC tm; TEXTMETRIC tm;
HDC hdc = (HDC)xvt_vobj_get_attr(TASK_WIN, ATTR_NATIVE_GRAPHIC_CONTEXT); HDC hdc = (HDC)xvt_vobj_get_attr(TASK_WIN, ATTR_NATIVE_GRAPHIC_CONTEXT);
GetTextMetrics(hdc, &tm); GetTextMetrics(hdc, &tm);

6
include/form.cpp
View File

@ -3571,7 +3571,7 @@ void TForm::arrange_form()
TString str_pos; TString str_pos;
TMask m("ba2100c"); TMask m("ba2100c");
#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_NT #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
/* /*
char defPrinter[80]; char defPrinter[80];
char szDevice[50]; char szDevice[50];
@ -3595,7 +3595,7 @@ void TForm::arrange_form()
// _ipy viene assunto uguale per entrambi i posizionamneti // _ipy viene assunto uguale per entrambi i posizionamneti
str_pos = "\017"; // Questo e' 15 in ottale... str_pos = "\017"; // Questo e' 15 in ottale...
for (i=1; i < _ipy; i++) str_pos << "\n"; for (i=1; i < _ipy; i++) str_pos << "\n";
#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_NT #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
SpoolRow((char *) (const char *) str_pos, str_pos.len()); SpoolRow((char *) (const char *) str_pos, str_pos.len());
#else #else
@ -3615,7 +3615,7 @@ void TForm::arrange_form()
// TString bspc; bspc.fill('\b',str_pos.len()); // Questi servono per tornare indietro... // TString bspc; bspc.fill('\b',str_pos.len()); // Questi servono per tornare indietro...
do do
{ {
#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_NT #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
SpoolRow((char *)(const char *) str_pos, str_pos.len()); SpoolRow((char *)(const char *) str_pos, str_pos.len());
#else #else
lpt = fopen(device,"w"); lpt = fopen(device,"w");

2
include/golem.cpp
View File

@ -208,7 +208,7 @@ bool TGolem::import()
} }
#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_NT #if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32
#include <dde.h> #include <dde.h>