Check wxUSE_DATAVIEWCTRL

[wxWidgets.git] / src / gtk / glcanvas.cpp

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 3fc37ba80ec2047f0915f15532ea296ee654c97b..909c5c02e20098aec37d4f149a00b2663ef1c07e 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -26,8 +26,6 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 

-#include "wx/gtk/win_gtk.h"
-

 #if WXWIN_COMPATIBILITY_2_8
 
 //-----------------------------------------------------------------------------
 #if WXWIN_COMPATIBILITY_2_8
 
 //-----------------------------------------------------------------------------


@@ -56,7 +54,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 {
     wxPaintEvent event( win->GetId() );
     event.SetEventObject( win );
 {
     wxPaintEvent event( win->GetId() );
     event.SetEventObject( win );

-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );

 
     win->m_exposed = false;
     win->GetUpdateRegion().Clear();
 
     win->m_exposed = false;
     win->GetUpdateRegion().Clear();


@@ -98,7 +96,7 @@ gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget),
 
     wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
     event.SetEventObject( win );
 
     wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
     event.SetEventObject( win );

-    win->GetEventHandler()->ProcessEvent( event );
+    win->HandleWindowEvent( event );

 }
 }
 
 }
 }
 


@@ -234,7 +232,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
 
 Window wxGLCanvas::GetXWindow() const
 {
 
 Window wxGLCanvas::GetXWindow() const
 {

-    GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
+    GdkWindow *window = m_wxwindow->window;

     return window ? GDK_WINDOW_XWINDOW(window) : 0;
 }
 
     return window ? GDK_WINDOW_XWINDOW(window) : 0;
 }
 


@@ -244,7 +242,7 @@ void wxGLCanvas::OnInternalIdle()
     {
         wxPaintEvent event( GetId() );
         event.SetEventObject( this );
     {
         wxPaintEvent event( GetId() );
         event.SetEventObject( this );

-        GetEventHandler()->ProcessEvent( event );
+        HandleWindowEvent( event );

 
         m_exposed = false;
         GetUpdateRegion().Clear();
 
         m_exposed = false;
         GetUpdateRegion().Clear();