FLTK logo

[master] 84af966 - Add FL_EXPORT to Fl_Wayland_Screen_Driver::wl_display member variable.

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 84af966 - Add FL_EXPORT to Fl_Wayland_Screen_Driver::wl_display member variable. "ManoloFLTK" Aug 30, 2022  
 
commit 84af9661098286335e7c1d1d9ec6d407e05b1d21
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Tue Aug 30 08:55:14 2022 +0200
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Tue Aug 30 08:55:14 2022 +0200

    Add FL_EXPORT to Fl_Wayland_Screen_Driver::wl_display member variable.

 src/drivers/Wayland/Fl_Wayland_Screen_Driver.H      | 2 +-
 src/drivers/Wayland/fl_wayland_gl_platform_init.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git src/drivers/Wayland/Fl_Wayland_Screen_Driver.H src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
index a7a3f95..64aae85 100644
--- src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
+++ src/drivers/Wayland/Fl_Wayland_Screen_Driver.H
@@ -63,7 +63,7 @@ class Fl_Wayland_Screen_Driver : public Fl_Screen_Driver
   static int insertion_point_height;
   static bool insertion_point_location_is_valid;
 public:
-  static struct wl_display *wl_display;
+  static FL_EXPORT struct wl_display *wl_display;
   // use it to make sure the Wayland leg was selected and fl_open_display() has run
   static struct wl_registry *wl_registry;
   // true when an app is forbidden to use its Wayland leg
diff --git src/drivers/Wayland/fl_wayland_gl_platform_init.cxx src/drivers/Wayland/fl_wayland_gl_platform_init.cxx
index 81ce562..f80ee67 100644
--- src/drivers/Wayland/fl_wayland_gl_platform_init.cxx
+++ src/drivers/Wayland/fl_wayland_gl_platform_init.cxx
@@ -22,6 +22,6 @@
 
 Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w)
 {
-  if (fl_wl_display()) return new Fl_Wayland_Gl_Window_Driver(w);
+  if (Fl_Wayland_Screen_Driver::wl_display) return new Fl_Wayland_Gl_Window_Driver(w);
   return new Fl_X11_Gl_Window_Driver(w);
 }
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.