attempt to get the 'new focus' window parameter of a focus kill event set correctly

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

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 23d49c19a747daa79569c7ac91c80c4ca82159ea..bdeb7d0cc6fc1ca3d3b7574847f4cea2db1e6a16 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -16,15 +16,9 @@
 
 #include "wx/glcanvas.h"
 
 
 #include "wx/glcanvas.h"
 

-#ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/frame.h"
-    #include "wx/colour.h"
-    #include "wx/module.h"
-#endif // WX_PRECOMP
-

 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>

+#include "wx/gtk/private/gtk2-compat.h"

 
 #if WXWIN_COMPATIBILITY_2_8
 
 
 #if WXWIN_COMPATIBILITY_2_8
 


@@ -46,6 +40,7 @@ gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
 // "map" from m_wxwindow
 //-----------------------------------------------------------------------------
 
 // "map" from m_wxwindow
 //-----------------------------------------------------------------------------
 

+#ifndef __WXGTK3__

 extern "C" {
 static void
 gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 extern "C" {
 static void
 gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )


@@ -58,12 +53,28 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
     win->GetUpdateRegion().Clear();
 }
 }
     win->GetUpdateRegion().Clear();
 }
 }

+#endif

 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_wxwindow
 //-----------------------------------------------------------------------------
 
 extern "C" {
 
 //-----------------------------------------------------------------------------
 // "expose_event" of m_wxwindow
 //-----------------------------------------------------------------------------
 
 extern "C" {

+#ifdef __WXGTK3__
+static gboolean draw(GtkWidget*, cairo_t* cr, wxGLCanvas* win)
+{
+    win->m_exposed = true;
+    if (win->m_cairoPaintContext == NULL)
+    {
+        win->m_cairoPaintContext = cr;
+        cairo_reference(cr);
+    }
+    double x1, y1, x2, y2;
+    cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+    win->GetUpdateRegion().Union(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
+    return false;
+}
+#else

 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 )
 {


@@ -75,6 +86,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e
                                   gdk_event->area.height );
     return false;
 }
                                   gdk_event->area.height );
     return false;
 }

+#endif

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -87,9 +99,6 @@ gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget),
                            GtkAllocation * WXUNUSED(alloc),
                            wxGLCanvas *win)
 {
                            GtkAllocation * WXUNUSED(alloc),
                            wxGLCanvas *win)
 {

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

     wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
     event.SetEventObject( win );
     win->HandleWindowEvent( event );
     wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
     event.SetEventObject( win );
     win->HandleWindowEvent( event );


@@ -113,9 +122,13 @@ parent_set_hook(GSignalInvocationHint*, guint, const GValue* param_values, void*
         {
             GdkScreen* screen = gtk_widget_get_screen(win->m_wxwindow);
             visual = gdk_x11_screen_lookup_visual(screen, xvi->visualid);
         {
             GdkScreen* screen = gtk_widget_get_screen(win->m_wxwindow);
             visual = gdk_x11_screen_lookup_visual(screen, xvi->visualid);

+#ifdef __WXGTK3__
+            gtk_widget_set_visual(win->m_wxwindow, visual);
+#else

             GdkColormap* colormap = gdk_colormap_new(visual, false);
             gtk_widget_set_colormap(win->m_wxwindow, colormap);
             g_object_unref(colormap);
             GdkColormap* colormap = gdk_colormap_new(visual, false);
             gtk_widget_set_colormap(win->m_wxwindow, colormap);
             g_object_unref(colormap);

+#endif

         }
         // remove hook
         return false;
         }
         // remove hook
         return false;


@@ -174,7 +187,7 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
                        const wxPalette& palette)
     : m_createImplicitContext(true)
 {
                        const wxPalette& palette)
     : m_createImplicitContext(true)
 {

-    m_sharedContext = wx_const_cast(wxGLContext *, shared);
+    m_sharedContext = const_cast<wxGLContext *>(shared);

 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }
 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }


@@ -189,7 +202,7 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent,
     : m_createImplicitContext(true)
 {
     m_sharedContext = NULL;
     : m_createImplicitContext(true)
 {
     m_sharedContext = NULL;

-    m_sharedContextOf = wx_const_cast(wxGLCanvas *, shared);
+    m_sharedContextOf = const_cast<wxGLCanvas *>(shared);

 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }
 
     Create(parent, id, pos, size, style, name, attribList, palette);
 }


@@ -203,13 +216,20 @@ bool wxGLCanvas::Create(wxWindow *parent,
                         long style,
                         const wxString& name,
                         const int *attribList,
                         long style,
                         const wxString& name,
                         const int *attribList,

-                        const wxPalette& WXUNUSED_UNLESS_DEBUG(palette))
+                        const wxPalette& palette)

 {
 {

-    wxASSERT_MSG( !palette.IsOk(), _T("palettes not supported") );
+#if wxUSE_PALETTE
+    wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
+#endif // wxUSE_PALETTE
+    wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0

 
     m_exposed = false;
     m_noExpose = true;
     m_nativeSizeEvent = true;
 
     m_exposed = false;
     m_noExpose = true;
     m_nativeSizeEvent = true;

+#ifdef __WXGTK3__
+    m_cairoPaintContext = NULL;
+    m_backgroundStyle = wxBG_STYLE_PAINT;
+#endif

 
     if ( !InitVisual(attribList) )
         return false;
 
     if ( !InitVisual(attribList) )
         return false;


@@ -227,37 +247,54 @@ bool wxGLCanvas::Create(wxWindow *parent,
 #if WXWIN_COMPATIBILITY_2_8
     g_signal_connect(m_wxwindow, "realize",       G_CALLBACK(gtk_glwindow_realized_callback), this);
 #endif // WXWIN_COMPATIBILITY_2_8
 #if WXWIN_COMPATIBILITY_2_8
     g_signal_connect(m_wxwindow, "realize",       G_CALLBACK(gtk_glwindow_realized_callback), this);
 #endif // WXWIN_COMPATIBILITY_2_8

+#ifdef __WXGTK3__
+    g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this);
+#else

     g_signal_connect(m_wxwindow, "map",           G_CALLBACK(gtk_glwindow_map_callback),      this);
     g_signal_connect(m_wxwindow, "expose_event",  G_CALLBACK(gtk_glwindow_expose_callback),   this);
     g_signal_connect(m_wxwindow, "map",           G_CALLBACK(gtk_glwindow_map_callback),      this);
     g_signal_connect(m_wxwindow, "expose_event",  G_CALLBACK(gtk_glwindow_expose_callback),   this);

+#endif

     g_signal_connect(m_widget,   "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback),     this);
 
 #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
     // initialized yet and we have to do it now
     g_signal_connect(m_widget,   "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback),     this);
 
 #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
     // initialized yet and we have to do it now

-    if (GTK_WIDGET_REALIZED(m_wxwindow))
+    if (gtk_widget_get_realized(m_wxwindow))

         gtk_glwindow_realized_callback( m_wxwindow, this );
 #endif // WXWIN_COMPATIBILITY_2_8
 
         gtk_glwindow_realized_callback( m_wxwindow, this );
 #endif // WXWIN_COMPATIBILITY_2_8
 

-    if (GTK_WIDGET_MAPPED(m_wxwindow))
+#ifndef __WXGTK3__
+    if (gtk_widget_get_mapped(m_wxwindow))

         gtk_glwindow_map_callback( m_wxwindow, this );
         gtk_glwindow_map_callback( m_wxwindow, this );

+#endif

 
     return true;
 }
 
 
     return true;
 }
 

+bool wxGLCanvas::SetBackgroundStyle(wxBackgroundStyle /* style */)
+{
+    return false;
+}
+

 Window wxGLCanvas::GetXWindow() const
 {
 Window wxGLCanvas::GetXWindow() const
 {

-    GdkWindow *window = m_wxwindow->window;
-    return window ? GDK_WINDOW_XWINDOW(window) : 0;
+    GdkWindow* window = GTKGetDrawingWindow();
+    return window ? GDK_WINDOW_XID(window) : 0;

 }
 
 void wxGLCanvas::OnInternalIdle()
 {
     if (m_exposed)
     {
 }
 
 void wxGLCanvas::OnInternalIdle()
 {
     if (m_exposed)
     {

+#ifdef __WXGTK3__
+        GTKSendPaintEvents(m_cairoPaintContext);
+        cairo_destroy(m_cairoPaintContext);
+        m_cairoPaintContext = NULL;
+#else

         wxPaintEvent event( GetId() );
         event.SetEventObject( this );
         HandleWindowEvent( event );
         wxPaintEvent event( GetId() );
         event.SetEventObject( this );
         HandleWindowEvent( event );

+#endif

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