diff options
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/StyleParse.cxx | 2 | ||||
| -rw-r--r-- | fluid/alignment_panel.fl | 4 | ||||
| -rw-r--r-- | fluid/factory.cxx | 21 |
3 files changed, 11 insertions, 16 deletions
diff --git a/fluid/StyleParse.cxx b/fluid/StyleParse.cxx index abbb33fcf..5d0dd5e5d 100644 --- a/fluid/StyleParse.cxx +++ b/fluid/StyleParse.cxx @@ -206,7 +206,7 @@ void StyleParse::buffer_keyword() { char *key = keyword; char *kend = key + sizeof(keyword) - 1; // end of buffer for ( const char *s=tbuff; - (islower(*s) || *s=='_') && (key < kend); + (islower(*s) || *s=='_') && (key < kend); *key++ = *s++ ) { } *key = 0; // terminate } diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl index 588b27c9a..cb9b1112f 100644 --- a/fluid/alignment_panel.fl +++ b/fluid/alignment_panel.fl @@ -764,7 +764,7 @@ Default is on.} xywh {245 366 100 25} down_box BORDER_BOX } } } - + Fl_Group {} { label {Scaling Factor Options} open xywh {10 421 380 66} box GTK_DOWN_BOX labelfont 2 align 21 @@ -797,7 +797,7 @@ Default is on.} xywh {245 442 100 25} down_box BORDER_BOX } } } - + Fl_Choice wUserOrSystem { callback {refreshUI();} open tooltip {Change settings for the current user, or default values for all users of this computer. Individual users can override system options, if they set their options to specific values (not 'default').} xywh {10 496 141 25} down_box BORDER_BOX diff --git a/fluid/factory.cxx b/fluid/factory.cxx index 23f903498..72ad7737c 100644 --- a/fluid/factory.cxx +++ b/fluid/factory.cxx @@ -188,8 +188,7 @@ public: w -= Fl::box_dw(o->box()); int ww = (int)fl_width('m'); w = ((w + ww - 1) / ww) * ww + Fl::box_dw(o->box()); - h = ((h + fl_height() - 1) / fl_height()) * fl_height() + - Fl::box_dh(o->box()); + h = ((h + fl_height() - 1) / fl_height()) * fl_height() + Fl::box_dh(o->box()); if (h < 30) h = 30; if (w < 50) w = 50; } @@ -236,8 +235,7 @@ public: w -= Fl::box_dw(o->box()) - fl_height(); int ww = (int)fl_width('m'); w = ((w + ww - 1) / ww) * ww + Fl::box_dw(o->box()); - h = ((h + fl_height() - 1) / fl_height()) * fl_height() + - Fl::box_dh(o->box()); + h = ((h + fl_height() - 1) / fl_height()) * fl_height() + Fl::box_dh(o->box()); if (h < 30) h = 30; if (w < 50) w = 50; } @@ -311,8 +309,7 @@ public: w -= Fl::box_dw(o->box()) + fl_height(); int ww = (int)fl_width('m'); w = ((w + ww - 1) / ww) * ww + Fl::box_dw(o->box()); - h = ((h + fl_height() - 1) / fl_height()) * fl_height() + - Fl::box_dh(o->box()); + h = ((h + fl_height() - 1) / fl_height()) * fl_height() + Fl::box_dh(o->box()); if (h < 30) h = 30; if (w < 50) w = 50; } @@ -403,7 +400,8 @@ public: virtual const char *alt_type_name() {return "fltk::Spinner";} int is_spinner() const { return 1; } Fl_Widget *widget(int x,int y,int w,int h) { - return new Fl_Spinner(x,y,w,h,"spinner:");} + return new Fl_Spinner(x,y,w,h,"spinner:"); + } Fl_Widget_Type *_make() {return new Fl_Spinner_Type();} }; static Fl_Spinner_Type Fl_Spinner_type; @@ -532,8 +530,7 @@ public: w -= Fl::box_dw(o->box()); int ww = (int)fl_width('m'); w = ((w + ww - 1) / ww) * ww + Fl::box_dw(o->box()); - h = ((h + fl_height() - 1) / fl_height()) * fl_height() + - Fl::box_dh(o->box()); + h = ((h + fl_height() - 1) / fl_height()) * fl_height() + Fl::box_dh(o->box()); if (h < 30) h = 30; if (w < 50) w = 50; } @@ -574,8 +571,7 @@ public: w -= Fl::box_dw(o->box()); int ww = (int)fl_width('m'); w = ((w + ww - 1) / ww) * ww + Fl::box_dw(o->box()); - h = ((h + fl_height() - 1) / fl_height()) * fl_height() + - Fl::box_dh(o->box()); + h = ((h + fl_height() - 1) / fl_height()) * fl_height() + Fl::box_dh(o->box()); if (h < 30) h = 30; if (w < 50) w = 50; } @@ -654,8 +650,7 @@ public: w -= Fl::box_dw(o->box()); int ww = (int)fl_width('m'); w = ((w + ww - 1) / ww) * ww + Fl::box_dw(o->box()); - h = ((h + fl_height() - 1) / fl_height()) * fl_height() + - Fl::box_dh(o->box()); + h = ((h + fl_height() - 1) / fl_height()) * fl_height() + Fl::box_dh(o->box()); if (h < 30) h = 30; if (w < 50) w = 50; } |