From 0e6df8119c1b6fc9da863b08c26c0d5ec3f66a2d Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 2 Jun 1997 09:59:21 +0000 Subject: [PATCH] Porting a 32 Bit git-svn-id: svn://10.65.10.50/trunk@4485 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/archives.cpp | 2 +- include/cfiles.h | 2 +- include/checks.cpp | 16 ++++++++-------- include/colors.cpp | 4 ++-- include/controls.cpp | 6 +++--- include/form.cpp | 6 +++--- include/golem.cpp | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/archives.cpp b/include/archives.cpp index 3de87772c..717df9186 100755 --- a/include/archives.cpp +++ b/include/archives.cpp @@ -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); 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 num = (HWND)xvt_vobj_get_attr(wnum, ATTR_NATIVE_WINDOW); _monitor = new ALWindowsMessage(AL_MONITOR_OBJECTS, txt, AL_SEND_RATIO, num); diff --git a/include/cfiles.h b/include/cfiles.h index 9cc43cb94..87ccc836b 100755 --- a/include/cfiles.h +++ b/include/cfiles.h @@ -58,7 +58,7 @@ typedef struct /* @(:) 2.3.01.temp */ } RecFieldDes ; -#if XVT_OS == XVT_OS_DOS || XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS_WIN32 #pragma pack(2) #endif diff --git a/include/checks.cpp b/include/checks.cpp index d3d7f3670..e9ab8a737 100755 --- a/include/checks.cpp +++ b/include/checks.cpp @@ -7,7 +7,7 @@ #define STRICT #include -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 #include #else #include @@ -35,7 +35,7 @@ int fatal_box( { buildmsg(); -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 MessageBeep(MB_ICONHAND); MessageBox(GetFocus(), msg, "ERRORE FATALE", MB_OK | MB_ICONHAND | MB_SYSTEMMODAL); @@ -70,7 +70,7 @@ int error_box( { buildmsg(); -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 MessageBeep(MB_ICONEXCLAMATION); MessageBox(GetFocus(), msg, "ERRORE", MB_OK | MB_ICONEXCLAMATION); #else @@ -98,7 +98,7 @@ int warning_box( { buildmsg(); -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 MessageBeep(MB_ICONQUESTION); MessageBox(GetFocus(), msg, "ATTENZIONE", MB_OK | MB_ICONQUESTION); #else @@ -121,7 +121,7 @@ int message_box( { 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); #else xvt_dm_post_note("%s", msg); @@ -142,7 +142,7 @@ int sorry_box( { buildmsg(); -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 MessageBeep(MB_ICONINFORMATION); MessageBox(GetFocus(), msg, "SPIACENTE", MB_OK | MB_ICONINFORMATION); #else @@ -171,7 +171,7 @@ int yesno_box( { buildmsg(); -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 MessageBeep(MB_ICONQUESTION); int r = MessageBox(GetFocus(), msg, "RICHIESTA", MB_YESNO | MB_ICONQUESTION); return r == IDYES; @@ -234,7 +234,7 @@ int yesnocancel_box( { 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); if (r == IDYES) r = K_YES; else diff --git a/include/colors.cpp b/include/colors.cpp index b0d59a254..20de53013 100755 --- a/include/colors.cpp +++ b/include/colors.cpp @@ -3,7 +3,7 @@ #include -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 #include #endif @@ -37,7 +37,7 @@ COLOR choose_color(COLOR col, WINDOW win) { int ok = FALSE; -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS == XVT_OS_WIN32 CHOOSECOLOR cc; memset(&cc, 0, sizeof(cc)); // Azzera struttura diff --git a/include/controls.cpp b/include/controls.cpp index 142ccceea..4ed26367e 100755 --- a/include/controls.cpp +++ b/include/controls.cpp @@ -1,8 +1,8 @@ -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS_WIN32 #define STRICT #define XVT_INCL_NATIVE #endif - + #include #include #include @@ -153,7 +153,7 @@ XVT_FNTID xvt_default_font(bool bold) xvt_font_map_using_default(FAT_FONT); CHECK(xvt_font_is_mapped(FAT_FONT), "Can't map native font"); // Get true text size -#if XVT_OS == XVT_OS_WIN +#if XVT_OS == XVT_OS_WIN || XVT_OS_WIN32 TEXTMETRIC tm; HDC hdc = (HDC)xvt_vobj_get_attr(TASK_WIN, ATTR_NATIVE_GRAPHIC_CONTEXT); GetTextMetrics(hdc, &tm); diff --git a/include/form.cpp b/include/form.cpp index 087e6a731..b59041ba3 100755 --- a/include/form.cpp +++ b/include/form.cpp @@ -3571,7 +3571,7 @@ void TForm::arrange_form() TString str_pos; 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 szDevice[50]; @@ -3595,7 +3595,7 @@ void TForm::arrange_form() // _ipy viene assunto uguale per entrambi i posizionamneti str_pos = "\017"; // Questo e' 15 in ottale... 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()); #else @@ -3615,7 +3615,7 @@ void TForm::arrange_form() // TString bspc; bspc.fill('\b',str_pos.len()); // Questi servono per tornare indietro... 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()); #else lpt = fopen(device,"w"); diff --git a/include/golem.cpp b/include/golem.cpp index 91a4c79d3..4345a6148 100755 --- a/include/golem.cpp +++ b/include/golem.cpp @@ -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