X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/630d84f26f30e2cac046baa864f93596e51368b2..0d2a2b601b1994333886dff8f53d82a714c4042f:/utils/wxPython/tests/test4.py

diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py
index 86449c260b..564edb3159 100644
--- a/utils/wxPython/tests/test4.py
+++ b/utils/wxPython/tests/test4.py
@@ -12,7 +12,7 @@
 #----------------------------------------------------------------------------
 
 
-from wxPython import *
+from wxPython.wx import *
 
 import time
 
@@ -43,7 +43,7 @@ class TestSimpleControlsDlg(wxDialog):
         rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(80, y_pos), wxPyDefaultSize,
                         sampleList, 3, wxRA_HORIZONTAL| wxNO_BORDER)
         EVT_RADIOBOX(self, 30, self.EvtRadioBox)
-        width, height = rb.GetSize()
+        width, height = rb.GetSizeTuple()
         y_pos = y_pos + height + 5
 
         wxStaticText(self, -1, "wxChoice", wxPoint(5, y_pos), wxSize(75, 20))
@@ -64,7 +64,7 @@ class TestSimpleControlsDlg(wxDialog):
         EVT_LISTBOX(self, 60, self.EvtListBox)
         EVT_LISTBOX_DCLICK(self, 60, self.EvtListBoxDClick)
         lb.SetSelection(0)
-        width, height = lb.GetSize()
+        width, height = lb.GetSizeTuple()
         y_pos = y_pos + height + 5
 
 
@@ -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))
 
 #---------------------------------------------------------------------------
 
@@ -347,6 +365,7 @@ class CustomStatusBar(wxStatusBar):
     # reposition the checkbox
     def OnSize(self, event):
         rect = self.GetFieldRect(1)
+        print "%s, %s" % (rect.x, rect.y)
         self.cb.SetPosition(wxPoint(rect.x+2, rect.y+2))
         self.cb.SetSize(wxSize(rect.width-4, rect.height-4))
 
@@ -356,7 +375,7 @@ class TestCustomStatusBar(wxFrame):
     def __init__(self, parent):
         wxFrame.__init__(self, parent, -1, 'Test Custom StatusBar',
                          wxPyDefaultPosition, wxSize(500, 300))
-        wxWindow(self, -1)
+        wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 
         self.sb = CustomStatusBar(self)
         self.SetStatusBar(self.sb)
@@ -374,9 +393,9 @@ class TestToolBar(wxFrame):
                          wxPyDefaultPosition, wxSize(500, 300))
         self.log = log
 
-        wxWindow(self, -1)
+        wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
 
-        tb = self.CreateToolBar()
+        tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER)
         #tb = wxToolBar(self, -1, wxPyDefaultPosition, wxPyDefaultSize,
         #               wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
         #self.SetToolBar(tb)
@@ -451,7 +470,7 @@ class TestTreeCtrlPanel(wxPanel):
 
 
     def OnSize(self, event):
-        w,h = self.GetClientSize()
+        w,h = self.GetClientSizeTuple()
         self.tree.SetDimensions(0, 0, w, h)
 
 
@@ -598,7 +617,7 @@ class AppFrame(wxFrame):
     def WriteText(self, str):
         self.log.WriteText(str)
         if wxPlatform == '__WXMSW__':
-            w, h = self.log.GetClientSize()
+            w, h = self.log.GetClientSizeTuple()
             numLines = h/self.charHeight
             x, y = self.log.PositionToXY(self.log.GetLastPosition())
             self.log.ShowPosition(self.log.XYToPosition(x, y-numLines+1))
@@ -633,7 +652,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 +804,36 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.10  1998/12/16 22:12:47  RD
+# Tweaks needed to be able to build wxPython with wxGTK.
+#
+# Revision 1.9  1998/12/15 20:44:35  RD
+# Changed the import semantics from "from wxPython import *" to "from
+# wxPython.wx import *"  This is for people who are worried about
+# namespace pollution, they can use "from wxPython import wx" and then
+# prefix all the wxPython identifiers with "wx."
+#
+# Added wxTaskbarIcon for wxMSW.
+#
+# Made the events work for wxGrid.
+#
+# Added wxConfig.
+#
+# Added wxMiniFrame for wxGTK, (untested.)
+#
+# Changed many of the args and return values that were pointers to gdi
+# objects to references to reflect changes in the wxWindows API.
+#
+# Other assorted fixes and additions.
+#
+# 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