#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
//-----------------------------------------------------------------------------
extern "C" {
-static gint
+static void
gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
{
win->GTKInitImplicitContext();
-
- return FALSE;
}
}
//-----------------------------------------------------------------------------
extern "C" {
-static gint
+static void
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();
-
- return FALSE;
}
}
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,
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 );
+}
+}
+
+//-----------------------------------------------------------------------------
+// emission hook for "parent-set"
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gboolean
+parent_set_hook(GSignalInvocationHint*, guint, const GValue* param_values, void* data)
+{
+ wxGLCanvas* win = (wxGLCanvas*)data;
+ if (g_value_peek_pointer(¶m_values[0]) == win->m_wxwindow)
+ {
+ const XVisualInfo* xvi = win->GetXVisualInfo();
+ GdkVisual* visual = gtk_widget_get_visual(win->m_wxwindow);
+ if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid)
+ {
+ GdkScreen* screen = gtk_widget_get_screen(win->m_wxwindow);
+ visual = gdk_x11_screen_lookup_visual(screen, xvi->visualid);
+ GdkColormap* colormap = gdk_colormap_new(visual, false);
+ gtk_widget_set_colormap(win->m_wxwindow, colormap);
+ g_object_unref(colormap);
+ }
+ // remove hook
+ return false;
+ }
+ return true;
}
}
const wxPalette& palette)
: m_createImplicitContext(true)
{
+ m_sharedContext = NULL;
+ m_sharedContextOf = NULL;
+
Create(parent, id, pos, size, style, name, attribList, palette);
}
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);
}
const wxPalette& palette )
: m_createImplicitContext(true)
{
- m_sharedContextOf = wx_const_cast(wxGLCanvas *, shared);
+ m_sharedContext = NULL;
+ m_sharedContextOf = const_cast<wxGLCanvas *>(shared);
Create(parent, id, pos, size, style, name, attribList, palette);
}
long style,
const wxString& name,
const int *attribList,
- const wxPalette& palette)
+ const wxPalette& WXUNUSED_UNLESS_DEBUG(palette))
{
+ wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
+
m_exposed = false;
m_noExpose = true;
m_nativeSizeEvent = true;
if ( !InitVisual(attribList) )
return false;
- XVisualInfo * const xvi = GetXVisualInfo();
-
- 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;
-
- GdkScreen *screen = gtk_widget_get_screen( m_glWidget );
- colormap = gdk_screen_get_default_colormap(screen);
- visual = gdk_colormap_get_visual(colormap);
-
- if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid)
- {
- visual = gdk_x11_screen_lookup_visual( screen, xvi->visualid );
- colormap = gdk_colormap_new(visual, FALSE);
- }
+ // watch for the "parent-set" signal on m_wxwindow so we can set colormap
+ // before m_wxwindow is realized (which will occur before
+ // wxWindow::Create() returns if parent is already visible)
+ unsigned sig_id = g_signal_lookup("parent-set", GTK_TYPE_WIDGET);
+ g_signal_add_emission_hook(sig_id, 0, parent_set_hook, this, NULL);
- gtk_widget_set_colormap( m_glWidget, colormap );
- }
- else
-#endif // GTK+ >= 2.2
- {
- visual = gdkx_visual_get( xvi->visualid );
- colormap = gdk_colormap_new( visual, TRUE );
+ wxWindow::Create( parent, id, pos, size, style, name );
- gtk_widget_push_colormap( colormap );
-
- wxWindow::Create( parent, id, pos, size, style, name );
- m_glWidget = m_wxwindow;
- }
-
- gtk_widget_set_double_buffered( m_glWidget, FALSE );
+ gtk_widget_set_double_buffered(m_wxwindow, false);
#if WXWIN_COMPATIBILITY_2_8
g_signal_connect(m_wxwindow, "realize", G_CALLBACK(gtk_glwindow_realized_callback), this);
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
Window wxGLCanvas::GetXWindow() const
{
- GdkWindow *window = GTK_PIZZA(m_wxwindow)->bin_window;
+ GdkWindow *window = m_wxwindow->window;
return window ? GDK_WINDOW_XWINDOW(window) : 0;
}
{
wxPaintEvent event( GetId() );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
m_exposed = false;
GetUpdateRegion().Clear();
projects / wxWidgets.git / blobdiff