From 0acee6c0e8486e92c0e28a23f87e382b557f4fd4 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 28 Apr 2004 20:54:21 +0000 Subject: [PATCH] Modifiche dalla versione Linux sulla 2.1 git-svn-id: svn://10.65.10.50/trunk@12022 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/array.h | 2 +- include/controls.cpp | 3 +++ include/msksheet.cpp | 3 +++ include/sheet.cpp | 3 +++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/array.h b/include/array.h index ada4a0e5c..92b715704 100755 --- a/include/array.h +++ b/include/array.h @@ -214,7 +214,7 @@ inline TObject& TArray::operator[] (int index) const #define FOR_EACH_ARRAY_ITEM_BACK(__arr, __r, __obj) \ TObject* __obj; \ for (int __r = __arr.last(); \ - __obj = __arr.objptr(__r); \ + (__obj = __arr.objptr(__r)); \ __r = __arr.pred(__r)) diff --git a/include/controls.cpp b/include/controls.cpp index b99fdf4f7..885d4d098 100755 --- a/include/controls.cpp +++ b/include/controls.cpp @@ -2153,6 +2153,9 @@ void TDropDownList::create() ld->no_vert_lines = TRUE; ld->resize_with_window = TRUE; ld->single_select = TRUE; +#ifdef LINUX + ld->scroll_on_thumb_track = TRUE; +#endif // compute size in pixel of field (with button enclosed) RCT r; xi_get_rect(_obj, (XinRect *) &r); diff --git a/include/msksheet.cpp b/include/msksheet.cpp index 6319a2a0c..66213b13d 100755 --- a/include/msksheet.cpp +++ b/include/msksheet.cpp @@ -514,6 +514,9 @@ TSpreadsheet::TSpreadsheet( l->active_back_color = FOCUS_BACK_COLOR; l->white_space_color = MASK_DARK_COLOR; l->rule_color = MASK_DARK_COLOR; +#ifdef LINUX + l->scroll_on_thumb_track = TRUE; +#endif // Definizione della prima colonna (numero di riga) word attr = XI_ATR_RJUST; diff --git a/include/sheet.cpp b/include/sheet.cpp index b7e2633b5..a112a8f7e 100755 --- a/include/sheet.cpp +++ b/include/sheet.cpp @@ -222,6 +222,9 @@ TSheet_control::TSheet_control( l->scroll_bar_button = TRUE; l->white_space_color = MASK_DARK_COLOR; l->rule_color = MASK_DARK_COLOR; +#ifdef LINUX + l->scroll_on_thumb_track = TRUE; +#endif // Definizione della prima colonna (numero di riga) const long attr = XI_ATR_VISIBLE | XI_ATR_RJUST | XI_ATR_SELECTABLE;