Merge remote-tracking branch 'upstream/master'

glumpy · May 17, 2021 · 2c507f6 · 2c507f6
2 parents 14209f0 + f236b97
commit 2c507f6
Show file tree

Hide file tree

Showing 19 changed files with 663 additions and 89 deletions.
diff --git a/doc/installation.rst b/doc/installation.rst
@@ -50,60 +50,60 @@ Backends requirements
 
 Glumpy requires at least one toolkit for opening a window and creates an OpenGL
 context. This can be done using one of the standard C/C++ toolkits (Qt, GLFW,
-glut, pygame, SDL2, Wx, GTK2 or GTK3) and requires the corresponding python
+glut, pygame, SDL2, or Wx) and requires the corresponding python
 bindings or a pure python toolkit such as pyglet.
 
 .. warning::
 
    You only need to have one of these packages, no need to install them all !
 
-===================== === ==== ====== ==== ==== ===
-**Modern Backends**   Qt  GLFW Pyglet SDL2 GTK3 Wx3
---------------------- --- ---- ------ ---- ---- ---
-Multiple windows       ✓   ✓     ✓     ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Non-decorated windows  ✓   ✓     ✓     ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Resize windows         ✓   ✓     ✓     ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Move windows           ✓   ✓     ✓     ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Set GL API             ✓   ✓    —      ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Set GL Profile         ✓   ✓    —      ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Share GL Context       ✓   ✓     ✓     ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Fullscreen             ✓   ✓     ✓     ✓    ✓    ✓
---------------------- --- ---- ------ ---- ---- ---
-Unicode handling       ✓   ✓     ✓     ✓    ✓    ✓
-===================== === ==== ====== ==== ==== ===
+===================== === ==== ====== ==== ===
+**Modern Backends**   Qt  GLFW Pyglet SDL2 Wx3
+--------------------- --- ---- ------ ---- ---
+Multiple windows       ✓   ✓     ✓     ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Non-decorated windows  ✓   ✓     ✓     ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Resize windows         ✓   ✓     ✓     ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Move windows           ✓   ✓     ✓     ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Set GL API             ✓   ✓    —      ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Set GL Profile         ✓   ✓    —      ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Share GL Context       ✓   ✓     ✓     ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Fullscreen             ✓   ✓     ✓     ✓    ✓
+--------------------- --- ---- ------ ---- ---
+Unicode handling       ✓   ✓     ✓     ✓    ✓
+===================== === ==== ====== ==== ===
 
 |
 
-======================== === ==== ======== ====== =======
-**Old school backends**  Wx2 Glut Freeglut Pygame GTK 2.x
------------------------- --- ---- -------- ------ -------
-Multiple windows          ✓   —      —       —      ✓
------------------------- --- ---- -------- ------ -------
-Non-decorated windows     ✓   ✓      ✓       ✓      ✓
------------------------- --- ---- -------- ------ -------
-Resize windows            ✓   ✓      ✓       —      ✓
------------------------- --- ---- -------- ------ -------
-Move windows              ✓   ✓      ✓       —      ✓
------------------------- --- ---- -------- ------ -------
-Set GL API                —   —      —       —      —
------------------------- --- ---- -------- ------ -------
-Set GL Profile            —   —      —       —      —
------------------------- --- ---- -------- ------ -------
-Share GL Context          —   —      —       —      ✓
------------------------- --- ---- -------- ------ -------
-Fullscreen                ✓  ✓       ✓       ✓      ✓
------------------------- --- ---- -------- ------ -------
-Unicode handling          ✓   —      —       ✓      ✓
------------------------- --- ---- -------- ------ -------
-Scroll event              ✓   —      ✓       —      ✓
-======================== === ==== ======== ====== =======
+======================== === ==== ======== ======
+**Old school backends**  Wx2 Glut Freeglut Pygame
+------------------------ --- ---- -------- ------
+Multiple windows          ✓   —      —       —   
+------------------------ --- ---- -------- ------
+Non-decorated windows     ✓   ✓      ✓       ✓ 
+------------------------ --- ---- -------- ------
+Resize windows            ✓   ✓      ✓       —  
+------------------------ --- ---- -------- ------
+Move windows              ✓   ✓      ✓       —  
+------------------------ --- ---- -------- ------
+Set GL API                —   —      —       —   
+------------------------ --- ---- -------- ------
+Set GL Profile            —   —      —       —   
+------------------------ --- ---- -------- ------
+Share GL Context          —   —      —       —   
+------------------------ --- ---- -------- ------
+Fullscreen                ✓  ✓       ✓       ✓ 
+------------------------ --- ---- -------- ------
+Unicode handling          ✓   —      —       ✓  
+------------------------ --- ---- -------- ------
+Scroll event              ✓   —      ✓       —  
+======================== === ==== ======== ======
 
 
 

diff --git a/doc/tutorial/hardway.rst b/doc/tutorial/hardway.rst
@@ -3,7 +3,7 @@ The hard way
 ============
 
 Before even using OpenGL, we need to open a window with a valid GL
-context. This can be done using toolkit such as Gtk, Qt or Wx or any native
+context. This can be done using toolkit such as Qt or Wx, or any native
 toolkit (Windows, Linux, OSX). Note there also exists dedicated toolkits such
 as GLFW or GLUT and the advantage of GLUT is that it's already installed
 alongside OpenGL. Even if it is now deprecated, we'll use GLUT since it's a