mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland: remove compilation warning (#706)

Browse Source 
drivers/Wayland/Fl_Wayland_Window_Driver.cxx:1515:47: warning: declaration ‘struct wld_window::custom_cursor’ does not declare anything
This commit is contained in:
ManoloFLTK 2023-03-23 18:42:02 +01:00
parent aebf2fec39
commit dcb4c39956
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
documentation/src/wayland.dox
View File

@ -588,9 +588,9 @@ struct wl_cursor {
\endcode
Function \c Fl_Wayland_Window_Driver::set_cursor_4args() also creates a <tt>struct wl_cursor</tt>
object containing a single \c wl_cursor_image, which is in fact the \c cursor_image.
Finally, a <tt>struct custom_cursor</tt> (see \ref wld_window) is allocated and used to memorize
Finally, a <tt>struct custom_cursor_</tt> (see \ref wld_window) is allocated and used to memorize
the <tt>struct wl_cursor</tt> and the cursor's image and hotspot.
A pointer to this <tt>struct custom_cursor</tt> object is stored in member \c custom_cursor of the
A pointer to this <tt>struct custom_cursor_</tt> object is stored in member \c custom_cursor of the
window's \ref wld_window.
Function \c Fl_Wayland_Window_Driver::set_cursor_4args() is also called when a window with a custom
@ -823,7 +823,7 @@ struct wld_window {
struct xdg_popup *xdg_popup; // for POPUP windows
struct xdg_toplevel *xdg_toplevel; // for UNFRAMED windows
};
struct custom_cursor {
struct custom_cursor_ {
struct wl_cursor *wl_cursor;
const Fl_RGB_Image *rgb;
int hotx, hoty;

2
src/drivers/Wayland/Fl_Wayland_Window_Driver.H
View File

@ -144,7 +144,7 @@ struct wld_window {
struct xdg_popup *xdg_popup;
struct xdg_toplevel *xdg_toplevel;
};
struct custom_cursor {
struct custom_cursor_ {
struct wl_cursor *wl_cursor;
const Fl_RGB_Image *rgb;
int hotx, hoty;

4
src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
View File

@ -79,7 +79,7 @@ Fl_Wayland_Window_Driver::Fl_Wayland_Window_Driver(Fl_Window *win) : Fl_Window_D
}
void Fl_Wayland_Window_Driver::delete_cursor_(struct wld_window *xid, bool delete_rgb) {
struct wld_window::custom_cursor *custom = xid->custom_cursor;
struct wld_window::custom_cursor_ *custom = xid->custom_cursor;
if (custom) {
struct wl_cursor *wl_cursor = custom->wl_cursor;
struct cursor_image *new_image = (struct cursor_image*)wl_cursor->images[0];
@ -1512,7 +1512,7 @@ int Fl_Wayland_Window_Driver::set_cursor_4args(const Fl_RGB_Image *rgb, int hotx
// delete the previous custom cursor, if there was one, and keep its Fl_RGB_Image if appropriate
delete_cursor_(xid, keep_copy);
//have this new cursor used
xid->custom_cursor = new struct wld_window::custom_cursor;
xid->custom_cursor = new struct wld_window::custom_cursor_;
xid->custom_cursor->wl_cursor = new_cursor;
xid->custom_cursor->rgb = rgb;
xid->custom_cursor->hotx = hotx;