Enabling the use of masks for wxGTK in some of the demos
wxWindow.GetHandle returns the X-Window instead of the GtkWidget pointer so the X-Window can be given to other Python modules such as VTK. wxPython.lib.vtk updated to get the window handle at widget creation instead of in the constructor. other updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,6 +27,11 @@
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkprivate.h>
|
||||
#include <wx/gtk/win_gtk.h>
|
||||
//#include <gdk/gdk.h>
|
||||
//#include <gdk/gdkx.h>
|
||||
//#include <gtk/gtkwindow.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -575,6 +580,25 @@ PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
|
||||
return pyList;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
long wxPyGetWinHandle(wxWindow* win) {
|
||||
#ifdef __WXMSW__
|
||||
return (long)win->GetHandle();
|
||||
#endif
|
||||
|
||||
// Find and return the actual X-Window.
|
||||
#ifdef __WXGTK__
|
||||
if (win->m_wxwindow) {
|
||||
GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window;
|
||||
if (bwin) {
|
||||
return (long)bwin->xwindow;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Some helper functions for typemaps in my_typemaps.i, so they won't be
|
||||
// included in every file...
|
||||
|
||||
Reference in New Issue
Block a user