Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon

Added events for wxGrid
Other various fixes and additions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/tests/test4.py

@@ -197,9 +197,10 @@ class TestLayoutConstraints(wxFrame):
 #---------------------------------------------------------------------------
 
 class TestGrid(wxFrame):
-    def __init__(self, parent):
+    def __init__(self, parent, log):
         wxFrame.__init__(self, parent, -1, 'Test Grid',
                          wxPyDefaultPosition, wxSize(500, 300))
+        self.log = log
 
         grid = wxGrid(self, -1)
 
@@ -215,10 +216,27 @@ class TestGrid(wxFrame):
         grid.UpdateDimensions()
         grid.AdjustScrollbars()
 
+        EVT_GRID_SELECT_CELL(grid, self.OnSelectCell)
+        EVT_GRID_CELL_CHANGE(grid, self.OnCellChange)
+        EVT_GRID_CELL_LCLICK(grid, self.OnCellClick)
+        EVT_GRID_LABEL_LCLICK(grid, self.OnLabelClick)
+
+
 
     def OnCloseWindow(self, event):
         self.Destroy()
 
+    def OnSelectCell(self, event):
+        self.log.WriteText("OnSelectCell: (%d, %d)\n" % (event.m_row, event.m_col))
+
+    def OnCellChange(self, event):
+        self.log.WriteText("OnCellChange: (%d, %d)\n" % (event.m_row, event.m_col))
+
+    def OnCellClick(self, event):
+        self.log.WriteText("OnCellClick: (%d, %d)\n" % (event.m_row, event.m_col))
+
+    def OnLabelClick(self, event):
+        self.log.WriteText("OnLabelClick: (%d, %d)\n" % (event.m_row, event.m_col))
 
 #---------------------------------------------------------------------------
 
@@ -633,7 +651,7 @@ class AppFrame(wxFrame):
         win.Show(true)
 
     def OnTestGrid(self, event):
-        win = TestGrid(self)
+        win = TestGrid(self, self)
         win.Show(true)
         win.SetSize(wxSize(505, 300))  # have to force a resize, or the grid doesn't
                                        # show up for some reason....
@@ -785,7 +803,13 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.8  1998/11/25 08:47:11  RD
+# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
+# Added events for wxGrid
+# Other various fixes and additions
+#
 # Revision 1.7  1998/11/11 03:13:19  RD
+#
 # Additions for wxTreeCtrl
 #
 # Revision 1.6  1998/10/20 06:45:33  RD

utils/wxPython/tests/test5.py

@@ -0,0 +1,99 @@
+#!/bin/env python
+#----------------------------------------------------------------------------
+# Name:         test5.py
+# Purpose:      Testing wxTaskBarIcon for win32 systems
+#
+# Author:       Robin Dunn
+#
+# Created:      17-Nov-1998
+# RCS-ID:       $Id$
+# Copyright:    (c) 1998 by Total Control Software
+# Licence:      wxWindows license
+#----------------------------------------------------------------------------
+
+
+from wxPython import *
+
+
+#---------------------------------------------------------------------------
+
+class MyDialog(wxDialog):
+    def __init__(self):
+        wxDialog.__init__(self, NULL, -1, "wxTaskBarIcon Test",
+                          wxPoint(-1,-1), wxSize(380,250),
+                          wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE)
+
+        # build the contents of the Dialog
+        wxStaticText(self, -1,
+                     "Press OK to hide me, Exit to quit.",
+                     wxPoint(10, 20))
+        wxStaticText(self, -1,
+                     "Double-click on the taskbar icon to show me again.",
+                     wxPoint(10, 40))
+
+        okButton = wxButton(self, wxID_OK, "OK", wxPoint(100, 180), wxSize(80, 25))
+        exitButton = wxButton(self, wxID_EXIT, "Exit", wxPoint(185, 180), wxSize(80, 25))
+        okButton.SetDefault()
+        self.Centre(wxBOTH)
+
+        EVT_BUTTON(self, wxID_OK, self.OnOK)
+        EVT_BUTTON(self, wxID_EXIT, self.OnExit)
+
+
+        # make the TaskBar icon
+        self.tbIcon = wxTaskBarIcon()
+        icon = wxIcon('bitmaps/smiles.ico', wxBITMAP_TYPE_ICO)
+        self.tbIcon.SetIcon(icon, "Test ToolTip")
+        EVT_TASKBAR_LEFT_DCLICK(self.tbIcon, self.OnTaskBarActivate)
+
+
+
+    def OnTaskBarActivate(self, event):
+        self.Show(true)
+
+    def OnOK(self, event):
+        self.Show(false)
+
+    def OnExit(self, event):
+        self.Close(true)
+
+    def OnCloseWindow(self, event):
+        self.Destroy()
+        del self.tbIcon  # ensure the tbIcon is cleaned up...
+
+
+
+#---------------------------------------------------------------------------
+
+class MyApp(wxApp):
+    def OnInit(self):
+        self.dlg = MyDialog()
+        self.dlg.Show(true)
+        self.SetTopWindow(self.dlg)
+        return true
+
+#---------------------------------------------------------------------------
+
+
+def main():
+    app = MyApp(0)
+    app.MainLoop()
+
+
+def t():
+    import pdb
+    pdb.run('main()')
+
+if __name__ == '__main__':
+    main()
+
+
+#----------------------------------------------------------------------------
+#
+# $Log$
+# Revision 1.1  1998/11/25 08:47:12  RD
+# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
+# Added events for wxGrid
+# Other various fixes and additions
+#
+#