diff --git a/FL/Fl_Shared_Image.H b/FL/Fl_Shared_Image.H index acecebf838..fec770041a 100644 --- a/FL/Fl_Shared_Image.H +++ b/FL/Fl_Shared_Image.H @@ -127,7 +127,7 @@ public: #ifdef SHIM_DEBUG static void print_pool(); #endif - + /** Returns the filename of the shared image */ const char *name() { return name_; } diff --git a/fltk-options/makedepend b/fltk-options/makedepend index 77515f1bcc..8ff5d845c1 100644 --- a/fltk-options/makedepend +++ b/fltk-options/makedepend @@ -34,6 +34,7 @@ fltk-options.o: ../FL/Fl_RGB_Image.H fltk-options.o: ../FL/Fl_Scroll.H fltk-options.o: ../FL/Fl_Scrollbar.H fltk-options.o: ../FL/Fl_Slider.H +fltk-options.o: ../FL/fl_string_functions.h fltk-options.o: ../FL/Fl_Tooltip.H fltk-options.o: ../FL/fl_types.h fltk-options.o: ../FL/fl_utf8.h diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx index b61a01031b..6ab652e14d 100644 --- a/fluid/Fl_Menu_Type.cxx +++ b/fluid/Fl_Menu_Type.cxx @@ -493,7 +493,7 @@ void Fl_Menu_Item_Type::write_code1(Fd_Code_Writer& f) { f.indent(), g_project.i18n_gnu_function.c_str()); } else if (g_project.i18n_type==FD_I18N_POSIX) { f.write_c("%sml->labelb = catgets(%s,%s,i+%d,o->label());\n", - f.indent(), + f.indent(), g_project.i18n_pos_file.empty() ? "_catalog" : g_project.i18n_pos_file.c_str(), g_project.i18n_pos_set.c_str(), msgnum()); } diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index d223fba861..310792d0c4 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -3006,7 +3006,7 @@ void Fl_Widget_Type::write_code1(Fd_Code_Writer& f) { f.write_c(")"); break; case FD_I18N_POSIX : /* POSIX catgets */ - f.write_c("catgets(%s,%s,%d,", + f.write_c("catgets(%s,%s,%d,", g_project.i18n_pos_file.empty() ? "_catalog" : g_project.i18n_pos_file.c_str(), g_project.i18n_pos_set.c_str(), msgnum()); f.write_cstring(label()); @@ -3082,7 +3082,7 @@ void Fl_Widget_Type::write_widget_code(Fd_Code_Writer& f) { case FD_I18N_POSIX : /* POSIX catgets */ f.write_c("catgets(%s,%s,%d,", g_project.i18n_pos_file.empty() ? "_catalog" : g_project.i18n_pos_file.c_str(), - g_project.i18n_pos_set.c_str(), + g_project.i18n_pos_set.c_str(), msgnum() + 1); f.write_cstring(tooltip()); f.write_c(")"); diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 42fe3d2189..7878124f87 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -278,7 +278,7 @@ static Fl_String end_with_slash(const Fl_String &str) { return str; } -/** +/** Generate a path to a directory for temporary data storage. The path is stored in g_tmpdir. */ @@ -345,7 +345,7 @@ static void create_tmpdir() { } } -/** +/** Delete the temporary directory that was created in set_tmpdir. */ static void delete_tmpdir() { diff --git a/fluid/makedepend b/fluid/makedepend index 2615368eb7..f3a4d99f52 100644 --- a/fluid/makedepend +++ b/fluid/makedepend @@ -18,6 +18,7 @@ about_panel.o: ../FL/Fl_Group.H about_panel.o: ../FL/Fl_Image.H about_panel.o: ../FL/Fl_Pixmap.H about_panel.o: ../FL/Fl_Return_Button.H +about_panel.o: ../FL/fl_string_functions.h about_panel.o: ../FL/fl_types.h about_panel.o: ../FL/fl_utf8.h about_panel.o: ../FL/Fl_Widget.H @@ -371,6 +372,7 @@ factory.o: ../FL/Fl_Roller.H factory.o: ../FL/Fl_Scrollbar.H factory.o: ../FL/Fl_Slider.H factory.o: ../FL/Fl_Spinner.H +factory.o: ../FL/fl_string_functions.h factory.o: ../FL/Fl_Tabs.H factory.o: ../FL/Fl_Terminal.H factory.o: ../FL/Fl_Text_Buffer.H @@ -919,6 +921,7 @@ Fl_Grid_Type.o: ../FL/Fl_Rect.H Fl_Grid_Type.o: ../FL/Fl_RGB_Image.H Fl_Grid_Type.o: ../FL/Fl_Scrollbar.H Fl_Grid_Type.o: ../FL/Fl_Slider.H +Fl_Grid_Type.o: ../FL/fl_string_functions.h Fl_Grid_Type.o: ../FL/Fl_Tabs.H Fl_Grid_Type.o: ../FL/fl_types.h Fl_Grid_Type.o: ../FL/fl_utf8.h @@ -972,6 +975,7 @@ Fl_Group_Type.o: ../FL/Fl_RGB_Image.H Fl_Group_Type.o: ../FL/Fl_Scroll.H Fl_Group_Type.o: ../FL/Fl_Scrollbar.H Fl_Group_Type.o: ../FL/Fl_Slider.H +Fl_Group_Type.o: ../FL/fl_string_functions.h Fl_Group_Type.o: ../FL/Fl_Table.H Fl_Group_Type.o: ../FL/Fl_Tabs.H Fl_Group_Type.o: ../FL/fl_types.h @@ -1032,6 +1036,7 @@ Fl_Menu_Type.o: ../FL/Fl_Scrollbar.H Fl_Menu_Type.o: ../FL/Fl_Shared_Image.H Fl_Menu_Type.o: ../FL/Fl_Shortcut_Button.H Fl_Menu_Type.o: ../FL/Fl_Slider.H +Fl_Menu_Type.o: ../FL/fl_string_functions.h Fl_Menu_Type.o: ../FL/Fl_Tabs.H Fl_Menu_Type.o: ../FL/Fl_Text_Buffer.H Fl_Menu_Type.o: ../FL/Fl_Text_Display.H @@ -1088,6 +1093,7 @@ Fl_Type.o: ../FL/Fl_RGB_Image.H Fl_Type.o: ../FL/Fl_Scrollbar.H Fl_Type.o: ../FL/Fl_Shared_Image.H Fl_Type.o: ../FL/Fl_Slider.H +Fl_Type.o: ../FL/fl_string_functions.h Fl_Type.o: ../FL/Fl_Tabs.H Fl_Type.o: ../FL/fl_types.h Fl_Type.o: ../FL/fl_utf8.h @@ -1563,6 +1569,7 @@ sourceview_panel.o: ../FL/Fl_Rect.H sourceview_panel.o: ../FL/Fl_RGB_Image.H sourceview_panel.o: ../FL/Fl_Scrollbar.H sourceview_panel.o: ../FL/Fl_Slider.H +sourceview_panel.o: ../FL/fl_string_functions.h sourceview_panel.o: ../FL/Fl_Tabs.H sourceview_panel.o: ../FL/Fl_Text_Buffer.H sourceview_panel.o: ../FL/Fl_Text_Display.H @@ -1646,6 +1653,7 @@ undo.o: ../FL/Fl_Rect.H undo.o: ../FL/Fl_RGB_Image.H undo.o: ../FL/Fl_Scrollbar.H undo.o: ../FL/Fl_Slider.H +undo.o: ../FL/fl_string_functions.h undo.o: ../FL/fl_types.h undo.o: ../FL/fl_utf8.h undo.o: ../FL/Fl_Valuator.H diff --git a/src/Fl_Button.cxx b/src/Fl_Button.cxx index f7ec12144e..5ea3e45c0a 100644 --- a/src/Fl_Button.cxx +++ b/src/Fl_Button.cxx @@ -174,10 +174,10 @@ int Fl_Button::handle(int event) { set_changed(); if (when() & FL_WHEN_CHANGED) do_callback(FL_REASON_CHANGED); - else if (when() & FL_WHEN_RELEASE) + else if (when() & FL_WHEN_RELEASE) do_callback(FL_REASON_RELEASED); } else { - if (when() & FL_WHEN_NOT_CHANGED) + if (when() & FL_WHEN_NOT_CHANGED) do_callback(FL_REASON_SELECTED); } } else if (type() == FL_TOGGLE_BUTTON) { diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index aa74ffbb9e..6c27c6c94b 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -221,7 +221,7 @@ Fl_File_Chooser::Fl_File_Chooser(const char *pathname, const char *pattern, int { Fl_Group* o = new Fl_Group(10, 275, 470, 95); { Fl_Group* o = new Fl_Group(10, 275, 470, 20); { previewButton = new Fl_Check_Button(10, 275, 105, 20, "Preview"); - previewButton->shortcut(0x80070); + previewButton->shortcut(FL_ALT|'p'); previewButton->down_box(FL_DOWN_BOX); previewButton->value(1); previewButton->callback((Fl_Callback*)cb_previewButton); diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index 1240dc837a..d51734729c 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -662,7 +662,7 @@ static void merge_all_windows_cb(Fl_Widget *, void *) int index = window_menu_items->size() - 1; if (index >= window_menu_items_count - 1) { window_menu_items_count += 5; - window_menu_items = (Fl_Menu_Item*)realloc(window_menu_items, + window_menu_items = (Fl_Menu_Item*)realloc(window_menu_items, window_menu_items_count * sizeof(Fl_Menu_Item)); Fl_Menu_Item *item = (Fl_Menu_Item*)fl_sys_menu_bar->find_item("Window"); item->user_data(window_menu_items); diff --git a/src/Fl_Shared_Image.cxx b/src/Fl_Shared_Image.cxx index 4a9f913935..89b23ab8fb 100644 --- a/src/Fl_Shared_Image.cxx +++ b/src/Fl_Shared_Image.cxx @@ -48,7 +48,7 @@ extern "C" { } -/** +/** Returns the Fl_Shared_Image* array. \return a pointer to an array of shared image pointers, sorted by name and size @@ -402,7 +402,7 @@ Fl_Image *Fl_Shared_Image::copy() const { /** Averages the colors in the image with the provided FLTK color value. - This method changes the pixel data of this specific image. + This method changes the pixel data of this specific image. \note It does not change any of the resized copies of this image, nor does it necessarily apply the color changes if this image is resized later. diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index c3355ca743..6b0193afff 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1260,7 +1260,7 @@ int fl_handle(const XEvent& thisevent) XEvent xevent = thisevent; fl_xevent = &thisevent; Window xid = xevent.xany.window; - + // For each DestroyNotify event, determine whether an FLTK-created window // is being destroyed (see issue #935). bool xid_is_from_fltk_win = false; diff --git a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx index 5241f23751..8c14912f29 100644 --- a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx @@ -409,7 +409,7 @@ void Fl_Wayland_Gl_Window_Driver::resize(int is_a_resize, int W, int H) { struct wld_window *xid = fl_wl_xid(pWindow); if (xid->kind == Fl_Wayland_Window_Driver::DECORATED && !xid->frame_cb) { xid->frame_cb = wl_surface_frame(xid->wl_surface); - wl_callback_add_listener(xid->frame_cb, + wl_callback_add_listener(xid->frame_cb, Fl_Wayland_Graphics_Driver::p_surface_frame_listener, xid); } wl_egl_window_resize(egl_window, W, H, 0, 0); diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index 2aa0803754..92e04d5781 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1498,7 +1498,7 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { // Cursor names are the files of directory /usr/share/icons/XXXX/cursors/ // where XXXX is the name of the current 'cursor theme'. static struct cursor_file_struct { - Fl_Cursor c; + Fl_Cursor c; const char *fname; Fl_Wayland_Screen_Driver::cursor_shapes wld_c; } cursor_file_array[] = { @@ -1522,7 +1522,7 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { {FL_CURSOR_NESW, "fd_double_arrow", Fl_Wayland_Screen_Driver::nesw }, {FL_CURSOR_NWSE, "bd_double_arrow", Fl_Wayland_Screen_Driver::nwse } }; - + int found = -1; for (unsigned i = 0; i < sizeof(cursor_file_array) / sizeof(struct cursor_file_struct); i++) { if (cursor_file_array[i].c == c) { @@ -1536,7 +1536,7 @@ int Fl_Wayland_Window_Driver::set_cursor(Fl_Cursor c) { } } if (found < 0 || !scr_driver->xc_cursor[found]) return 0; - + if (xid->custom_cursor) { delete_cursor(xid->custom_cursor); xid->custom_cursor = NULL; @@ -1781,7 +1781,7 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) { if (fl_win && fl_win->kind == SUBWINDOW && fl_win->subsurface) checkSubwindowFrame(); // make sure subwindow doesn't leak outside parent - + if (Fl_Wayland_Screen_Driver::compositor == Fl_Wayland_Screen_Driver::MUTTER && fl_win && is_a_resize && fl_win->kind == DECORATED) { // fix for issue #878 scan_subwindows(pWindow, does_window_cover_parent); diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index a1dba59d46..640dd6963b 100644 --- a/src/fl_shortcut.cxx +++ b/src/fl_shortcut.cxx @@ -77,7 +77,7 @@ int Fl::test_shortcut(unsigned int shortcut) { // kludge so that Ctrl+'_' works (as opposed to Ctrl+'^_'): if ((shift&FL_CTRL) && key >= 0x3f && key <= 0x5F && firstChar==(key^0x40)) return 1; // firstChar should be within a-z - + return 0; } diff --git a/src/makedepend b/src/makedepend index cae53f2807..93d019e16a 100644 --- a/src/makedepend +++ b/src/makedepend @@ -413,6 +413,7 @@ drivers/Unix/Fl_Unix_System_Driver.o: drivers/Unix/Fl_Unix_Screen_Driver.H drivers/Unix/Fl_Unix_System_Driver.o: drivers/Unix/Fl_Unix_System_Driver.H drivers/Unix/Fl_Unix_System_Driver.o: flstring.h drivers/Unix/Fl_Unix_System_Driver.o: Fl_Screen_Driver.H +drivers/Unix/Fl_Unix_System_Driver.o: Fl_String.H drivers/Unix/Fl_Unix_System_Driver.o: Fl_System_Driver.H drivers/Unix/Fl_Unix_System_Driver.o: Fl_Timeout.h drivers/X11/Fl_X11_Gl_Window_Driver.o: ../config.h @@ -531,6 +532,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_RGB_Image.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Scrollbar.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Shared_Image.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Slider.H +drivers/X11/Fl_X11_Screen_Driver.o: ../FL/fl_string_functions.h drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Text_Buffer.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Text_Display.H drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Text_Editor.H @@ -759,6 +761,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_RGB_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Scrollbar.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Shared_Image.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Slider.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_string_functions.h drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Buffer.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Display.H drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Editor.H @@ -797,6 +800,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Pixmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Plugin.H drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Preferences.H drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_RGB_Image.H +drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_string_functions.h drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_types.h drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_utf8.h drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Widget.H @@ -941,6 +945,7 @@ filename_isdir.o: ../FL/fl_casts.H filename_isdir.o: ../FL/fl_config.h filename_isdir.o: ../FL/Fl_Export.H filename_isdir.o: ../FL/Fl_Preferences.H +filename_isdir.o: ../FL/fl_string_functions.h filename_isdir.o: ../FL/fl_types.h filename_isdir.o: ../FL/fl_utf8.h filename_isdir.o: ../FL/platform_types.h @@ -956,6 +961,7 @@ filename_list.o: ../FL/fl_casts.H filename_list.o: ../FL/fl_config.h filename_list.o: ../FL/Fl_Export.H filename_list.o: ../FL/Fl_Preferences.H +filename_list.o: ../FL/fl_string_functions.h filename_list.o: ../FL/fl_types.h filename_list.o: ../FL/fl_utf8.h filename_list.o: ../FL/platform_types.h @@ -969,6 +975,7 @@ filename_setext.o: ../config.h filename_setext.o: ../FL/filename.H filename_setext.o: ../FL/fl_config.h filename_setext.o: ../FL/Fl_Export.H +filename_setext.o: ../FL/fl_string_functions.h filename_setext.o: ../FL/platform_types.h filename_setext.o: flstring.h Fl.o: ../config.h @@ -995,6 +1002,7 @@ Fl.o: ../FL/Fl_Rect.H Fl.o: ../FL/Fl_RGB_Image.H Fl.o: ../FL/Fl_Scrollbar.H Fl.o: ../FL/Fl_Slider.H +Fl.o: ../FL/fl_string_functions.h Fl.o: ../FL/Fl_Text_Buffer.H Fl.o: ../FL/Fl_Text_Display.H Fl.o: ../FL/Fl_Text_Editor.H @@ -1015,6 +1023,7 @@ Fl.o: Fl_Window_Driver.H flstring.o: ../config.h flstring.o: ../FL/fl_config.h flstring.o: ../FL/Fl_Export.H +flstring.o: ../FL/fl_string_functions.h flstring.o: flstring.h Fl_abort.o: ../FL/Enumerations.H Fl_abort.o: ../FL/filename.H @@ -1144,6 +1153,7 @@ fl_ask.o: ../FL/Fl_Rect.H fl_ask.o: ../FL/Fl_RGB_Image.H fl_ask.o: ../FL/Fl_Scrollbar.H fl_ask.o: ../FL/Fl_Slider.H +fl_ask.o: ../FL/fl_string_functions.h fl_ask.o: ../FL/Fl_Text_Buffer.H fl_ask.o: ../FL/Fl_Text_Display.H fl_ask.o: ../FL/Fl_Text_Editor.H @@ -1219,6 +1229,7 @@ Fl_Browser.o: ../FL/Fl_Multi_Browser.H Fl_Browser.o: ../FL/Fl_Scrollbar.H Fl_Browser.o: ../FL/Fl_Select_Browser.H Fl_Browser.o: ../FL/Fl_Slider.H +Fl_Browser.o: ../FL/fl_string_functions.h Fl_Browser.o: ../FL/fl_types.h Fl_Browser.o: ../FL/fl_utf8.h Fl_Browser.o: ../FL/Fl_Valuator.H @@ -1306,6 +1317,7 @@ Fl_Chart.o: ../FL/Fl_Chart.H Fl_Chart.o: ../FL/fl_config.h Fl_Chart.o: ../FL/fl_draw.H Fl_Chart.o: ../FL/Fl_Export.H +Fl_Chart.o: ../FL/fl_string_functions.h Fl_Chart.o: ../FL/fl_types.h Fl_Chart.o: ../FL/fl_utf8.h Fl_Chart.o: ../FL/Fl_Widget.H @@ -1360,6 +1372,7 @@ Fl_Choice.o: ../FL/Fl_Image.H Fl_Choice.o: ../FL/Fl_Menu_.H Fl_Choice.o: ../FL/Fl_Menu_Item.H Fl_Choice.o: ../FL/Fl_Multi_Label.H +Fl_Choice.o: ../FL/fl_string_functions.h Fl_Choice.o: ../FL/fl_types.h Fl_Choice.o: ../FL/fl_utf8.h Fl_Choice.o: ../FL/Fl_Widget.H @@ -1632,6 +1645,7 @@ fl_dnd_x.o: ../FL/Fl_Rect.H fl_dnd_x.o: ../FL/Fl_RGB_Image.H fl_dnd_x.o: ../FL/Fl_Scrollbar.H fl_dnd_x.o: ../FL/Fl_Slider.H +fl_dnd_x.o: ../FL/fl_string_functions.h fl_dnd_x.o: ../FL/Fl_Text_Buffer.H fl_dnd_x.o: ../FL/Fl_Text_Display.H fl_dnd_x.o: ../FL/Fl_Text_Editor.H @@ -1679,6 +1693,7 @@ fl_draw.o: ../FL/fl_config.h fl_draw.o: ../FL/fl_draw.H fl_draw.o: ../FL/Fl_Export.H fl_draw.o: ../FL/Fl_Image.H +fl_draw.o: ../FL/fl_string_functions.h fl_draw.o: ../FL/fl_types.h fl_draw.o: ../FL/fl_utf8.h fl_draw.o: ../FL/Fl_Widget.H @@ -1710,6 +1725,7 @@ fl_draw_pixmap.o: ../FL/fl_config.h fl_draw_pixmap.o: ../FL/fl_draw.H fl_draw_pixmap.o: ../FL/Fl_Export.H fl_draw_pixmap.o: ../FL/Fl_Preferences.H +fl_draw_pixmap.o: ../FL/fl_string_functions.h fl_draw_pixmap.o: ../FL/fl_types.h fl_draw_pixmap.o: ../FL/fl_utf8.h fl_draw_pixmap.o: ../FL/platform.H @@ -1728,6 +1744,7 @@ fl_encoding_latin1.o: ../FL/fl_config.h fl_encoding_latin1.o: ../FL/fl_draw.H fl_encoding_latin1.o: ../FL/Fl_Export.H fl_encoding_latin1.o: ../FL/Fl_Preferences.H +fl_encoding_latin1.o: ../FL/fl_string_functions.h fl_encoding_latin1.o: ../FL/fl_types.h fl_encoding_latin1.o: ../FL/fl_utf8.h fl_encoding_latin1.o: ../FL/platform_types.h @@ -1744,6 +1761,7 @@ fl_encoding_mac_roman.o: ../FL/fl_config.h fl_encoding_mac_roman.o: ../FL/fl_draw.H fl_encoding_mac_roman.o: ../FL/Fl_Export.H fl_encoding_mac_roman.o: ../FL/Fl_Preferences.H +fl_encoding_mac_roman.o: ../FL/fl_string_functions.h fl_encoding_mac_roman.o: ../FL/fl_types.h fl_encoding_mac_roman.o: ../FL/fl_utf8.h fl_encoding_mac_roman.o: ../FL/platform_types.h @@ -1896,6 +1914,7 @@ fl_file_dir.o: ../FL/Fl_Menu_Item.H fl_file_dir.o: ../FL/Fl_Multi_Label.H fl_file_dir.o: ../FL/Fl_Preferences.H fl_file_dir.o: ../FL/Fl_Return_Button.H +fl_file_dir.o: ../FL/fl_string_functions.h fl_file_dir.o: ../FL/Fl_Tile.H fl_file_dir.o: ../FL/fl_types.h fl_file_dir.o: ../FL/fl_utf8.h @@ -1915,6 +1934,7 @@ Fl_File_Icon.o: ../FL/fl_draw.H Fl_File_Icon.o: ../FL/Fl_Export.H Fl_File_Icon.o: ../FL/Fl_File_Icon.H Fl_File_Icon.o: ../FL/Fl_Preferences.H +Fl_File_Icon.o: ../FL/fl_string_functions.h Fl_File_Icon.o: ../FL/fl_types.h Fl_File_Icon.o: ../FL/fl_utf8.h Fl_File_Icon.o: ../FL/Fl_Widget.H @@ -1930,6 +1950,7 @@ Fl_File_Icon2.o: ../FL/Fl_Export.H Fl_File_Icon2.o: ../FL/Fl_File_Icon.H Fl_File_Icon2.o: ../FL/Fl_Image.H Fl_File_Icon2.o: ../FL/Fl_Shared_Image.H +Fl_File_Icon2.o: ../FL/fl_string_functions.h Fl_File_Icon2.o: ../FL/fl_utf8.h Fl_File_Icon2.o: ../FL/Fl_Widget.H Fl_File_Icon2.o: ../FL/math.h @@ -1952,6 +1973,7 @@ Fl_File_Input.o: ../FL/Fl_Image.H Fl_File_Input.o: ../FL/Fl_Input.H Fl_File_Input.o: ../FL/Fl_Input_.H Fl_File_Input.o: ../FL/Fl_Preferences.H +Fl_File_Input.o: ../FL/fl_string_functions.h Fl_File_Input.o: ../FL/fl_types.h Fl_File_Input.o: ../FL/fl_utf8.h Fl_File_Input.o: ../FL/Fl_Widget.H @@ -1982,6 +2004,7 @@ fl_font.o: ../FL/Fl_Rect.H fl_font.o: ../FL/Fl_RGB_Image.H fl_font.o: ../FL/Fl_Scrollbar.H fl_font.o: ../FL/Fl_Slider.H +fl_font.o: ../FL/fl_string_functions.h fl_font.o: ../FL/Fl_Text_Buffer.H fl_font.o: ../FL/Fl_Text_Display.H fl_font.o: ../FL/Fl_Text_Editor.H @@ -2076,6 +2099,7 @@ Fl_GIF_Image.o: ../FL/Fl_Export.H Fl_GIF_Image.o: ../FL/Fl_GIF_Image.H Fl_GIF_Image.o: ../FL/Fl_Image.H Fl_GIF_Image.o: ../FL/Fl_Pixmap.H +Fl_GIF_Image.o: ../FL/fl_string_functions.h Fl_GIF_Image.o: ../FL/fl_types.h Fl_GIF_Image.o: ../FL/fl_utf8.h Fl_GIF_Image.o: ../FL/platform_types.h @@ -2304,6 +2328,7 @@ Fl_Help_Dialog.o: ../FL/Fl_RGB_Image.H Fl_Help_Dialog.o: ../FL/Fl_Scrollbar.H Fl_Help_Dialog.o: ../FL/Fl_Shared_Image.H Fl_Help_Dialog.o: ../FL/Fl_Slider.H +Fl_Help_Dialog.o: ../FL/fl_string_functions.h Fl_Help_Dialog.o: ../FL/fl_types.h Fl_Help_Dialog.o: ../FL/fl_utf8.h Fl_Help_Dialog.o: ../FL/Fl_Valuator.H @@ -2373,6 +2398,7 @@ Fl_Image.o: ../FL/Fl_Export.H Fl_Image.o: ../FL/Fl_Image.H Fl_Image.o: ../FL/Fl_Menu_Item.H Fl_Image.o: ../FL/Fl_Multi_Label.H +Fl_Image.o: ../FL/fl_string_functions.h Fl_Image.o: ../FL/fl_types.h Fl_Image.o: ../FL/fl_utf8.h Fl_Image.o: ../FL/Fl_Widget.H @@ -2394,6 +2420,7 @@ fl_images_core.o: ../FL/Fl_Pixmap.H fl_images_core.o: ../FL/Fl_PNG_Image.H fl_images_core.o: ../FL/Fl_PNM_Image.H fl_images_core.o: ../FL/Fl_Shared_Image.H +fl_images_core.o: ../FL/fl_string_functions.h fl_images_core.o: ../FL/Fl_SVG_Image.H fl_images_core.o: ../FL/fl_types.h fl_images_core.o: ../FL/fl_utf8.h @@ -2459,6 +2486,7 @@ Fl_Input.o: ../FL/Fl_RGB_Image.H Fl_Input.o: ../FL/Fl_Scrollbar.H Fl_Input.o: ../FL/Fl_Secret_Input.H Fl_Input.o: ../FL/Fl_Slider.H +Fl_Input.o: ../FL/fl_string_functions.h Fl_Input.o: ../FL/Fl_Text_Buffer.H Fl_Input.o: ../FL/Fl_Text_Display.H Fl_Input.o: ../FL/Fl_Text_Editor.H @@ -2496,6 +2524,7 @@ Fl_Input_.o: ../FL/Fl_Rect.H Fl_Input_.o: ../FL/Fl_RGB_Image.H Fl_Input_.o: ../FL/Fl_Scrollbar.H Fl_Input_.o: ../FL/Fl_Slider.H +Fl_Input_.o: ../FL/fl_string_functions.h Fl_Input_.o: ../FL/Fl_Text_Buffer.H Fl_Input_.o: ../FL/Fl_Text_Display.H Fl_Input_.o: ../FL/Fl_Text_Editor.H @@ -2571,6 +2600,7 @@ Fl_Light_Button.o: ../FL/fl_draw.H Fl_Light_Button.o: ../FL/Fl_Export.H Fl_Light_Button.o: ../FL/Fl_Light_Button.H Fl_Light_Button.o: ../FL/Fl_Radio_Light_Button.H +Fl_Light_Button.o: ../FL/fl_string_functions.h Fl_Light_Button.o: ../FL/fl_types.h Fl_Light_Button.o: ../FL/fl_utf8.h Fl_Light_Button.o: ../FL/platform_types.h @@ -2617,6 +2647,7 @@ Fl_Menu.o: ../FL/Fl_RGB_Image.H Fl_Menu.o: ../FL/Fl_Scrollbar.H Fl_Menu.o: ../FL/Fl_Single_Window.H Fl_Menu.o: ../FL/Fl_Slider.H +Fl_Menu.o: ../FL/fl_string_functions.h Fl_Menu.o: ../FL/Fl_Text_Buffer.H Fl_Menu.o: ../FL/Fl_Text_Display.H Fl_Menu.o: ../FL/Fl_Text_Editor.H @@ -2641,6 +2672,7 @@ Fl_Menu_.o: ../FL/Fl_Image.H Fl_Menu_.o: ../FL/Fl_Menu_.H Fl_Menu_.o: ../FL/Fl_Menu_Item.H Fl_Menu_.o: ../FL/Fl_Multi_Label.H +Fl_Menu_.o: ../FL/fl_string_functions.h Fl_Menu_.o: ../FL/fl_types.h Fl_Menu_.o: ../FL/fl_utf8.h Fl_Menu_.o: ../FL/Fl_Widget.H @@ -2910,6 +2942,7 @@ Fl_Native_File_Chooser_GTK.o: drivers/Unix/Fl_Unix_Screen_Driver.H Fl_Native_File_Chooser_GTK.o: Fl_Native_File_Chooser_Kdialog.H Fl_Native_File_Chooser_GTK.o: Fl_Native_File_Chooser_Zenity.H Fl_Native_File_Chooser_GTK.o: Fl_Screen_Driver.H +Fl_Native_File_Chooser_GTK.o: Fl_String.H Fl_Native_File_Chooser_GTK.o: Fl_System_Driver.H Fl_Native_File_Chooser_GTK.o: Fl_Window_Driver.H Fl_Native_File_Chooser_Kdialog.o: ../config.h @@ -2968,6 +3001,7 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/platform_types.h Fl_Native_File_Chooser_Kdialog.o: drivers/Unix/Fl_Unix_Screen_Driver.H Fl_Native_File_Chooser_Kdialog.o: Fl_Native_File_Chooser_Kdialog.H Fl_Native_File_Chooser_Kdialog.o: Fl_Screen_Driver.H +Fl_Native_File_Chooser_Kdialog.o: Fl_String.H Fl_Native_File_Chooser_Kdialog.o: Fl_Window_Driver.H Fl_Native_File_Chooser_Zenity.o: ../config.h Fl_Native_File_Chooser_Zenity.o: ../FL/Enumerations.H @@ -3009,6 +3043,7 @@ Fl_Native_File_Chooser_Zenity.o: ../FL/Fl_Window.H Fl_Native_File_Chooser_Zenity.o: ../FL/platform_types.h Fl_Native_File_Chooser_Zenity.o: Fl_Native_File_Chooser_Kdialog.H Fl_Native_File_Chooser_Zenity.o: Fl_Native_File_Chooser_Zenity.H +Fl_Native_File_Chooser_Zenity.o: Fl_String.H fl_open_uri.o: ../config.h fl_open_uri.o: ../FL/Enumerations.H fl_open_uri.o: ../FL/filename.H @@ -3019,6 +3054,7 @@ fl_open_uri.o: ../FL/fl_casts.H fl_open_uri.o: ../FL/fl_config.h fl_open_uri.o: ../FL/Fl_Export.H fl_open_uri.o: ../FL/Fl_Preferences.H +fl_open_uri.o: ../FL/fl_string_functions.h fl_open_uri.o: ../FL/fl_types.h fl_open_uri.o: ../FL/fl_utf8.h fl_open_uri.o: ../FL/platform_types.h @@ -3174,6 +3210,7 @@ Fl_Pixmap.o: ../FL/Fl_Image.H Fl_Pixmap.o: ../FL/Fl_Menu_Item.H Fl_Pixmap.o: ../FL/Fl_Multi_Label.H Fl_Pixmap.o: ../FL/Fl_Pixmap.H +Fl_Pixmap.o: ../FL/fl_string_functions.h Fl_Pixmap.o: ../FL/fl_types.h Fl_Pixmap.o: ../FL/fl_utf8.h Fl_Pixmap.o: ../FL/Fl_Widget.H @@ -3190,6 +3227,7 @@ fl_plastic.o: ../FL/fl_casts.H fl_plastic.o: ../FL/fl_config.h fl_plastic.o: ../FL/fl_draw.H fl_plastic.o: ../FL/Fl_Export.H +fl_plastic.o: ../FL/fl_string_functions.h fl_plastic.o: ../FL/fl_types.h fl_plastic.o: ../FL/fl_utf8.h fl_plastic.o: ../FL/platform_types.h @@ -3221,6 +3259,7 @@ Fl_PNM_Image.o: ../FL/fl_config.h Fl_PNM_Image.o: ../FL/Fl_Export.H Fl_PNM_Image.o: ../FL/Fl_Image.H Fl_PNM_Image.o: ../FL/Fl_PNM_Image.H +Fl_PNM_Image.o: ../FL/fl_string_functions.h Fl_PNM_Image.o: ../FL/fl_types.h Fl_PNM_Image.o: ../FL/fl_utf8.h Fl_PNM_Image.o: ../FL/platform_types.h @@ -3523,6 +3562,7 @@ Fl_Scrollbar.o: ../FL/fl_draw.H Fl_Scrollbar.o: ../FL/Fl_Export.H Fl_Scrollbar.o: ../FL/Fl_Scrollbar.H Fl_Scrollbar.o: ../FL/Fl_Slider.H +Fl_Scrollbar.o: ../FL/fl_string_functions.h Fl_Scrollbar.o: ../FL/fl_types.h Fl_Scrollbar.o: ../FL/fl_utf8.h Fl_Scrollbar.o: ../FL/Fl_Valuator.H @@ -3568,6 +3608,7 @@ fl_set_font.o: ../FL/Fl_Rect.H fl_set_font.o: ../FL/Fl_RGB_Image.H fl_set_font.o: ../FL/Fl_Scrollbar.H fl_set_font.o: ../FL/Fl_Slider.H +fl_set_font.o: ../FL/fl_string_functions.h fl_set_font.o: ../FL/Fl_Text_Buffer.H fl_set_font.o: ../FL/Fl_Text_Display.H fl_set_font.o: ../FL/Fl_Text_Editor.H @@ -3605,6 +3646,7 @@ Fl_Shared_Image.o: ../FL/Fl_Image.H Fl_Shared_Image.o: ../FL/Fl_Pixmap.H Fl_Shared_Image.o: ../FL/Fl_Preferences.H Fl_Shared_Image.o: ../FL/Fl_Shared_Image.H +Fl_Shared_Image.o: ../FL/fl_string_functions.h Fl_Shared_Image.o: ../FL/fl_types.h Fl_Shared_Image.o: ../FL/fl_utf8.h Fl_Shared_Image.o: ../FL/Fl_Widget.H @@ -3635,6 +3677,7 @@ fl_shortcut.o: ../FL/Fl_Rect.H fl_shortcut.o: ../FL/Fl_RGB_Image.H fl_shortcut.o: ../FL/Fl_Scrollbar.H fl_shortcut.o: ../FL/Fl_Slider.H +fl_shortcut.o: ../FL/fl_string_functions.h fl_shortcut.o: ../FL/Fl_Text_Buffer.H fl_shortcut.o: ../FL/Fl_Text_Display.H fl_shortcut.o: ../FL/Fl_Text_Editor.H @@ -3657,6 +3700,7 @@ Fl_Shortcut_Button.o: ../FL/fl_config.h Fl_Shortcut_Button.o: ../FL/fl_draw.H Fl_Shortcut_Button.o: ../FL/Fl_Export.H Fl_Shortcut_Button.o: ../FL/Fl_Shortcut_Button.H +Fl_Shortcut_Button.o: ../FL/fl_string_functions.h Fl_Shortcut_Button.o: ../FL/fl_types.h Fl_Shortcut_Button.o: ../FL/fl_utf8.h Fl_Shortcut_Button.o: ../FL/Fl_Widget.H @@ -3694,6 +3738,7 @@ Fl_Slider.o: ../FL/Fl_Hor_Nice_Slider.H Fl_Slider.o: ../FL/Fl_Hor_Slider.H Fl_Slider.o: ../FL/Fl_Nice_Slider.H Fl_Slider.o: ../FL/Fl_Slider.H +Fl_Slider.o: ../FL/fl_string_functions.h Fl_Slider.o: ../FL/fl_types.h Fl_Slider.o: ../FL/fl_utf8.h Fl_Slider.o: ../FL/Fl_Valuator.H @@ -3772,6 +3817,7 @@ fl_symbols.o: ../FL/fl_casts.H fl_symbols.o: ../FL/fl_config.h fl_symbols.o: ../FL/fl_draw.H fl_symbols.o: ../FL/Fl_Export.H +fl_symbols.o: ../FL/fl_string_functions.h fl_symbols.o: ../FL/fl_types.h fl_symbols.o: ../FL/fl_utf8.h fl_symbols.o: ../FL/math.h @@ -3788,6 +3834,7 @@ Fl_System_Driver.o: ../FL/fl_config.h Fl_System_Driver.o: ../FL/Fl_Export.H Fl_System_Driver.o: ../FL/Fl_File_Icon.H Fl_System_Driver.o: ../FL/Fl_Preferences.H +Fl_System_Driver.o: ../FL/fl_string_functions.h Fl_System_Driver.o: ../FL/fl_types.h Fl_System_Driver.o: ../FL/fl_utf8.h Fl_System_Driver.o: ../FL/platform_types.h @@ -3898,6 +3945,7 @@ Fl_Terminal.o: ../FL/Fl_Valuator.H Fl_Terminal.o: ../FL/Fl_Widget.H Fl_Terminal.o: ../FL/Fl_Window.H Fl_Terminal.o: ../FL/platform_types.h +Fl_Terminal.o: Fl_String.H Fl_Text_Buffer.o: ../config.h Fl_Text_Buffer.o: ../FL/Enumerations.H Fl_Text_Buffer.o: ../FL/Fl.H @@ -3974,6 +4022,7 @@ Fl_Text_Editor.o: ../FL/Fl_Rect.H Fl_Text_Editor.o: ../FL/Fl_RGB_Image.H Fl_Text_Editor.o: ../FL/Fl_Scrollbar.H Fl_Text_Editor.o: ../FL/Fl_Slider.H +Fl_Text_Editor.o: ../FL/fl_string_functions.h Fl_Text_Editor.o: ../FL/Fl_Text_Buffer.H Fl_Text_Editor.o: ../FL/Fl_Text_Display.H Fl_Text_Editor.o: ../FL/Fl_Text_Editor.H @@ -4037,22 +4086,41 @@ Fl_Tooltip.o: ../FL/Enumerations.H Fl_Tooltip.o: ../FL/filename.H Fl_Tooltip.o: ../FL/Fl.H Fl_Tooltip.o: ../FL/fl_attr.h +Fl_Tooltip.o: ../FL/Fl_Bitmap.H Fl_Tooltip.o: ../FL/Fl_Cairo.H Fl_Tooltip.o: ../FL/fl_casts.H Fl_Tooltip.o: ../FL/fl_config.h +Fl_Tooltip.o: ../FL/Fl_Device.H +Fl_Tooltip.o: ../FL/Fl_Double_Window.H Fl_Tooltip.o: ../FL/fl_draw.H Fl_Tooltip.o: ../FL/Fl_Export.H +Fl_Tooltip.o: ../FL/Fl_Graphics_Driver.H +Fl_Tooltip.o: ../FL/Fl_Group.H +Fl_Tooltip.o: ../FL/Fl_Image.H Fl_Tooltip.o: ../FL/Fl_Menu_Window.H +Fl_Tooltip.o: ../FL/Fl_Overlay_Window.H +Fl_Tooltip.o: ../FL/Fl_Pixmap.H +Fl_Tooltip.o: ../FL/Fl_Plugin.H Fl_Tooltip.o: ../FL/Fl_Preferences.H +Fl_Tooltip.o: ../FL/Fl_Rect.H +Fl_Tooltip.o: ../FL/Fl_RGB_Image.H +Fl_Tooltip.o: ../FL/Fl_Scrollbar.H Fl_Tooltip.o: ../FL/Fl_Single_Window.H +Fl_Tooltip.o: ../FL/Fl_Slider.H Fl_Tooltip.o: ../FL/fl_string_functions.h +Fl_Tooltip.o: ../FL/Fl_Text_Buffer.H +Fl_Tooltip.o: ../FL/Fl_Text_Display.H +Fl_Tooltip.o: ../FL/Fl_Text_Editor.H Fl_Tooltip.o: ../FL/Fl_Tooltip.H Fl_Tooltip.o: ../FL/fl_types.h Fl_Tooltip.o: ../FL/fl_utf8.h +Fl_Tooltip.o: ../FL/Fl_Valuator.H Fl_Tooltip.o: ../FL/Fl_Widget.H Fl_Tooltip.o: ../FL/Fl_Window.H Fl_Tooltip.o: ../FL/platform_types.h +Fl_Tooltip.o: Fl_Screen_Driver.H Fl_Tooltip.o: Fl_System_Driver.H +Fl_Tooltip.o: Fl_Window_Driver.H Fl_Tree.o: ../FL/Enumerations.H Fl_Tree.o: ../FL/Fl.H Fl_Tree.o: ../FL/fl_attr.h @@ -4154,6 +4222,7 @@ Fl_Valuator.o: ../FL/Fl_Cairo.H Fl_Valuator.o: ../FL/fl_casts.H Fl_Valuator.o: ../FL/fl_config.h Fl_Valuator.o: ../FL/Fl_Export.H +Fl_Valuator.o: ../FL/fl_string_functions.h Fl_Valuator.o: ../FL/fl_types.h Fl_Valuator.o: ../FL/fl_utf8.h Fl_Valuator.o: ../FL/Fl_Valuator.H @@ -4490,6 +4559,7 @@ Fl_x.o: ../FL/Fl_RGB_Image.H Fl_x.o: ../FL/Fl_Scrollbar.H Fl_x.o: ../FL/Fl_Shared_Image.H Fl_x.o: ../FL/Fl_Slider.H +Fl_x.o: ../FL/fl_string_functions.h Fl_x.o: ../FL/Fl_Text_Buffer.H Fl_x.o: ../FL/Fl_Text_Display.H Fl_x.o: ../FL/Fl_Text_Editor.H @@ -4525,6 +4595,7 @@ Fl_XBM_Image.o: ../FL/fl_casts.H Fl_XBM_Image.o: ../FL/fl_config.h Fl_XBM_Image.o: ../FL/Fl_Export.H Fl_XBM_Image.o: ../FL/Fl_Image.H +Fl_XBM_Image.o: ../FL/fl_string_functions.h Fl_XBM_Image.o: ../FL/fl_types.h Fl_XBM_Image.o: ../FL/fl_utf8.h Fl_XBM_Image.o: ../FL/Fl_Widget.H @@ -4541,6 +4612,7 @@ Fl_XPM_Image.o: ../FL/fl_config.h Fl_XPM_Image.o: ../FL/Fl_Export.H Fl_XPM_Image.o: ../FL/Fl_Image.H Fl_XPM_Image.o: ../FL/Fl_Pixmap.H +Fl_XPM_Image.o: ../FL/fl_string_functions.h Fl_XPM_Image.o: ../FL/fl_types.h Fl_XPM_Image.o: ../FL/fl_utf8.h Fl_XPM_Image.o: ../FL/Fl_XPM_Image.H @@ -4727,6 +4799,7 @@ forms_fselect.o: ../FL/Fl_RGB_Image.H forms_fselect.o: ../FL/Fl_Round_Button.H forms_fselect.o: ../FL/fl_show_colormap.H forms_fselect.o: ../FL/Fl_Slider.H +forms_fselect.o: ../FL/fl_string_functions.h forms_fselect.o: ../FL/Fl_Tile.H forms_fselect.o: ../FL/Fl_Timer.H forms_fselect.o: ../FL/fl_types.h @@ -4903,6 +4976,7 @@ glut_compatibility.o: ../FL/Fl_Rect.H glut_compatibility.o: ../FL/Fl_RGB_Image.H glut_compatibility.o: ../FL/Fl_Scrollbar.H glut_compatibility.o: ../FL/Fl_Slider.H +glut_compatibility.o: ../FL/fl_string_functions.h glut_compatibility.o: ../FL/Fl_Text_Buffer.H glut_compatibility.o: ../FL/Fl_Text_Display.H glut_compatibility.o: ../FL/Fl_Text_Editor.H @@ -4974,6 +5048,10 @@ gl_start.o: ../FL/Fl_Window.H gl_start.o: ../FL/gl.h gl_start.o: ../FL/platform_types.h gl_start.o: Fl_Gl_Window_Driver.H +nanosvg.o: ../config.h +nanosvg.o: ../FL/fl_config.h +nanosvg.o: ../nanosvg/nanosvg.h +nanosvg.o: ../nanosvg/nanosvgrast.h numericsort.o: ../FL/filename.H numericsort.o: ../FL/fl_config.h numericsort.o: ../FL/Fl_Export.H @@ -5041,6 +5119,7 @@ screen_xywh.o: Fl_Screen_Driver.H vsnprintf.o: ../config.h vsnprintf.o: ../FL/fl_config.h vsnprintf.o: ../FL/Fl_Export.H +vsnprintf.o: ../FL/fl_string_functions.h vsnprintf.o: flstring.h xutf8/case.o: utf8_internal.h xutf8/case.o: xutf8/headers/case.h diff --git a/test/makedepend b/test/makedepend index b3f9731e11..b060c7c166 100644 --- a/test/makedepend +++ b/test/makedepend @@ -802,6 +802,7 @@ editor.o: ../FL/Fl_File_Browser.H editor.o: ../FL/Fl_File_Chooser.H editor.o: ../FL/Fl_File_Icon.H editor.o: ../FL/Fl_File_Input.H +editor.o: ../FL/Fl_Flex.H editor.o: ../FL/Fl_Graphics_Driver.H editor.o: ../FL/Fl_Group.H editor.o: ../FL/Fl_Image.H @@ -822,6 +823,7 @@ editor.o: ../FL/Fl_Return_Button.H editor.o: ../FL/Fl_RGB_Image.H editor.o: ../FL/Fl_Scrollbar.H editor.o: ../FL/Fl_Slider.H +editor.o: ../FL/fl_string_functions.h editor.o: ../FL/Fl_Text_Buffer.H editor.o: ../FL/Fl_Text_Display.H editor.o: ../FL/Fl_Text_Editor.H @@ -1663,6 +1665,7 @@ native-filechooser.o: ../FL/Fl_Rect.H native-filechooser.o: ../FL/Fl_Return_Button.H native-filechooser.o: ../FL/Fl_RGB_Image.H native-filechooser.o: ../FL/Fl_Scrollbar.H +native-filechooser.o: ../FL/Fl_Shared_Image.H native-filechooser.o: ../FL/Fl_Slider.H native-filechooser.o: ../FL/Fl_Terminal.H native-filechooser.o: ../FL/Fl_Tile.H @@ -1875,7 +1878,9 @@ pixmap_browser.o: ../FL/Fl_Valuator.H pixmap_browser.o: ../FL/Fl_Widget.H pixmap_browser.o: ../FL/Fl_Widget_Surface.H pixmap_browser.o: ../FL/Fl_Window.H +pixmap_browser.o: ../FL/platform.H pixmap_browser.o: ../FL/platform_types.h +pixmap_browser.o: ../FL/x11.H preferences.o: ../FL/Enumerations.H preferences.o: ../FL/filename.H preferences.o: ../FL/Fl.H @@ -2933,6 +2938,7 @@ unittest_scrollbarsize.o: ../FL/Fl_Scroll.H unittest_scrollbarsize.o: ../FL/Fl_Scrollbar.H unittest_scrollbarsize.o: ../FL/Fl_Slider.H unittest_scrollbarsize.o: ../FL/Fl_Table.H +unittest_scrollbarsize.o: ../FL/Fl_Terminal.H unittest_scrollbarsize.o: ../FL/Fl_Text_Buffer.H unittest_scrollbarsize.o: ../FL/Fl_Text_Display.H unittest_scrollbarsize.o: ../FL/Fl_Tree.H diff --git a/test/radio.fl b/test/radio.fl index f21c02b0df..3eff6a2489 100644 --- a/test/radio.fl +++ b/test/radio.fl @@ -6,7 +6,7 @@ Function {button_cb(Fl_Button *b, void *)} { comment {Buttons test callback} open private return_type void } { code {char msg[256]; -sprintf(msg, "Label: '%s'\\nValue: %d\\nChanged: %d", +sprintf(msg, "Label: '%s'\\nValue: %d\\nChanged: %d", b->label(), b->value(), b->changed()); cb_info->value(msg); cb_info->redraw(); diff --git a/test/terminal.fl b/test/terminal.fl index 26e6f66879..379520291b 100644 --- a/test/terminal.fl +++ b/test/terminal.fl @@ -1849,7 +1849,7 @@ Can be decimal (e.g. 12) or hex (e.g. \#0c, \#0000000c, etc)} xywh {521 175 77 2 MenuItem {} { label {White on DarkAmber (XTERM)} callback {G_tty->color(0x30200000); // amber widget bg color -G_tty->textfgcolor_xterm(7); // XTERM_WHITE (influenced by Dim/Bold) +G_tty->textfgcolor_xterm(7); // XTERM_WHITE (influenced by Dim/Bold) G_tty->textbgcolor(0xffffffff); // "see through" color update_inputs(); @@ -1860,7 +1860,7 @@ add_lines(5); } MenuItem {} { label {White on Black (XTERM)} - callback {G_tty->textfgcolor_xterm(7); // XTERM WHITE (influenced by Dim/Bold) + callback {G_tty->textfgcolor_xterm(7); // XTERM WHITE (influenced by Dim/Bold) G_tty->textbgcolor(0xffffffff); G_tty->color(0x00000000); update_inputs();