fixed bug that caused wxHtmlWindow to segfault on html tables with cell(s) with rowsp...

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

diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py
index 2370a498ba14b2c1e2ffaf8caa67f2cf9ad13e9d..079c4a92159ce6f3cc1f60eed4128d640ac4c80b 100644 (file)
--- a/utils/wxPython/tests/test4.py
+++ b/utils/wxPython/tests/test4.py
@@ -22,7 +22,7 @@ class TestSimpleControlsDlg(wxDialog):
     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",
@@ -53,13 +53,13 @@ class TestSimpleControlsDlg(wxDialog):
         y_pos = y_pos + delta
 
         wxStaticText(self, -1, "wxComboBox", wxPoint(5, y_pos), wxSize(75, 18))
-        wxComboBox(self, 50, "default value", wxPoint(80, y_pos), wxSize(95, 20),
+        wxComboBox(self, 50, "default value", wxPoint(80, y_pos), wxSize(95, -1),
                    sampleList, wxCB_DROPDOWN)
         EVT_COMBOBOX(self, 50, self.EvtComboBox)
         y_pos = y_pos + delta
 
         wxStaticText(self, -1, "wxListBox", wxPoint(5, y_pos), wxSize(75, 18))
-        lb = wxListBox(self, 60, wxPoint(80, y_pos), wxDefaultSize,
+        lb = wxListBox(self, 60, wxPoint(80, y_pos), wxSize(95, 80),
                        sampleList, wxLB_SINGLE)
         EVT_LISTBOX(self, 60, self.EvtListBox)
         EVT_LISTBOX_DCLICK(self, 60, self.EvtListBoxDClick)
@@ -250,10 +250,9 @@ class ColoredPanel(wxWindow):
 
 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")
@@ -295,9 +294,8 @@ class TestNotebookWindow(wxFrame):
         win = ColoredPanel(nb, wxNamedColour('INDIAN RED'))
         nb.AddPage(win, "INDIAN RED")
 
-
         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):
@@ -518,8 +516,8 @@ class TestListCtrlPanel(wxPanel):
                                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")
@@ -896,7 +894,7 @@ class AppFrame(wxFrame):
 
 
     def OnTestPageSetupDlg(self, event):
-        data = wxPageSetupData()
+        data = wxPageSetupDialogData()
         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):
-        data = wxPrintData()
+        data = wxPrintDialogData()
         data.EnablePrintToFile(true)
         data.EnablePageNumbers(true)
         data.EnableSelection(true)
@@ -1000,7 +998,20 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------------
 #
 # $Log$
+# Revision 1.17  1999/08/05 05:06:50  RD
+# Some minor tweaks
+#
+# 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