diff --git a/FL/Fl.H b/FL/Fl.H index c855eb754..8d86370f3 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -1220,7 +1220,7 @@ public: // boxtypes: static Fl_Box_Draw_F *get_boxtype(Fl_Boxtype); static void set_boxtype(Fl_Boxtype, Fl_Box_Draw_F*, - uchar, uchar, uchar, uchar, + uchar, uchar, uchar, uchar, Fl_Box_Draw_Focus_F* =NULL); static void set_boxtype(Fl_Boxtype, Fl_Boxtype from); static int box_dx(Fl_Boxtype); diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H index 0c5fa9a68..b89949c16 100644 --- a/FL/Fl_Menu_.H +++ b/FL/Fl_Menu_.H @@ -228,7 +228,7 @@ public: /** This box type is used to surround the currently-selected items in the - menus. + menus. */ Fl_Boxtype down_box() const {return (Fl_Boxtype)down_box_;} /** Sets the box type used to surround the currently-selected items in the menus. */ diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 3df78092e..90e3e5dc0 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -629,9 +629,9 @@ public: static char show_next_window_iconic() { return show_next_window_iconic_; } - + void allow_expand_outside_parent(); - + }; #endif diff --git a/FL/fl_draw.H b/FL/fl_draw.H index 14137c5d7..a80143bb1 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -623,7 +623,7 @@ inline void fl_curve(double X0, double Y0, double X1, double Y1, double X2, doub } /** Add a series of points to the current path on the arc of a circle. - + The arc is drawn counter-clockwise from 3 o'clock. If \p end is less than \p start then it draws the arc in a clockwise direction. To draw an arc across the 3 o'clock line, \p start and \p end can be greater than 360 or less than 0. diff --git a/README.CMake.txt b/README.CMake.txt index 0d63fa8ab..3f5e3894b 100644 --- a/README.CMake.txt +++ b/README.CMake.txt @@ -318,7 +318,7 @@ FLTK_BUILD_PDF_DOCS - default ON because the docs are not built automatically. FLTK_BUILD_FLUID_DOCS - default OFF - If this option is ON, the FLUID user documentation will be built. If + If this option is ON, the FLUID user documentation will be built. If FLTK_BUILD_PDF_DOCS is ON, the FLUID documentation will be generated in PDF forma. To generate the screen shots used in the handbook, the CMake build mode must be set to "Debug". @@ -333,7 +333,7 @@ FLTK_INSTALL_HTML_DOCS - default OFF FLTK_INSTALL_FLUID_DOCS - default OFF FLTK_INSTALL_PDF_DOCS - default OFF If these options are ON then the HTML, FLUID, and/or PDF docs are installed - when the 'install' target is executed, e.g. with `make install'. You + when the 'install' target is executed, e.g. with `make install'. You need to select above options FLTK_BUILD_*_DOCS as well. diff --git a/fluid/autodoc.cxx b/fluid/autodoc.cxx index b12a848fa..76ded3143 100644 --- a/fluid/autodoc.cxx +++ b/fluid/autodoc.cxx @@ -417,7 +417,7 @@ void run_autodoc(const Fl_String &target_dir) { main_window->size(350, 320); fl_snapshot((target_dir + "main_window.png").c_str(), main_window, win_margin, win_blend); fl_snapshot((target_dir + "main_menubar.png").c_str(), main_menubar, row_margin, row_blend); - fl_snapshot((target_dir + "main_browser.png").c_str(), widget_browser, FL_SNAP_AREA_CLEAR, + fl_snapshot((target_dir + "main_browser.png").c_str(), widget_browser, FL_SNAP_AREA_CLEAR, Fl_Rect(0, 30, FL_SNAP_TO_WINDOW, 100), row_blend, 2.0); diff --git a/fluid/codeview_panel.cxx b/fluid/codeview_panel.cxx index 0ca8c0d3a..6246d6641 100644 --- a/fluid/codeview_panel.cxx +++ b/fluid/codeview_panel.cxx @@ -32,7 +32,7 @@ extern void reveal_in_browser(Fl_Type *t); /** Update the header and source code highlighting depending on the currently selected object - + The Code View system offers an immediate preview of the code files that will be generated by FLUID. It also marks the code generated for the last selected item in the header and the source diff --git a/fluid/documentation/src/page_main_window.dox b/fluid/documentation/src/page_main_window.dox index 005ce01ec..4415b9544 100644 --- a/fluid/documentation/src/page_main_window.dox +++ b/fluid/documentation/src/page_main_window.dox @@ -51,7 +51,7 @@ project windows. The *New From Template* item opens a dialog that provides access to a small number of sample projects. More projects can be added using *Save as Template*. - + Use *Write Code* to write the header and source code files, and *Write Strings* to write the translation file if one of the internationalization options is active. diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index de7e7b00c..a7c5e2f20 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -737,10 +737,10 @@ void Fl_MacOS_Sys_Menu_Bar_Driver::play_menu(const Fl_Menu_Item *item) { free(label); AXUIElementRef appElement = AXUIElementCreateApplication(getpid()); AXUIElementRef menu_bar = NULL; - AXError error = AXUIElementCopyAttributeValue(appElement, kAXMenuBarAttribute, + AXError error = AXUIElementCopyAttributeValue(appElement, kAXMenuBarAttribute, (CFTypeRef *)&menu_bar); if (!error) error = AXUIElementGetAttributeValueCount(menu_bar, kAXChildrenAttribute, &count); - if (!error) error = AXUIElementCopyAttributeValues(menu_bar, kAXChildrenAttribute, 0, count, + if (!error) error = AXUIElementCopyAttributeValues(menu_bar, kAXChildrenAttribute, 0, count, &children); if (!error) { NSEnumerator *enumerator = [(NSArray*)children objectEnumerator]; diff --git a/src/Fl_Native_File_Chooser_GTK.cxx b/src/Fl_Native_File_Chooser_GTK.cxx index 49b99f623..e0826e3e2 100644 --- a/src/Fl_Native_File_Chooser_GTK.cxx +++ b/src/Fl_Native_File_Chooser_GTK.cxx @@ -972,6 +972,6 @@ Fl_Native_File_Chooser::Fl_Native_File_Chooser(int val) { } } #endif // HAVE_DLSYM && HAVE_DLFCN_H - + if (!platform_fnfc) platform_fnfc = new Fl_Native_File_Chooser_FLTK_Driver(val); } diff --git a/src/Fl_Native_File_Chooser_MAC.mm b/src/Fl_Native_File_Chooser_MAC.mm index 5c424cb24..002e0a404 100644 --- a/src/Fl_Native_File_Chooser_MAC.mm +++ b/src/Fl_Native_File_Chooser_MAC.mm @@ -540,7 +540,7 @@ static char *prepareMacFilter(int count, const char *filter, char **patterns) { else #endif if (fl_mac_os_version >= 100900) { - [dialog performSelector:@selector(setAllowedFileTypes:) + [dialog performSelector:@selector(setAllowedFileTypes:) withObject:[NSArray arrayWithObject:ext]]; } } diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx index 3b81789d0..a1f511bef 100644 --- a/src/drivers/PostScript/Fl_PostScript.cxx +++ b/src/drivers/PostScript/Fl_PostScript.cxx @@ -1645,7 +1645,7 @@ static int update_format_layout(int rank, Fl_Paged_Device::Page_Layout layout, }); FL_INLINE_CALLBACK_2( modal, Fl_Window*, win, modal, Fl_Check_Button*, check_but, default_size, - { + { *((bool*)check_but->user_data()) = check_but->value(); win->hide(); } ); @@ -1676,7 +1676,7 @@ static int update_format_layout(int rank, Fl_Paged_Device::Page_Layout layout, int Fl_PDF_Pango_File_Surface::begin_job(const char *defaultname, char **perr_message) { static Page_Layout layout = PORTRAIT; - + Fl_Preferences print_prefs(Fl_Preferences::CORE_USER, "fltk.org", "printers"); char *pref_format; print_prefs.get("PDF/page_size", pref_format, "A4"); diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index 139ba2ea9..271895114 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1519,7 +1519,7 @@ void Fl_Wayland_Window_Driver::makeWindow() if (top_dr->xdg_toplevel()) xdg_toplevel_set_parent(new_window->xdg_toplevel, top_dr->xdg_toplevel()); } - if (scr_driver->seat->gtk_shell && pWindow->modal() && + if (scr_driver->seat->gtk_shell && pWindow->modal() && (new_window->kind == DECORATED || new_window->kind == UNFRAMED)) { // Useful to position modal windows above their parent with "gnome-shell --version" ≤ 45.2, // useless but harmless with "gnome-shell --version" ≥ 46.0.