fix MDI child sizing, which was working more or less by accident before I broke it...

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

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 352246f4786263060459e84696acebb85d6bf8f1..0e17b1e8a7ebe50243c6084ede07179070404f16 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -23,15 +23,10 @@
     #include "wx/module.h"
 #endif // WX_PRECOMP
 
     #include "wx/module.h"
 #endif // WX_PRECOMP
 

-extern "C"
-{
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
-}
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>

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

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

 
 #if WXWIN_COMPATIBILITY_2_8
 
 
 #if WXWIN_COMPATIBILITY_2_8
 


@@ -78,8 +73,6 @@ extern "C" {
 static gboolean
 gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
 {
 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,
     win->m_exposed = true;
 
     win->GetUpdateRegion().Union( gdk_event->area.x,


@@ -98,9 +91,6 @@ extern "C" {
 static void
 gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win )
 {
 static void
 gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win )
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-

     if (!win->m_hasVMT)
         return;
 
     if (!win->m_hasVMT)
         return;