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

Centrato meglioi il testo dei bottoni

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@567 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1994-11-08 12:48:41 +00:00
parent 02a6029dbe
commit 4ece2fba16
6 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/bagn004.h
View File

@ -1,11 +1,6 @@
#ifndef __TFILEPR_H
#define __TFILEPR_H
#define F_DRIVE 100 #define F_DRIVE 100
#define F_FORMATO_DISCO 101 #define F_FORMATO_DISCO 101
#define F_FILE_DESTINAZIONE 102 #define F_FILE_DESTINAZIONE 102
#define F_FORMATTA 103 #define F_FORMATTA 103
#define F_LABEL 104 #define F_LABEL 104
#endif // __TFILEPR_H

7
include/bagn004.uml
View File

@ -1,9 +1,4 @@
#include <bagn004.h>
//
// tfilepr.uml
//
#include <tfilepr.h>
PAGE "Stampa su disco" -1 -1 55 13 PAGE "Stampa su disco" -1 -1 55 13

17
include/controls.cpp
View File

@ -506,16 +506,14 @@ TPush_button::TPush_button(short left, short top, short right, short bottom,
capt, parent, flags, app_data, id), capt, parent, flags, app_data, id),
_picup(0L), _picdn(0L) _picup(0L), _picdn(0L)
{ {
const int height = bottom-top;
switch(id) switch(id)
{ {
case DLG_OK: case DLG_OK:
if (height > ROWY && strcmp("Conferma", caption()) == 0) if (strcmp("Conferma", caption()) == 0)
capt = format("#%d", BMP_OK); capt = format("#%d", BMP_OK);
break; break;
case DLG_CANCEL: case DLG_CANCEL:
if (height > ROWY && strcmp("Annulla", caption()) == 0) if (strcmp("Annulla", caption()) == 0)
capt = format("#%d", BMP_CANCEL); capt = format("#%d", BMP_CANCEL);
break; break;
case DLG_QUIT: case DLG_QUIT:
@ -528,7 +526,7 @@ TPush_button::TPush_button(short left, short top, short right, short bottom,
capt = format("#%d#%d", BMP_DELREC, BMP_DELRECDN); capt = format("#%d#%d", BMP_DELREC, BMP_DELRECDN);
break; break;
case DLG_NEWREC: case DLG_NEWREC:
if (height > ROWY && strcmp("Nuovo", caption()) == 0) // Puo' essere Gestione if (strcmp("Nuovo", caption()) == 0) // Puo' essere Gestione
capt = format("#%d#%d", BMP_NEWREC, BMP_NEWRECDN); capt = format("#%d#%d", BMP_NEWREC, BMP_NEWRECDN);
break; break;
case DLG_FIRSTREC: case DLG_FIRSTREC:
@ -571,6 +569,9 @@ TPush_button::TPush_button(short left, short top, short right, short bottom,
break; break;
} }
const int height = bottom-top;
const int width = right-left;
if (*capt == '#') if (*capt == '#')
{ {
int pid = atoi(capt+1); int pid = atoi(capt+1);
@ -584,7 +585,7 @@ TPush_button::TPush_button(short left, short top, short right, short bottom,
RCT r; RCT r;
cpb_get_picture_size(_picup, &r); cpb_get_picture_size(_picup, &r);
_dx = byte((right-left-r.right+1) >> 1); _dx = byte((width-r.right+1) >> 1);
_dy = byte((height-r.bottom) >> 1); _dy = byte((height-r.bottom) >> 1);
_accel = -1; _accel = -1;
} }
@ -595,8 +596,8 @@ TPush_button::TPush_button(short left, short top, short right, short bottom,
if (_accel > 0) if (_accel > 0)
_accel *= CHARX; _accel *= CHARX;
_dx = (right-left-strlen(caption())*CHARX) >> 1; _dx = (width - win_get_text_width(win(), (char*)caption(), -1)) >> 1;
_dy = (byte)CHARY; _dy = (byte)(height-4+BASEY)>>1;
} }
} }

10
include/mask.cpp
View File

@ -480,11 +480,17 @@ void TMask::get_mask_fields()
{ {
TMask_field& f = fld(i); TMask_field& f = fld(i);
if (f.class_id() != CLASS_FIELD) const int classe = f.class_id();
if (classe != CLASS_FIELD && classe != CLASS_BUTTON_FIELD && classe != CLASS_SHEET_FIELD)
{ {
window_data = f.get_window_data(); window_data = f.get_window_data();
if (f.dirty() == TRUE) if (f.dirty() == TRUE)
f.set_dirty(window_data != f.get_field_data()); {
const char* fd = f.get_field_data();
CHECK(fd, "NULL pointer comparison");
if (window_data != fd)
f.set_dirty(window_data != fd);
}
f.set_field_data(window_data); f.set_field_data(window_data);
} }
} }

2
include/prassi.ver
View File

@ -1 +1 @@
#define VERSION 1.13 #define VERSION 1.14

8
include/xvtility.cpp
View File

@ -617,9 +617,11 @@ WINDOW xvt_create_window(WIN_TYPE wt,
SetClassWord(hwnd, GCW_STYLE, style); SetClassWord(hwnd, GCW_STYLE, style);
to_set = FALSE; to_set = FALSE;
} }
long style = GetWindowLong(hwnd, GWL_STYLE); /*
style &= ~WS_CLIPCHILDREN; long style = GetWindowLong(hwnd, GWL_STYLE);
SetWindowLong(hwnd, GWL_STYLE, style); style &= ~WS_CLIPCHILDREN;
SetWindowLong(hwnd, GWL_STYLE, style);
*/
#endif #endif
return win; return win;