diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Browser_.cxx | 4 | ||||
| -rw-r--r-- | src/Fl_Tile.cxx | 6 | ||||
| -rw-r--r-- | src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx | 4 | ||||
| -rw-r--r-- | src/makedepend | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx index b05772aea..56b751415 100644 --- a/src/Fl_Browser_.cxx +++ b/src/Fl_Browser_.cxx @@ -953,9 +953,9 @@ J1: */ Fl_Browser_::Fl_Browser_(int X, int Y, int W, int H, const char* L) : Fl_Group(X, Y, W, H, L), + linespacing_(0), scrollbar(0, 0, 0, 0, 0), // they will be resized by draw() - hscrollbar(0, 0, 0, 0, 0), - linespacing_(0) + hscrollbar(0, 0, 0, 0, 0) { box(FL_NO_BOX); align(FL_ALIGN_BOTTOM); diff --git a/src/Fl_Tile.cxx b/src/Fl_Tile.cxx index e1e2d85cc..c37f2da89 100644 --- a/src/Fl_Tile.cxx +++ b/src/Fl_Tile.cxx @@ -56,7 +56,7 @@ In this mode, the child that is marked resizable() will behave as it would in a regular Fl_Group widget. When dragging edges or intersections with the mouse, Fl_Tile will ensure that - none of the children shrinks to a size that is smaller than requested. + none of the children shrinks to a size that is smaller than requested. When resizing the Fl_Tile group, size ranges are not enforced by the tile. Instead, the size range of the enclosing window should be limited to a valid range. @@ -155,7 +155,7 @@ static Fl_Cursor Fl_Tile_cursors[4] = { static int fl_min(int a, int b) { return a<b ? a : b; } static int fl_max(int a, int b) { return a>b ? a : b; } -/** +/** Request for children to change their layout. drag_intersection requests that all children with the left edge at old_l to @@ -695,7 +695,7 @@ int Fl_Tile::handle(int event) { // if (damage()) return 1; // don't fall behind case FL_RELEASE: { if (!sdrag) break; - Fl_Widget* r = resizable(); + Fl_Widget* r = resizable(); if (size_range_ || !r) r = this; int newx; if (sdrag&DRAGH) { diff --git a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx index 1de6822e1..cda328c17 100644 --- a/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx +++ b/src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx @@ -910,7 +910,7 @@ void Fl_Cairo_Graphics_Driver::uncache(Fl_RGB_Image *img, fl_uintptr_t &id_, fl_ } -void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Bitmap *bm,int XP, int YP, int WP, int HP, +void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Bitmap *bm,int XP, int YP, int WP, int HP, int cx, int cy) { cairo_pattern_t *pat = NULL; float s = wld_scale * scale(); @@ -999,7 +999,7 @@ void Fl_Cairo_Graphics_Driver::cache(Fl_Bitmap *bm) { } -void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP, +void Fl_Cairo_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm,int XP, int YP, int WP, int HP, int cx, int cy) { cairo_pattern_t *pat = NULL; float s = wld_scale * scale(); diff --git a/src/makedepend b/src/makedepend index 0199f9d96..a7cf18d19 100644 --- a/src/makedepend +++ b/src/makedepend @@ -2439,6 +2439,7 @@ Fl_Input.o: ../FL/Fl_Image.H Fl_Input.o: ../FL/Fl_Input.H Fl_Input.o: ../FL/Fl_Input_.H Fl_Input.o: ../FL/Fl_Int_Input.H +Fl_Input.o: ../FL/Fl_Menu_Item.H Fl_Input.o: ../FL/Fl_Multiline_Input.H Fl_Input.o: ../FL/Fl_Multiline_Output.H Fl_Input.o: ../FL/Fl_Output.H @@ -3929,6 +3930,9 @@ Fl_Text_Display.o: ../FL/Fl_Export.H Fl_Text_Display.o: ../FL/Fl_Graphics_Driver.H Fl_Text_Display.o: ../FL/Fl_Group.H Fl_Text_Display.o: ../FL/Fl_Image.H +Fl_Text_Display.o: ../FL/Fl_Input.H +Fl_Text_Display.o: ../FL/Fl_Input_.H +Fl_Text_Display.o: ../FL/Fl_Menu_Item.H Fl_Text_Display.o: ../FL/Fl_Pixmap.H Fl_Text_Display.o: ../FL/Fl_Plugin.H Fl_Text_Display.o: ../FL/Fl_Preferences.H |