avoid deprecated functions and direct struct access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
#include "wx/nativewin.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include "wx/gtk/private/gtk2-compat.h"
|
||||
|
||||
#ifdef GDK_WINDOWING_X11
|
||||
#include <X11/Xlib.h>
|
||||
@@ -71,7 +72,7 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win)
|
||||
|
||||
// we need to realize the window first before reparenting it
|
||||
gtk_widget_realize(m_widget);
|
||||
gdk_window_reparent(m_widget->window, win, 0, 0);
|
||||
gdk_window_reparent(gtk_widget_get_window(m_widget), win, 0, 0);
|
||||
|
||||
#ifdef GDK_WINDOWING_X11
|
||||
// if the native window is destroyed, our own window will be destroyed too
|
||||
@@ -79,7 +80,7 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowHandle win)
|
||||
// destroyed" GdkWindow, so intercept to DestroyNotify ourselves to fix
|
||||
// this and also destroy the associated C++ object when its window is
|
||||
// destroyed
|
||||
gdk_window_add_filter(m_widget->window, wxNativeContainerWindowFilter, this);
|
||||
gdk_window_add_filter(gtk_widget_get_window(m_widget), wxNativeContainerWindowFilter, this);
|
||||
#endif // GDK_WINDOWING_X11
|
||||
|
||||
// we should be initially visible as we suppose that the native window we
|
||||
|
||||
Reference in New Issue
Block a user