X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/498ace9e1f08b1e177b1a883ac69d12385e805b0..7fc2ce00f7df12a1e02c165ffdf772c21100bae6:/src/gtk/glcanvas.cpp

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 352246f478..909c5c02e2 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -23,15 +23,8 @@
     #include "wx/module.h"
 #endif // WX_PRECOMP
 
-extern "C"
-{
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
-}
-
-#include "wx/gtk/win_gtk.h"
-#include "wx/gtk/private.h"
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #if WXWIN_COMPATIBILITY_2_8
 
@@ -61,7 +54,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 {
     wxPaintEvent event( win->GetId() );
     event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );
 
     win->m_exposed = false;
     win->GetUpdateRegion().Clear();
@@ -78,8 +71,6 @@ extern "C" {
 static gboolean
 gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
 {
-    // don't need to install idle handler, its done from "event" signal
-
     win->m_exposed = true;
 
     win->GetUpdateRegion().Union( gdk_event->area.x,
@@ -96,17 +87,16 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
 
 extern "C" {
 static void
-gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win )
+gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget),
+                           GtkAllocation * WXUNUSED(alloc),
+                           wxGLCanvas *win)
 {
-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
     if (!win->m_hasVMT)
         return;
 
     wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
     event.SetEventObject( win );
-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );
 }
 }
 
@@ -185,8 +175,10 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         long style,
                         const wxString& name,
                         const int *attribList,
-                        const wxPalette& palette)
+                        const wxPalette& WXUNUSED_UNLESS_DEBUG(palette))
 {
+    wxASSERT_MSG( !palette.IsOk(), _T("palettes not supported") );
+
     m_exposed = false;
     m_noExpose = true;
     m_nativeSizeEvent = true;
@@ -199,38 +191,22 @@ bool wxGLCanvas::Create(wxWindow *parent,
     GdkVisual *visual;
     GdkColormap *colormap;
 
-    // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME)
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,2,0)
-    if (!gtk_check_version(2,2,0))
-    {
-        wxWindow::Create( parent, id, pos, size, style, name );
-
-        m_glWidget = m_wxwindow;
+    wxWindow::Create( parent, id, pos, size, style, name );
 
-        GdkScreen *screen = gtk_widget_get_screen( m_glWidget );
-        colormap = gdk_screen_get_default_colormap(screen);
-        visual = gdk_colormap_get_visual(colormap);
+    m_glWidget = m_wxwindow;
 
-        if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid)
-        {
-            visual = gdk_x11_screen_lookup_visual( screen, xvi->visualid );
-            colormap = gdk_colormap_new(visual, FALSE);
-        }
+    GdkScreen *screen = gtk_widget_get_screen( m_glWidget );
+    colormap = gdk_screen_get_default_colormap(screen);
+    visual = gdk_colormap_get_visual(colormap);
 
-        gtk_widget_set_colormap( m_glWidget, colormap );
-    }
-    else
-#endif // GTK+ >= 2.2
+    if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid)
     {
-        visual = gdkx_visual_get( xvi->visualid );
-        colormap = gdk_colormap_new( visual, TRUE );
-
-        gtk_widget_push_colormap( colormap );
-
-        wxWindow::Create( parent, id, pos, size, style, name );
-        m_glWidget = m_wxwindow;
+        visual = gdk_x11_screen_lookup_visual( screen, xvi->visualid );
+        colormap = gdk_colormap_new(visual, FALSE);
     }
 
+    gtk_widget_set_colormap( m_glWidget, colormap );
+
     gtk_widget_set_double_buffered( m_glWidget, FALSE );
 
 #if WXWIN_COMPATIBILITY_2_8
@@ -240,11 +216,6 @@ bool wxGLCanvas::Create(wxWindow *parent,
     g_signal_connect(m_wxwindow, "expose_event",  G_CALLBACK(gtk_glwindow_expose_callback),   this);
     g_signal_connect(m_widget,   "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback),     this);
 
-    if (gtk_check_version(2,2,0) != NULL)
-    {
-        gtk_widget_pop_colormap();
-    }
-
 #if WXWIN_COMPATIBILITY_2_8
     // if our parent window is already visible, we had been realized before we
     // connected to the "realize" signal and hence our m_glContext hasn't been
@@ -261,7 +232,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
 
 Window wxGLCanvas::GetXWindow() const
 {
-    GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
+    GdkWindow *window = m_wxwindow->window;
     return window ? GDK_WINDOW_XWINDOW(window) : 0;
 }
 
@@ -271,7 +242,7 @@ void wxGLCanvas::OnInternalIdle()
     {
         wxPaintEvent event( GetId() );
         event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );
 
         m_exposed = false;
         GetUpdateRegion().Clear();