From 76a2c95f0715845432dab89984bb28a5dbfa3ebc Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 21 Dec 2023 14:03:04 +0100 Subject: [PATCH] Fix a typo, trailing whitespace, and dependencies --- FL/Fl_Image_Surface.H | 2 +- documentation/src/wayland.dox | 2 +- fluid/alignment_panel.cxx | 8 ++++---- fluid/alignment_panel.fl | 8 ++++---- fluid/makedepend | 13 +++++++++---- fluid/widget_panel.cxx | 6 +++--- fluid/widget_panel.fl | 6 +++--- lib/README.txt | 2 +- src/Fl_Image_Surface.cxx | 10 +++++----- src/Fl_Shared_Image.cxx | 4 ++-- src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx | 12 ++++++------ .../Quartz/Fl_Quartz_Image_Surface_Driver.cxx | 4 ++-- .../Wayland/Fl_Wayland_Image_Surface_Driver.cxx | 2 +- src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx | 2 +- src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx | 6 +++--- src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx | 2 +- src/makedepend | 8 ++------ test/device.cxx | 14 +++++++------- 18 files changed, 56 insertions(+), 55 deletions(-) diff --git a/FL/Fl_Image_Surface.H b/FL/Fl_Image_Surface.H index 20a215e3c..c9f0b2226 100644 --- a/FL/Fl_Image_Surface.H +++ b/FL/Fl_Image_Surface.H @@ -108,7 +108,7 @@ protected: int external_offscreen; Fl_Image_Surface_Driver(int w, int h, int /*high_res*/, Fl_Offscreen off) : Fl_Widget_Surface(NULL), width(w), height(h), offscreen(off) {external_offscreen = (off != 0);} virtual ~Fl_Image_Surface_Driver() {} - static void copy_with_mask(Fl_RGB_Image* mask, uchar *dib_dst, uchar *dib_src, + static void copy_with_mask(Fl_RGB_Image* mask, uchar *dib_dst, uchar *dib_src, int line_size, bool bottom_to_top); static Fl_RGB_Image *RGB3_to_RGB1(const Fl_RGB_Image *rgb3, int W, int H); void set_current() FL_OVERRIDE = 0; diff --git a/documentation/src/wayland.dox b/documentation/src/wayland.dox index 45f779827..5a16311d6 100644 --- a/documentation/src/wayland.dox +++ b/documentation/src/wayland.dox @@ -536,7 +536,7 @@ CAIRO_FORMAT_ARGB32. FLTK calls function \c Fl_Wayland_Window_Driver::make_current() before drawing to any Fl_Window. Member \c buffer of this Fl_Window's struct wld_window (see \ref wld_window) is NULL when the window has just been created or resized. In that case, FLTK calls -\c Fl_Wayland_Graphics_Driver::create_wld_buffer() which +\c Fl_Wayland_Graphics_Driver::create_wld_buffer() which returns a pointer to a struct wld_buffer containing - a Wayland buffer, member \c wl_buffer; - a Cairo image surface, created by a call to \c Fl_Wayland_Graphics_Driver::cairo_init(). diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx index 50793499e..90efd0216 100644 --- a/fluid/alignment_panel.cxx +++ b/fluid/alignment_panel.cxx @@ -32,8 +32,8 @@ static void cb_Comments(Fl_Choice* o, void* v) { o->value(*font); } else { *font = (int)o->value(); - widget_browser->redraw(); - widget_browser->save_prefs(); + widget_browser->redraw(); + widget_browser->save_prefs(); } } @@ -47,7 +47,7 @@ static void cb_Color_Chip(Fl_Button* o, void* v) { *color = d; o->color(d); widget_browser->redraw(); - widget_browser->save_prefs(); + widget_browser->save_prefs(); } } @@ -58,7 +58,7 @@ static void cb_Color_Choice(Fl_Menu_Button* o, void* v) { *color = d; o->parent()->do_callback(o->parent(), LOAD); widget_browser->redraw(); - widget_browser->save_prefs(); + widget_browser->save_prefs(); } } diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl index d8edbeb0a..b8de00efb 100644 --- a/fluid/alignment_panel.fl +++ b/fluid/alignment_panel.fl @@ -117,8 +117,8 @@ if (v == LOAD) { o->value(*font); } else { *font = (int)o->value(); - widget_browser->redraw(); - widget_browser->save_prefs(); + widget_browser->redraw(); + widget_browser->save_prefs(); }} {} } @@ -133,7 +133,7 @@ if (v == LOAD) { *color = d; o->color(d); widget_browser->redraw(); - widget_browser->save_prefs(); + widget_browser->save_prefs(); }} {} } @@ -145,7 +145,7 @@ Function {cb_Color_Choice(Fl_Menu_Button* o, void* v)} {open private return_type *color = d; o->parent()->do_callback(o->parent(), LOAD); widget_browser->redraw(); - widget_browser->save_prefs(); + widget_browser->save_prefs(); }} {} } diff --git a/fluid/makedepend b/fluid/makedepend index 88d7b722b..831a6ef91 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -74,6 +74,7 @@ alignment_panel.o: ../FL/Fl_Scheme.H alignment_panel.o: ../FL/Fl_Scheme_Choice.H alignment_panel.o: ../FL/Fl_Scrollbar.H alignment_panel.o: ../FL/Fl_Shortcut_Button.H +alignment_panel.o: ../FL/fl_show_colormap.H alignment_panel.o: ../FL/Fl_Slider.H alignment_panel.o: ../FL/Fl_Spinner.H alignment_panel.o: ../FL/fl_string_functions.h @@ -258,6 +259,7 @@ custom_widgets.o: ../FL/Fl_Rect.H custom_widgets.o: ../FL/Fl_Return_Button.H custom_widgets.o: ../FL/Fl_RGB_Image.H custom_widgets.o: ../FL/Fl_Scrollbar.H +custom_widgets.o: ../FL/Fl_Shared_Image.H custom_widgets.o: ../FL/Fl_Shortcut_Button.H custom_widgets.o: ../FL/Fl_Slider.H custom_widgets.o: ../FL/fl_string_functions.h @@ -288,7 +290,6 @@ custom_widgets.o: Fl_Group_Type.h custom_widgets.o: Fl_Type.h custom_widgets.o: Fl_Widget_Type.h custom_widgets.o: Fl_Window_Type.h -custom_widgets.o: pixmaps.h custom_widgets.o: StyleParse.h custom_widgets.o: widget_browser.h custom_widgets.o: widget_panel.h @@ -448,6 +449,7 @@ Fd_Snap_Action.o: ../FL/Fl_Scheme.H Fd_Snap_Action.o: ../FL/Fl_Scheme_Choice.H Fd_Snap_Action.o: ../FL/Fl_Scrollbar.H Fd_Snap_Action.o: ../FL/Fl_Shortcut_Button.H +Fd_Snap_Action.o: ../FL/fl_show_colormap.H Fd_Snap_Action.o: ../FL/Fl_Slider.H Fd_Snap_Action.o: ../FL/Fl_Spinner.H Fd_Snap_Action.o: ../FL/fl_string_functions.h @@ -530,6 +532,7 @@ file.o: ../FL/Fl_Scheme_Choice.H file.o: ../FL/Fl_Scrollbar.H file.o: ../FL/Fl_Shared_Image.H file.o: ../FL/Fl_Shortcut_Button.H +file.o: ../FL/fl_show_colormap.H file.o: ../FL/Fl_Slider.H file.o: ../FL/Fl_Spinner.H file.o: ../FL/fl_string_functions.h @@ -623,6 +626,7 @@ fluid.o: ../FL/Fl_Scheme_Choice.H fluid.o: ../FL/Fl_Scrollbar.H fluid.o: ../FL/Fl_Shared_Image.H fluid.o: ../FL/Fl_Shortcut_Button.H +fluid.o: ../FL/fl_show_colormap.H fluid.o: ../FL/Fl_Slider.H fluid.o: ../FL/Fl_Spinner.H fluid.o: ../FL/fl_string_functions.h @@ -1188,7 +1192,6 @@ Fl_Widget_Type.o: Fl_Type.h Fl_Widget_Type.o: Fl_Widget_Type.h Fl_Widget_Type.o: Fl_Window_Type.h Fl_Widget_Type.o: mergeback.h -Fl_Widget_Type.o: pixmaps.h Fl_Widget_Type.o: shell_command.h Fl_Widget_Type.o: StyleParse.h Fl_Widget_Type.o: undo.h @@ -1248,6 +1251,7 @@ Fl_Window_Type.o: ../FL/Fl_Scheme_Choice.H Fl_Window_Type.o: ../FL/Fl_Scrollbar.H Fl_Window_Type.o: ../FL/Fl_Shared_Image.H Fl_Window_Type.o: ../FL/Fl_Shortcut_Button.H +Fl_Window_Type.o: ../FL/fl_show_colormap.H Fl_Window_Type.o: ../FL/Fl_Slider.H Fl_Window_Type.o: ../FL/Fl_Spinner.H Fl_Window_Type.o: ../FL/fl_string_functions.h @@ -1284,7 +1288,6 @@ Fl_Window_Type.o: Fl_Group_Type.h Fl_Window_Type.o: Fl_Type.h Fl_Window_Type.o: Fl_Widget_Type.h Fl_Window_Type.o: Fl_Window_Type.h -Fl_Window_Type.o: pixmaps.h Fl_Window_Type.o: shell_command.h Fl_Window_Type.o: StyleParse.h Fl_Window_Type.o: undo.h @@ -1326,6 +1329,7 @@ function_panel.o: ../FL/Fl_Slider.H function_panel.o: ../FL/Fl_Text_Buffer.H function_panel.o: ../FL/Fl_Text_Display.H function_panel.o: ../FL/Fl_Text_Editor.H +function_panel.o: ../FL/Fl_Tile.H function_panel.o: ../FL/fl_types.h function_panel.o: ../FL/fl_utf8.h function_panel.o: ../FL/Fl_Valuator.H @@ -1478,6 +1482,7 @@ shell_command.o: ../FL/Fl_Scheme.H shell_command.o: ../FL/Fl_Scheme_Choice.H shell_command.o: ../FL/Fl_Scrollbar.H shell_command.o: ../FL/Fl_Shortcut_Button.H +shell_command.o: ../FL/fl_show_colormap.H shell_command.o: ../FL/Fl_Slider.H shell_command.o: ../FL/Fl_Spinner.H shell_command.o: ../FL/fl_string_functions.h @@ -1706,6 +1711,7 @@ widget_panel.o: ../FL/Fl_Rect.H widget_panel.o: ../FL/Fl_Return_Button.H widget_panel.o: ../FL/Fl_RGB_Image.H widget_panel.o: ../FL/Fl_Scrollbar.H +widget_panel.o: ../FL/Fl_Shared_Image.H widget_panel.o: ../FL/Fl_Shortcut_Button.H widget_panel.o: ../FL/Fl_Slider.H widget_panel.o: ../FL/Fl_Tabs.H @@ -1729,7 +1735,6 @@ widget_panel.o: Fl_Grid_Type.h widget_panel.o: Fl_Group_Type.h widget_panel.o: Fl_Type.h widget_panel.o: Fl_Widget_Type.h -widget_panel.o: pixmaps.h widget_panel.o: StyleParse.h widget_panel.o: undo.h widget_panel.o: widget_panel.h diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx index 967e6b13f..758ad96b1 100644 --- a/fluid/widget_panel.cxx +++ b/fluid/widget_panel.cxx @@ -390,8 +390,8 @@ void run_image_panel() { make_image_panel(); image_panel_window->do_callback(image_panel_window, LOAD); - - Fl::pushed(0); + + Fl::pushed(0); Fl_Window *g = Fl::grab(); if (g) Fl::grab(0); image_panel_window->show(); @@ -399,7 +399,7 @@ void run_image_panel() { Fl::wait(); if (g) Fl::grab(g); - + Fl_Shared_Image *img = (Fl_Shared_Image*)image_panel_data->user_data(); if (img) { img->release(); diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index e9733e4b6..894cf025f 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -313,8 +313,8 @@ Function {run_image_panel()} {open return_type void make_image_panel(); image_panel_window->do_callback(image_panel_window, LOAD); - -Fl::pushed(0); + +Fl::pushed(0); Fl_Window *g = Fl::grab(); if (g) Fl::grab(0); image_panel_window->show(); @@ -322,7 +322,7 @@ while (image_panel_window->shown()) Fl::wait(); if (g) Fl::grab(g); - + Fl_Shared_Image *img = (Fl_Shared_Image*)image_panel_data->user_data(); if (img) { img->release(); diff --git a/lib/README.txt b/lib/README.txt index 24938befd..e93308b1e 100644 --- a/lib/README.txt +++ b/lib/README.txt @@ -12,7 +12,7 @@ in the 'lib' subdirectory of the build tree. We strongly recommend to build with CMake outside the source tree ("out-of-tree") as described in README.CMake.txt in the root folder of the FLTK distribution. -If FLTK is built out-of-tree as recommende this folder will not be touched. +If FLTK is built out-of-tree as recommended this folder will not be touched. Building FLTK with configure + make diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx index 11fb12048..38cda73d9 100644 --- a/src/Fl_Image_Surface.cxx +++ b/src/Fl_Image_Surface.cxx @@ -96,7 +96,7 @@ void Fl_Image_Surface_Driver::copy_with_mask(Fl_RGB_Image* mask, uchar *dib_dst, bool bottom_to_top) { int w = mask->data_w(), h = mask->data_h(); for (int i = 0; i < h; i++) { - const uchar* alpha = (const uchar*)mask->array + + const uchar* alpha = (const uchar*)mask->array + (bottom_to_top ? (h-i-1) : i) * w; uchar *src = dib_src + i * line_size; uchar *dst = dib_dst + i * line_size; @@ -145,7 +145,7 @@ Fl_RGB_Image *Fl_Image_Surface_Driver::RGB3_to_RGB1(const Fl_RGB_Image *rgb3, in /** Returns a depth-3 image made of all drawings sent to the Fl_Image_Surface object. The returned object contains its own copy of the RGB data; the caller is responsible for deleting it. - + \see Fl_Image_Surface::mask(Fl_RGB_Image*) */ Fl_RGB_Image *Fl_Image_Surface::image() { @@ -212,19 +212,19 @@ void Fl_Image_Surface::rescale() { foreground and background pixels; mask pixels closer in color to white produce image pixels closer to the image surface pixel, those closer to black produce image pixels closer to what the image surface pixel was before the call to mask(). - + The mask is easily constructed using an Fl_Image_Surface object, drawing white areas on a black background there, and calling Fl_Image_Surface::image(). \param mask A depth-3 image determining the drawable areas of the image surface. The \p mask object is not used after return from this member function. - \note + \note - The image surface must not be the current drawing surface when this function gets called. - The mask can have any size but is best when it has the size of the image surface. - It's possible to use several masks in succession on the same image surface provided member function Fl_Image_Surface::image() is called between successive calls to Fl_Image_Surface::mask(const Fl_RGB_Image*). - + Example of procedure to construct a masked image: \code int W = …, H = …; // width and height of the image under construction diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index de1b2cefd..62c06079a 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -72,11 +72,11 @@ int Fl_Shared_Image::num_images() { Binary search in a sorted array works only if we search for the same parameters that were also used for sorting. No special cases are possible here. - + Fl_Shared_Image::find() requires a search for an element with a matching name and the original_ flags set. This is not implemented via binary search, but by a simple run of the array inside Fl_Shared_Image::find(). - + \returns Whether the images match or their relative sort order (see text). \retval 0 the images match \retval <0 Image \p i0 is \e less than image \p i1 diff --git a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx index 7e1c2f24e..a14524ee2 100644 --- a/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx +++ b/src/drivers/GDI/Fl_GDI_Image_Surface_Driver.cxx @@ -96,7 +96,7 @@ Fl_RGB_Image* Fl_GDI_Image_Surface_Driver::image() bmi.bmiHeader.biBitCount = 24; GetDIBits(gc, (HBITMAP)offscreen, 0, H, dib_src, &bmi, DIB_RGB_COLORS); - + // draw above the secondary offscreen the main offscreen masked by shape_data_->mask GdiFlush(); Fl_Image_Surface_Driver::copy_with_mask(shape_data_->mask, shape_data_->vBits, dib_src, ((3*W+3)/4) * 4, true); @@ -141,9 +141,9 @@ void Fl_GDI_Image_Surface_Driver::mask(const Fl_RGB_Image *mask) { GetDIBits(gc, (HBITMAP)offscreen, 0, 0, NULL, &bmi, DIB_RGB_COLORS); int W = bmi.bmiHeader.biWidth; int H = bmi.bmiHeader.biHeight; - + shape_data_->mask = Fl_Image_Surface_Driver::RGB3_to_RGB1(mask, W, H); - + // duplicate current offscreen content to new offscreen int line_size = ((3*W+3)/4) * 4; uchar *dib = new uchar[line_size * H]; // create temporary buffer to read DIB @@ -151,11 +151,11 @@ void Fl_GDI_Image_Surface_Driver::mask(const Fl_RGB_Image *mask) { bmi.bmiHeader.biHeight = H; bmi.bmiHeader.biCompression = BI_RGB; bmi.bmiHeader.biBitCount = 24; - + GetDIBits(gc, (HBITMAP)offscreen, 0, H, dib, &bmi, DIB_RGB_COLORS); - + HDC background_gc = CreateCompatibleDC(gc); - shape_data_->background = + shape_data_->background = CreateDIBSection(background_gc, &bmi, DIB_RGB_COLORS, (void**)&shape_data_->vBits, NULL, 0); if (!shape_data_->background) { diff --git a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx index fb522745a..00fc63150 100644 --- a/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx +++ b/src/drivers/Quartz/Fl_Quartz_Image_Surface_Driver.cxx @@ -65,7 +65,7 @@ Fl_Quartz_Image_Surface_Driver::~Fl_Quartz_Image_Surface_Driver() { } delete driver(); } - + void Fl_Quartz_Image_Surface_Driver::set_current() { Fl_Surface_Device::set_current(); @@ -155,7 +155,7 @@ void Fl_Quartz_Image_Surface_Driver::mask(const Fl_RGB_Image *img) { img = copy; using_copy = true; } - + int i, d = img->d(), w = img->data_w(), h = img->data_h(); // reverse top and bottom and convert to gray scale if img->d() == 3 and complement bits int bytes_per_row = (img->ld() ? img->ld() : w * d); diff --git a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx index f25fe025d..de72e175a 100644 --- a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx @@ -132,7 +132,7 @@ Fl_RGB_Image* Fl_Wayland_Image_Surface_Driver::image() { free(shape_data_); shape_data_ = NULL; } - + // Convert depth-4 image in draw_buffer to a depth-3 image while exchanging R and B colors struct Fl_Wayland_Graphics_Driver::draw_buffer *off_buf = Fl_Wayland_Graphics_Driver::offscreen_buffer(offscreen); diff --git a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx index eb6b6c396..6507b0b41 100644 --- a/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Screen_Driver.cxx @@ -275,7 +275,7 @@ static void pointer_button(void *data, (struct Fl_Wayland_Screen_Driver::seat*)data; if (gtk_shell_surface && state == WL_POINTER_BUTTON_STATE_PRESSED && button == BTN_MIDDLE) { - struct gtk_surface1 *gtk_surface = gtk_shell1_get_gtk_surface(gtk_shell, + struct gtk_surface1 *gtk_surface = gtk_shell1_get_gtk_surface(gtk_shell, gtk_shell_surface); gtk_surface1_titlebar_gesture(gtk_surface, serial, seat->wl_seat, GTK_SURFACE1_GESTURE_MIDDLE_CLICK); diff --git a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx index 000c522ac..985978c1f 100644 --- a/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx @@ -445,11 +445,11 @@ void Fl_X11_Gl_Window_Driver::swap_interval(int interval) { if (fl_glXSwapInterval.EXT) fl_glXSwapInterval.EXT(fl_display, fl_xid(pWindow), interval); break; - case 2: + case 2: if (fl_glXSwapInterval.MESA) fl_glXSwapInterval.MESA((unsigned int)interval); break; - case 3: + case 3: if (fl_glXSwapInterval.SGI) fl_glXSwapInterval.SGI(interval); break; @@ -468,7 +468,7 @@ int Fl_X11_Gl_Window_Driver::swap_interval() const { glXQueryDrawable(fl_display, fl_xid(pWindow), 0x20F1 /*GLX_SWAP_INTERVAL_EXT*/, &val); interval = (int)val; break; } - case 2: + case 2: if (fl_glXGetSwapIntervalMESA) interval = fl_glXGetSwapIntervalMESA(); break; diff --git a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx index 87e55b417..2660dcda7 100644 --- a/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Image_Surface_Driver.cxx @@ -137,7 +137,7 @@ Fl_RGB_Image* Fl_Xlib_Image_Surface_Driver::image() fl_window = shape_data_->background; // temporary change Fl_RGB_Image *img_background = Fl::screen_driver()->read_win_rectangle(0, 0, w, h, 0); fl_window = offscreen; - Fl_Image_Surface_Driver::copy_with_mask(shape_data_->mask, + Fl_Image_Surface_Driver::copy_with_mask(shape_data_->mask, (uchar*)img_background->array, (uchar*)img_main->array, 3 * shape_data_->mask->w(), false); diff --git a/src/makedepend b/src/makedepend index a7cf18d19..2aef1deff 100644 --- a/src/makedepend +++ b/src/makedepend @@ -2391,10 +2391,8 @@ fl_images_core.o: ../FL/fl_utf8.h fl_images_core.o: ../FL/Fl_Widget.H fl_images_core.o: ../FL/platform_types.h fl_images_core.o: flstring.h -Fl_Image_Reader.o: ../FL/fl_attr.h Fl_Image_Reader.o: ../FL/Fl_Export.H Fl_Image_Reader.o: ../FL/fl_string_functions.h -Fl_Image_Reader.o: ../FL/fl_types.h Fl_Image_Reader.o: ../FL/fl_utf8.h Fl_Image_Reader.o: Fl_Image_Reader.h Fl_Image_Surface.o: ../FL/Enumerations.H @@ -2637,14 +2635,12 @@ Fl_Menu_.o: ../FL/platform_types.h Fl_Menu_.o: flstring.h Fl_Menu_add.o: ../config.h Fl_Menu_add.o: ../FL/Fl.H -Fl_Menu_add.o: ../FL/fl_attr.h Fl_Menu_add.o: ../FL/fl_config.h Fl_Menu_add.o: ../FL/Fl_Export.H Fl_Menu_add.o: ../FL/Fl_Image.H Fl_Menu_add.o: ../FL/Fl_Menu_.H Fl_Menu_add.o: ../FL/Fl_Menu_Item.H Fl_Menu_add.o: ../FL/fl_string_functions.h -Fl_Menu_add.o: ../FL/fl_types.h Fl_Menu_add.o: ../FL/Fl_Widget.H Fl_Menu_add.o: ../FL/platform_types.h Fl_Menu_add.o: flstring.h @@ -3465,7 +3461,9 @@ Fl_Screen_Driver.o: ../FL/Fl_Valuator.H Fl_Screen_Driver.o: ../FL/Fl_Widget.H Fl_Screen_Driver.o: ../FL/Fl_Widget_Surface.H Fl_Screen_Driver.o: ../FL/Fl_Window.H +Fl_Screen_Driver.o: ../FL/platform.H Fl_Screen_Driver.o: ../FL/platform_types.h +Fl_Screen_Driver.o: ../FL/x11.H Fl_Screen_Driver.o: Fl_Screen_Driver.H Fl_Screen_Driver.o: Fl_Window_Driver.H Fl_Scroll.o: ../FL/Enumerations.H @@ -4458,14 +4456,12 @@ Fl_Wizard.o: ../FL/Fl_Window.H Fl_Wizard.o: ../FL/Fl_Wizard.H Fl_Wizard.o: ../FL/platform_types.h fl_write_png.o: ../config.h -fl_write_png.o: ../FL/fl_attr.h fl_write_png.o: ../FL/fl_config.h fl_write_png.o: ../FL/Fl_Export.H fl_write_png.o: ../FL/Fl_Image.H fl_write_png.o: ../FL/Fl_PNG_Image.H fl_write_png.o: ../FL/Fl_RGB_Image.H fl_write_png.o: ../FL/fl_string_functions.h -fl_write_png.o: ../FL/fl_types.h fl_write_png.o: ../FL/fl_utf8.h Fl_x.o: ../config.h Fl_x.o: ../FL/Enumerations.H diff --git a/test/device.cxx b/test/device.cxx index 3b8b80dcb..e039397b6 100644 --- a/test/device.cxx +++ b/test/device.cxx @@ -505,7 +505,7 @@ void copy(Fl_Widget *, void *data) { } return; } - + if (strcmp(operation, "Fl_Copy_Surface") == 0) { Fl_Copy_Surface *copy_surf; if (target->as_window() && !target->parent()) { @@ -522,7 +522,7 @@ void copy(Fl_Widget *, void *data) { delete copy_surf; Fl_Surface_Device::pop_current(); } - + if (strcmp(operation, "Fl_Printer") == 0 || strcmp(operation, "Fl_PostScript_File_Device") == 0) { Fl_Paged_Device *p; int err; @@ -549,7 +549,7 @@ void copy(Fl_Widget *, void *data) { } else if (err > 1 && err_message) {fl_alert("%s", err_message); delete[] err_message;} delete p; } - + if (strcmp(operation, "Fl_EPS_File_Surface") == 0) { Fl_Native_File_Chooser fnfc; fnfc.title("Save a .eps file"); @@ -575,7 +575,7 @@ void copy(Fl_Widget *, void *data) { } } } - + if (strcmp(operation, "Fl_SVG_File_Surface") == 0) { Fl_Native_File_Chooser fnfc; fnfc.title("Save a .svg file"); @@ -602,7 +602,7 @@ void copy(Fl_Widget *, void *data) { } } } - + if (strcmp(operation, "fl_capture_window()") == 0) { Fl_Window *win = target->as_window() ? target->as_window() : target->window(); int X = target->as_window() ? 0 : target->x(); @@ -618,7 +618,7 @@ void copy(Fl_Widget *, void *data) { g2->show(); } } - + if (strcmp(operation, "Fl_Image_Surface::mask()") == 0) { Fl_Image_Surface *surf = new Fl_Image_Surface(target->w(), target->h(), 1); Fl_Surface_Device::push_current(surf); @@ -653,7 +653,7 @@ void copy(Fl_Widget *, void *data) { win->end(); win->show(); } - + } class My_Button:public Fl_Button {