wxPython 2.0b9, second phase (gtk)

[wxWidgets.git] / utils / wxPython / tests / test4.py

diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py
index 001a7d26deb317ed5794127065ae8d70c8451431..89b94ebe2eefb70f88591a2713655ba2cfb8caf4 100644 (file)
--- a/utils/wxPython/tests/test4.py
+++ b/utils/wxPython/tests/test4.py
@@ -22,11 +22,11 @@ class TestSimpleControlsDlg(wxDialog):
     def __init__(self, parent, log):
         self.log = log
         wxDialog.__init__(self, parent, -1, "Test Simple Controls",
     def __init__(self, parent, log):
         self.log = log
         wxDialog.__init__(self, parent, -1, "Test Simple Controls",

-                          wxDefaultPosition, wxSize(350, 350))
+                          wxDefaultPosition, wxSize(350, 400))

 
 
 
 

-        sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
-                      'six', 'seven', 'eight']
+        sampleList = ["zero", "one", "two", "three", "four", "five",
+                      "six", "seven", "eight", "nine", "ten"]

 
         y_pos = 5
         delta = 25
 
         y_pos = 5
         delta = 25


@@ -41,7 +41,7 @@ class TestSimpleControlsDlg(wxDialog):
         y_pos = y_pos + delta
 
         rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(80, y_pos), wxDefaultSize,
         y_pos = y_pos + delta
 
         rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(80, y_pos), wxDefaultSize,

-                        sampleList, 3, wxRA_HORIZONTAL| wxNO_BORDER)
+                        sampleList, 3, wxRA_SPECIFY_COLS | wxNO_BORDER)

         EVT_RADIOBOX(self, 30, self.EvtRadioBox)
         width, height = rb.GetSizeTuple()
         y_pos = y_pos + height + 5
         EVT_RADIOBOX(self, 30, self.EvtRadioBox)
         width, height = rb.GetSizeTuple()
         y_pos = y_pos + height + 5


@@ -250,10 +250,9 @@ class ColoredPanel(wxWindow):
 
 class TestNotebookWindow(wxFrame):
     def __init__(self, parent, log):
 
 class TestNotebookWindow(wxFrame):
     def __init__(self, parent, log):

-        wxFrame.__init__(self, parent, -1, 'Test wxNotebook',
-                         wxDefaultPosition, wxDefaultSize)
+        wxFrame.__init__(self, parent, -1, 'Test wxNotebook')

 
 

-        nb = wxNotebook(self, -1)
+        nb = wxNotebook(self, -1, wxPoint(0,0), self.GetClientSize())

 
         win = ColoredPanel(nb, wxBLUE)
         nb.AddPage(win, "Blue")
 
         win = ColoredPanel(nb, wxBLUE)
         nb.AddPage(win, "Blue")


@@ -295,9 +294,8 @@ class TestNotebookWindow(wxFrame):
         win = ColoredPanel(nb, wxNamedColour('INDIAN RED'))
         nb.AddPage(win, "INDIAN RED")
 
         win = ColoredPanel(nb, wxNamedColour('INDIAN RED'))
         nb.AddPage(win, "INDIAN RED")
 

-

         nb.SetSelection(0)
         nb.SetSelection(0)

-        self.SetSize(wxSize(350, 300))  # force a redraw so the notebook will draw
+        self.SetSize(wxSize(350, 300))

 
 
     def OnCloseWindow(self, event):
 
 
     def OnCloseWindow(self, event):


@@ -518,8 +516,8 @@ class TestListCtrlPanel(wxPanel):
                                wxLC_REPORT|wxSUNKEN_BORDER)
         self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
 
                                wxLC_REPORT|wxSUNKEN_BORDER)
         self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
 

-        self.list.SetToolTip(wxToolTip("This is a ToolTip!"))
-        wxToolTip_Enable(true)
+        #self.list.SetToolTip(wxToolTip("This is a ToolTip!"))
+        #wxToolTip_Enable(true)

 
         self.list.InsertColumn(0, "Column 0")
         self.list.InsertColumn(1, "Column 1")
 
         self.list.InsertColumn(0, "Column 0")
         self.list.InsertColumn(1, "Column 1")


@@ -896,7 +894,7 @@ class AppFrame(wxFrame):
 
 
     def OnTestPageSetupDlg(self, event):
 
 
     def OnTestPageSetupDlg(self, event):

-        data = wxPageSetupData()
+        data = wxPageSetupDialogData()

         data.SetMarginTopLeft(wxPoint(50,50))
         data.SetMarginBottomRight(wxPoint(50,50))
         dlg = wxPageSetupDialog(self, data)
         data.SetMarginTopLeft(wxPoint(50,50))
         data.SetMarginBottomRight(wxPoint(50,50))
         dlg = wxPageSetupDialog(self, data)


@@ -908,7 +906,7 @@ class AppFrame(wxFrame):
         dlg.Destroy()
 
     def OnTestPrintDlg(self, event):
         dlg.Destroy()
 
     def OnTestPrintDlg(self, event):

-        data = wxPrintData()
+        data = wxPrintDialogData()

         data.EnablePrintToFile(true)
         data.EnablePageNumbers(true)
         data.EnableSelection(true)
         data.EnablePrintToFile(true)
         data.EnablePageNumbers(true)
         data.EnableSelection(true)


@@ -1000,6 +998,22 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
 #----------------------------------------------------------------------------
 #
 # $Log$

+# Revision 1.16  1999/04/30 03:29:54  RD
+# wxPython 2.0b9, first phase (win32)
+# Added gobs of stuff, see wxPython/README.txt for details
+#
+# Revision 1.15.2.1  1999/03/16 06:05:50  RD
+#
+# wxPython 2.0b7
+#
+# Revision 1.15  1999/03/05 07:23:42  RD
+#
+# Minor wxPython changes for wxWin 2.0
+#
+# Revision 1.14  1999/02/27 04:20:50  RD
+#
+# minor tweaks for testing
+#

 # Revision 1.13  1999/02/20 09:04:44  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 # window handle.  If you can get the window handle into the python code,
 # Revision 1.13  1999/02/20 09:04:44  RD
 # Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
 # window handle.  If you can get the window handle into the python code,