Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 11:25:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change protection levels in classes Fl_XXX_Gl_Window_Driver

Browse Source
This commit is contained in:
ManoloFLTK
2022-05-07 15:16:29 +02:00
parent d4472e5e53
commit 1d64b78554
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.H
+1 -1
View File
@@ -22,7 +22,7 @@
class Fl_Gl_Choice; class Fl_Gl_Choice;
class Fl_Cocoa_Gl_Window_Driver : public Fl_Gl_Window_Driver { class Fl_Cocoa_Gl_Window_Driver : public Fl_Gl_Window_Driver {
friend class Fl_Gl_Window_Driver; friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
Fl_Cocoa_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {} Fl_Cocoa_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
virtual float pixels_per_unit(); virtual float pixels_per_unit();
virtual void before_show(int& need_after); virtual void before_show(int& need_after);
src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.H
+1 -3
View File
@@ -34,9 +34,8 @@ Consequently, FL_DOUBLE is enforced in all Fl_Gl_Window::mode_ values under Wayl
*/ */
class Fl_Wayland_Gl_Window_Driver : public Fl_Gl_Window_Driver { class Fl_Wayland_Gl_Window_Driver : public Fl_Gl_Window_Driver {
friend class Fl_Gl_Window_Driver; friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
bool egl_resize_in_progress; bool egl_resize_in_progress;
protected:
Fl_Wayland_Gl_Window_Driver(Fl_Gl_Window *win); Fl_Wayland_Gl_Window_Driver(Fl_Gl_Window *win);
virtual float pixels_per_unit(); virtual float pixels_per_unit();
virtual void make_current_before(); virtual void make_current_before();
@@ -54,7 +53,6 @@ protected:
virtual void gl_start(); virtual void gl_start();
virtual Fl_RGB_Image* capture_gl_rectangle(int x, int y, int w, int h); virtual Fl_RGB_Image* capture_gl_rectangle(int x, int y, int w, int h);
char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs); char *alpha_mask_for_string(const char *str, int n, int w, int h, Fl_Fontsize fs);
public:
static EGLDisplay egl_display; static EGLDisplay egl_display;
static EGLint configs_count; static EGLint configs_count;
static struct wl_event_queue *gl_event_queue; static struct wl_event_queue *gl_event_queue;
src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H
-1
View File
@@ -53,7 +53,6 @@
#include "../Cairo/Fl_Cairo_Graphics_Driver.H" #include "../Cairo/Fl_Cairo_Graphics_Driver.H"
#include <stdint.h> // for uint32_t #include <stdint.h> // for uint32_t
typedef struct _PangoLayout PangoLayout;
struct fl_wld_buffer { struct fl_wld_buffer {
struct wl_buffer *wl_buffer; struct wl_buffer *wl_buffer;
src/drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.H
+1 -1
View File
@@ -32,7 +32,7 @@ Consequently, FL_DOUBLE is enforced in all Fl_Gl_Window::mode_ values under Wayl
*/ */
class Fl_WinAPI_Gl_Window_Driver : public Fl_Gl_Window_Driver { class Fl_WinAPI_Gl_Window_Driver : public Fl_Gl_Window_Driver {
friend class Fl_Gl_Window_Driver; friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
Fl_WinAPI_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {} Fl_WinAPI_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
virtual float pixels_per_unit(); virtual float pixels_per_unit();
virtual int mode_(int m, const int *a); virtual int mode_(int m, const int *a);
src/drivers/X11/Fl_X11_Gl_Window_Driver.H
+1 -2
View File
@@ -25,7 +25,7 @@
class Fl_Gl_Choice; class Fl_Gl_Choice;
class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver { class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver {
friend class Fl_Gl_Window_Driver; friend Fl_Gl_Window_Driver* Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *);
Fl_X11_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {} Fl_X11_Gl_Window_Driver(Fl_Gl_Window *win) : Fl_Gl_Window_Driver(win) {}
virtual float pixels_per_unit(); virtual float pixels_per_unit();
virtual void before_show(int& need_after); virtual void before_show(int& need_after);
@@ -48,7 +48,6 @@ class Fl_X11_Gl_Window_Driver : public Fl_Gl_Window_Driver {
#if !USE_XFT #if !USE_XFT
virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum); virtual Fl_Font_Descriptor** fontnum_to_fontdescriptor(int fnum);
#endif #endif
public:
static GLContext create_gl_context(XVisualInfo* vis); static GLContext create_gl_context(XVisualInfo* vis);
}; };