Mercurial > hg > xemacs-beta

comparison src/frame-msw.c @ 5438:8d29f1c4bb98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 21.5 trunk.
author Mats Lidell <matsl@xemacs.org>
date Fri, 26 Nov 2010 06:43:36 +0100
parents 308d34e9f07d c096d8051f89
children 56144c8593a8
comparison
equal deleted inserted replaced
5437:002cb5224e4f 5438:8d29f1c4bb98
1089 if (EQ (prop, Qwidth)) 1089 if (EQ (prop, Qwidth))
1090 { 1090 {
1091 maybe_error_if_job_active (f); 1091 maybe_error_if_job_active (f);
1092 if (!NILP (val)) 1092 if (!NILP (val))
1093 { 1093 {
1094 CHECK_NATNUM (val); 1094 #ifdef HAVE_BIGNUM
1095 FRAME_MSPRINTER_CHARWIDTH (f) = XINT (val); 1095 check_integer_range (val, Qzero, make_integer (INT_MAX));
1096 FRAME_MSPRINTER_CHARWIDTH (f) =
1097 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) :
1098 XINT (val);
1099 #else
1100 CHECK_NATNUM (val);
1101 FRAME_MSPRINTER_CHARWIDTH (f) = XINT (val);
1102 #endif
1096 } 1103 }
1097 } 1104 }
1098 if (EQ (prop, Qheight)) 1105 if (EQ (prop, Qheight))
1099 { 1106 {
1100 maybe_error_if_job_active (f); 1107 maybe_error_if_job_active (f);
1101 if (!NILP (val)) 1108 if (!NILP (val))
1102 { 1109 {
1110 #ifdef HAVE_BIGNUM
1111 check_integer_range (val, Qzero, make_integer (INT_MAX));
1112 FRAME_MSPRINTER_CHARHEIGHT (f) =
1113 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) :
1114 XINT (val);
1115 #else
1103 CHECK_NATNUM (val); 1116 CHECK_NATNUM (val);
1104 FRAME_MSPRINTER_CHARHEIGHT (f) = XINT (val); 1117 FRAME_MSPRINTER_CHARHEIGHT (f) = XINT (val);
1118 #endif
1105 } 1119 }
1106 } 1120 }
1107 else if (EQ (prop, Qleft_margin)) 1121 else if (EQ (prop, Qleft_margin))
1108 { 1122 {
1109 maybe_error_if_job_active (f); 1123 maybe_error_if_job_active (f);
1124 #ifdef HAVE_BIGNUM
1125 check_integer_range (val, Qzero, make_integer (INT_MAX));
1126 FRAME_MSPRINTER_LEFT_MARGIN (f) =
1127 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) :
1128 XINT (val);
1129 #else
1110 CHECK_NATNUM (val); 1130 CHECK_NATNUM (val);
1111 FRAME_MSPRINTER_LEFT_MARGIN (f) = XINT (val); 1131 FRAME_MSPRINTER_LEFT_MARGIN (f) = XINT (val);
1132 #endif
1112 } 1133 }
1113 else if (EQ (prop, Qtop_margin)) 1134 else if (EQ (prop, Qtop_margin))
1114 { 1135 {
1115 maybe_error_if_job_active (f); 1136 maybe_error_if_job_active (f);
1137 #ifdef HAVE_BIGNUM
1138 check_integer_range (val, Qzero, make_integer (INT_MAX));
1139 FRAME_MSPRINTER_TOP_MARGIN (f) =
1140 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) :
1141 XINT (val);
1142 #else
1116 CHECK_NATNUM (val); 1143 CHECK_NATNUM (val);
1117 FRAME_MSPRINTER_TOP_MARGIN (f) = XINT (val); 1144 FRAME_MSPRINTER_TOP_MARGIN (f) = XINT (val);
1145 #endif
1118 } 1146 }
1119 else if (EQ (prop, Qright_margin)) 1147 else if (EQ (prop, Qright_margin))
1120 { 1148 {
1121 maybe_error_if_job_active (f); 1149 maybe_error_if_job_active (f);
1150 #ifdef HAVE_BIGNUM
1151 check_integer_range (val, Qzero, make_integer (INT_MAX));
1152 FRAME_MSPRINTER_RIGHT_MARGIN (f) =
1153 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) :
1154 XINT (val);
1155 #else
1122 CHECK_NATNUM (val); 1156 CHECK_NATNUM (val);
1123 FRAME_MSPRINTER_RIGHT_MARGIN (f) = XINT (val); 1157 FRAME_MSPRINTER_RIGHT_MARGIN (f) = XINT (val);
1158 #endif
1124 } 1159 }
1125 else if (EQ (prop, Qbottom_margin)) 1160 else if (EQ (prop, Qbottom_margin))
1126 { 1161 {
1127 maybe_error_if_job_active (f); 1162 maybe_error_if_job_active (f);
1163 #ifdef HAVE_BIGNUM
1164 check_integer_range (val, Qzero, make_integer (INT_MAX));
1165 FRAME_MSPRINTER_BOTTOM_MARGIN (f) =
1166 BIGNUMP (val) ? bignum_to_int (XBIGNUM_DATA (val)) :
1167 XINT (val);
1168 #else
1128 CHECK_NATNUM (val); 1169 CHECK_NATNUM (val);
1129 FRAME_MSPRINTER_BOTTOM_MARGIN (f) = XINT (val); 1170 FRAME_MSPRINTER_BOTTOM_MARGIN (f) = XINT (val);
1171 #endif
1130 } 1172 }
1131 } 1173 }
1132 } 1174 }
1133 } 1175 }
1134 1176