diff --git a/FL/Fl_Gl_Window.H b/FL/Fl_Gl_Window.H index 2bd1dafaf..0f5cf3216 100644 --- a/FL/Fl_Gl_Window.H +++ b/FL/Fl_Gl_Window.H @@ -47,7 +47,7 @@ class Fl_Gl_Window_Driver; to add a selection of widgets to an OpenGL window. The widgets will draw on top of any OpenGL rendering. The number of supported widgets will increase as the driver development improves. Program test/cube.cxx illustrates how to do that. - + \note FLTK expects that when an Fl_Gl_Window is a child of a parent Fl_Window, the child window lies entirely inside its parent window. If that's not the case, what happens to the part of the GL subwindow which leaks outside its parent is undefined diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index b790772c9..c7ecb416d 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -355,7 +355,7 @@ public: typedef struct HICON__* HICON; // These 2 member functions break the driver model but are kept for back compatibility. // They are implemented in Fl_win32.cxx - + /** Sets the default window icons (Windows platform only). Convenience function to set the default icons using Windows' @@ -376,7 +376,7 @@ public: \see Fl_Window::icons(HICON, HICON) */ static void default_icons(HICON big_icon, HICON small_icon); - + /** Sets the window icons using HICON handles (Windows platform only). The given icons are copied. You can free the icons immediately after diff --git a/configure.ac b/configure.ac index 451320213..06e82b8ab 100644 --- a/configure.ac +++ b/configure.ac @@ -1289,7 +1289,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [ ]) ], [], [#include ]) ]) - + AS_CASE([$host_os], [darwin*], [ AS_IF([test x$pango_found = xyes], [ #place X_LIBS after homebrew's pango libs @@ -1298,7 +1298,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [ LDFLAGS="$DARWIN_LDFLAGS" ]) ]) - + dnl Check for the X11/Xregion.h header file... AC_CHECK_HEADER([X11/Xregion.h], [ AC_DEFINE([HAVE_X11_XREGION_H]) diff --git a/examples/OpenGL3test.cxx b/examples/OpenGL3test.cxx index 441571f75..528610553 100644 --- a/examples/OpenGL3test.cxx +++ b/examples/OpenGL3test.cxx @@ -170,7 +170,7 @@ public: int retval = Fl_Gl_Window::handle(event); if (retval) return retval; - + if (event == FL_PUSH && gl_version_major >= 3) { static float factor = 1.1; GLfloat data[4]; diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index ae1e66bd6..edcf45f0d 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -526,7 +526,7 @@ char Fl_Gl_Window_Driver::swap_type() {return UNDEFINED;} void* Fl_Gl_Window_Driver::GetProcAddress(const char *procName) { #if defined(HAVE_GLXGETPROCADDRESSARB) return (void*)glXGetProcAddressARB((const GLubyte *)procName); - + #elif (HAVE_DLSYM && HAVE_DLFCN_H) # ifdef RTLD_DEFAULT void *rtld_default = RTLD_DEFAULT; diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 8183f835a..92bb6c2fd 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -3281,7 +3281,7 @@ void Fl_Cocoa_Window_Driver::resize(int X, int Y, int W, int H) { } through_resize(0); } - + // make sure subwindow doesn't leak outside parent if (pWindow->parent()) [fl_xid(pWindow) checkSubwindowFrame]; } diff --git a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx index 0cd33cac0..59f92663f 100644 --- a/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx @@ -33,7 +33,7 @@ eglQueryContext() reports that EGL_RENDER_BUFFER equals EGL_BACK_BUFFER. This experiment suggests that the platform only supports double-buffer drawing. Consequently, FL_DOUBLE is enforced in all Fl_Gl_Window::mode_ values under Wayland. - + * Commented out code marked with CONTROL_LEAKING_SUB_GL_WINDOWS aims to prevent sub GL windows from leaking out from their parent by making leaking parts fully transparent. This code is commented out because it requires the FL_ALPHA flag to be on diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index 3f131f301..b7c07a38b 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -1479,7 +1479,7 @@ void Fl_Wayland_Window_Driver::resize(int X, int Y, int W, int H) { } } } - + if (fl_win && fl_win->kind == SUBWINDOW && fl_win->subsurface) checkSubwindowFrame(); // make sure subwindow doesn't leak outside parent }