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

utils/wxPython/demo/GenericButtons.py

@@ -41,14 +41,12 @@ class TestPanel(wxPanel):
         b = wxGenBitmapButton(self, -1, None, (100, 130))
         EVT_BUTTON(self, b.GetId(), self.OnButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         b.SetBitmapLabel(bmp)
         bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetBestSize()
 
@@ -59,14 +57,12 @@ class TestPanel(wxPanel):
         b = wxGenBitmapToggleButton(self, -1, None, (100, 230))
         EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
         bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         b.SetBitmapLabel(bmp)
         bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         b.SetBitmapSelected(bmp)
         b.SetToggle(true)
         b.SetBestSize()

utils/wxPython/demo/wxButton.py

@@ -18,9 +18,8 @@ class TestPanel(wxPanel):
         EVT_BUTTON(self, 20, self.OnClick)
 
         bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
-        if wxPlatform == '__WXMSW__':
-            mask = wxMaskColour(bmp, wxBLUE)
-            bmp.SetMask(mask)
+        mask = wxMaskColour(bmp, wxBLUE)
+        bmp.SetMask(mask)
         wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
                        wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
         EVT_BUTTON(self, 30, self.OnClick)

utils/wxPython/demo/wxGLCanvas.py

@@ -2,12 +2,19 @@
 from wxPython.wx       import *
 try:
     from wxPython.glcanvas import *
-    from OpenGL.GL import *
-    from OpenGL.GLUT import *
     haveGLCanvas = true
 except ImportError:
     haveGLCanvas = false
 
+try:
+    # The Python OpenGL package can be found at
+    # http://starship.python.net:9673/crew/da/Code/PyOpenGL/
+    from OpenGL.GL import *
+    from OpenGL.GLUT import *
+    haveOpenGL = true
+except ImportError:
+    haveOpenGL = false
+
 #----------------------------------------------------------------------
 
 if not haveGLCanvas:
@@ -17,9 +24,17 @@ if not haveGLCanvas:
         dlg.ShowModal()
         dlg.Destroy()
 
+elif not haveOpenGL:
+    def runTest(frame, nb, log):
+        dlg = wxMessageDialog(frame,
+                              'The OpenGL package was not found.  You can get it at\n'
+                              'http://starship.python.net:9673/crew/da/Code/PyOpenGL/',
+                          'Sorry', wxOK | wxICON_INFORMATION)
+        dlg.ShowModal()
+        dlg.Destroy()
+
+
 else:
-
-
     def runTest(frame, nb, log):
         win = wxFrame(frame, -1, "GL Demos", wxDefaultPosition, wxSize(300,300))
         CubeCanvas(win)
@@ -51,6 +66,7 @@ else:
 
         def OnSize(self, event):
             size = self.GetClientSize()
+            print size
             if self.GetContext():
                 self.SetCurrent()
                 glViewport(0, 0, size.width, size.height)
@@ -60,6 +76,7 @@ else:
             dc = wxPaintDC(self)
 
             self.SetCurrent()
+            print self.init
 
             if not self.init:
                 self.InitGL()

utils/wxPython/demo/wxVTKRenderWindow.py

@@ -10,7 +10,8 @@ except ImportError:
 
 def runTest(frame, nb, log):
     if haveVTK:
-        win = vtk.wxVTKRenderWindow(nb, -1)
+        f = wxFrame(frame, -1, "wxVTKRenderWindow", size=(450, 300))
+        win = vtk.wxVTKRenderWindow(f, -1)
 
         # Get the render window
         renWin = win.GetRenderWindow()
@@ -38,7 +39,9 @@ def runTest(frame, nb, log):
         scalarBar.SetHeight(0.17)
         ren.AddActor2D(scalarBar)
 
-        return win
+        f.Show(true)
+        frame.otherWin = f
+        return None
 
 
     else: