Fix dependencies, typos, trailing whitespace, and formatting

No code changes.
This commit is contained in:
Albrecht Schlosser 2023-03-09 18:16:43 +01:00
parent e18ce5400f
commit 0f3b5ded8f
10 changed files with 21 additions and 20 deletions

View File

@ -531,7 +531,7 @@ enum Fl_Callback_Reason {
#define FL_Forward 0xEF27 ///< Like forward on a browser #define FL_Forward 0xEF27 ///< Like forward on a browser
#define FL_Stop 0xEF28 ///< Stop current operation #define FL_Stop 0xEF28 ///< Stop current operation
#define FL_Refresh 0xEF29 ///< Refresh the page #define FL_Refresh 0xEF29 ///< Refresh the page
#define FL_Sleep 0xEF2F ///< Put system to sleep #define FL_Sleep 0xEF2F ///< Put system to sleep
#define FL_Favorites 0xEF30 ///< Show favorite locations #define FL_Favorites 0xEF30 ///< Show favorite locations
/**@}*/ // group: Non-ASCII key names /**@}*/ // group: Non-ASCII key names

View File

@ -126,7 +126,7 @@ public:
int frame_w(int frame) const; int frame_w(int frame) const;
int frame_h(int frame) const; int frame_h(int frame) const;
// -- overriden methods // -- overridden methods
void color_average(Fl_Color c, float i) FL_OVERRIDE; void color_average(Fl_Color c, float i) FL_OVERRIDE;
Fl_Image *copy(int W, int H) const FL_OVERRIDE; Fl_Image *copy(int W, int H) const FL_OVERRIDE;
Fl_Image *copy() const { return Fl_Pixmap::copy(); } Fl_Image *copy() const { return Fl_Pixmap::copy(); }

View File

@ -252,7 +252,7 @@ public:
FL_DEPRECATED("in 1.4.0 - use vposition(pos) instead", FL_DEPRECATED("in 1.4.0 - use vposition(pos) instead",
void position(int pos)) { return vposition(pos); } void position(int pos)) { return vposition(pos); }
void position(int x, int y) { Fl_Group::position(x, y); } void position(int x, int y) { Fl_Group::position(x, y); }
/** /**
Gets the horizontal scroll position of the list as a pixel position \p pos. Gets the horizontal scroll position of the list as a pixel position \p pos.
The position returned is how many pixels of the list are scrolled off the left edge The position returned is how many pixels of the list are scrolled off the left edge

View File

@ -72,7 +72,7 @@
This method sets the changed() flag. This method sets the changed() flag.
\li <tt>void Fl_Widget::clear_changed()</tt> \li <tt>void Fl_Widget::clear_changed()</tt>
This method clears the changed() flag. This method clears the changed() flag.
The inherited Fl_Menu_::down_box() methods can be used as follows: The inherited Fl_Menu_::down_box() methods can be used as follows:
\li <tt>Fl_Boxtype Fl_Menu_::down_box() const</tt> \li <tt>Fl_Boxtype Fl_Menu_::down_box() const</tt>
Gets the current down box, which is used when the menu is popped up. Gets the current down box, which is used when the menu is popped up.

View File

@ -47,7 +47,7 @@ Wayland differs noticeably from X11 in that the position of a window in the disp
completely hidden to the client app. This prevents function \c Fl_Window::position() from having completely hidden to the client app. This prevents function \c Fl_Window::position() from having
any effect on a top-level window. Wayland also prevents a client app from knowing whether any effect on a top-level window. Wayland also prevents a client app from knowing whether
a window is minimized: \c Fl_Window::show() has no effect on an already mapped window. a window is minimized: \c Fl_Window::show() has no effect on an already mapped window.
Subwindows can be positionned as usual relatively to their Subwindows can be positioned as usual relatively to their
parent window. FLTK uses that for the small, yellow windows that display parent window. FLTK uses that for the small, yellow windows that display
the new scale factor value when it's changed: these are created as short-lived subwindows the new scale factor value when it's changed: these are created as short-lived subwindows
centered above \c Fl::first_window(). centered above \c Fl::first_window().

View File

@ -2,7 +2,7 @@
// Definition of classes Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device // Definition of classes Fl_Graphics_Driver, Fl_Surface_Device, Fl_Display_Device
// for the Fast Light Tool Kit (FLTK). // for the Fast Light Tool Kit (FLTK).
// //
// Copyright 2010-2022 by Bill Spitzak and others. // Copyright 2010-2023 by Bill Spitzak and others.
// //
// This library is free software. Distribution and use rights are outlined in // This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this // the file "COPYING" which should have been included with this file. If this
@ -182,16 +182,16 @@ private:
Gdiplus::Color gdiplus_color_; Gdiplus::Color gdiplus_color_;
Gdiplus::Pen *pen_; Gdiplus::Pen *pen_;
Gdiplus::SolidBrush *brush_; Gdiplus::SolidBrush *brush_;
// The code below ensures the a connection to GDIplus is only made once, and that the // The code below ensures that a connection to GDIplus is only made once, and that the
// matching connection shutdown is also done exactly once. // matching connection shutdown is also done exactly once.
enum { enum {
STATE_CLOSED = 0, // no connection, token is invalid STATE_CLOSED = 0, // no connection, token is invalid
STATE_STARTUP, // attempt to start up, avoid recursions for whatever reason STATE_STARTUP, // attempt to start up, avoid recursions for whatever reason
STATE_OPEN, // connection was successful and the token is valid STATE_OPEN, // connection was successful and the token is valid
STATE_SHUTDOWN // shutting down the gdi connection, avoid possible recursion STATE_SHUTDOWN // shutting down the gdi connection, avoid possible recursion
}; };
static int gdiplus_state_; // reflect the state of the GDIplus driver connection static int gdiplus_state_; // reflect the state of the GDIplus driver connection
static ULONG_PTR gdiplus_token_; // the token that GDIplus gives to us static ULONG_PTR gdiplus_token_; // the token that GDIplus gives to us
public: public:
Fl_GDIplus_Graphics_Driver(); Fl_GDIplus_Graphics_Driver();
virtual ~Fl_GDIplus_Graphics_Driver(); virtual ~Fl_GDIplus_Graphics_Driver();

View File

@ -421,7 +421,7 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h,
swap = next; swap = next;
next = current; next = current;
current = swap; current = swap;
*(next+1) = 0; // must clean the first cell, next are overriden by *1 *(next+1) = 0; // must clean the first cell, next are overridden by *1
for (i=0; i<w; i++){ for (i=0; i<w; i++){
for (k=0; k<4; k++){ // generating 4 x-pixels for 1 RGB for (k=0; k<4; k++){ // generating 4 x-pixels for 1 RGB
short error, o1, o2, o3; short error, o1, o2, o3;
@ -454,7 +454,7 @@ int Fl_PostScript_Graphics_Driver::alpha_mask(const uchar * data, int w, int h,
swap = next; swap = next;
next = current; next = current;
current = swap; current = swap;
*(next+1) = 0; // must clean the first cell, next are overriden by *1 *(next+1) = 0; // must clean the first cell, next are overridden by *1
for (i = w-1; i >= 0; i--){ for (i = w-1; i >= 0; i--){

View File

@ -77,7 +77,7 @@ public:
float gui_scale; // FLTK scale factor float gui_scale; // FLTK scale factor
struct wl_list link; struct wl_list link;
}; };
// static member variables // static member variables
static FL_EXPORT struct wl_display *wl_display; static FL_EXPORT struct wl_display *wl_display;
static const struct wl_data_device_listener *p_data_device_listener; static const struct wl_data_device_listener *p_data_device_listener;
@ -90,7 +90,7 @@ public:
static bool insertion_point_location(int *px, int *py, int *pwidth, int *pheight); static bool insertion_point_location(int *px, int *py, int *pwidth, int *pheight);
static Fl_Window *surface_to_window(struct wl_surface *); static Fl_Window *surface_to_window(struct wl_surface *);
static bool own_output(struct wl_output *output); static bool own_output(struct wl_output *output);
// member variables // member variables
struct wl_cursor *xc_arrow; struct wl_cursor *xc_arrow;
struct wl_cursor *xc_ns; struct wl_cursor *xc_ns;
@ -120,11 +120,11 @@ public:
struct libdecor *libdecor_context; struct libdecor *libdecor_context;
struct xdg_wm_base *xdg_wm_base; struct xdg_wm_base *xdg_wm_base;
struct zwp_text_input_manager_v3 *text_input_base; struct zwp_text_input_manager_v3 *text_input_base;
// constructor // constructor
Fl_Wayland_Screen_Driver(); Fl_Wayland_Screen_Driver();
// overriden functions from parent class Fl_Screen_Driver // overridden functions from parent class Fl_Screen_Driver
APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return PER_SCREEN_APP_SCALING; } APP_SCALING_CAPABILITY rescalable() FL_OVERRIDE { return PER_SCREEN_APP_SCALING; }
float scale(int n) FL_OVERRIDE; float scale(int n) FL_OVERRIDE;
void scale(int n, float f) FL_OVERRIDE; void scale(int n, float f) FL_OVERRIDE;

View File

@ -1073,6 +1073,7 @@ Fl_Anim_GIF_Image.o: ../FL/Fl_Plugin.H
Fl_Anim_GIF_Image.o: ../FL/Fl_Preferences.H Fl_Anim_GIF_Image.o: ../FL/Fl_Preferences.H
Fl_Anim_GIF_Image.o: ../FL/Fl_RGB_Image.H Fl_Anim_GIF_Image.o: ../FL/Fl_RGB_Image.H
Fl_Anim_GIF_Image.o: ../FL/Fl_Shared_Image.H Fl_Anim_GIF_Image.o: ../FL/Fl_Shared_Image.H
Fl_Anim_GIF_Image.o: ../FL/fl_string_functions.h
Fl_Anim_GIF_Image.o: ../FL/fl_types.h Fl_Anim_GIF_Image.o: ../FL/fl_types.h
Fl_Anim_GIF_Image.o: ../FL/fl_utf8.h Fl_Anim_GIF_Image.o: ../FL/fl_utf8.h
Fl_Anim_GIF_Image.o: ../FL/Fl_Widget.H Fl_Anim_GIF_Image.o: ../FL/Fl_Widget.H

View File

@ -42,7 +42,7 @@
// (configure --enable-cairoext or CMake OPTION_CAIROEXT) // (configure --enable-cairoext or CMake OPTION_CAIROEXT)
// which defines the preprocessor variable FLTK_HAVE_CAIROEXT. // which defines the preprocessor variable FLTK_HAVE_CAIROEXT.
// If Fl::cairo_autolink_context(true); is called at the beginning // If Fl::cairo_autolink_context(true); is called at the beginning
// of main(), any overriden draw() function gets access to an adequate // of main(), any overridden draw() function gets access to an adequate
// Cairo context with Fl::cairo_cc() without having to call // Cairo context with Fl::cairo_cc() without having to call
// Fl::cairo_make_current(Fl_Window*). // Fl::cairo_make_current(Fl_Window*).