Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -5,6 +5,7 @@ import ColorPanel
 | 
			
		||||
import GridSimple
 | 
			
		||||
import wxListCtrl
 | 
			
		||||
import wxScrolledWindow
 | 
			
		||||
import images
 | 
			
		||||
 | 
			
		||||
import sys
 | 
			
		||||
 | 
			
		||||
@@ -12,10 +13,14 @@ import sys
 | 
			
		||||
 | 
			
		||||
class TestNB(wxNotebook):
 | 
			
		||||
    def __init__(self, parent, id, log):
 | 
			
		||||
        wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
 | 
			
		||||
        wxNotebook.__init__(self, parent, id, style=
 | 
			
		||||
                            #0
 | 
			
		||||
                            wxNB_BOTTOM
 | 
			
		||||
                            #wxNB_LEFT
 | 
			
		||||
                            #wxNB_RIGHT
 | 
			
		||||
                            )
 | 
			
		||||
        self.log = log
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        win = self.makeColorPanel(wxBLUE)
 | 
			
		||||
        self.AddPage(win, "Blue")
 | 
			
		||||
        st = wxStaticText(win.win, -1,
 | 
			
		||||
@@ -26,6 +31,16 @@ class TestNB(wxNotebook):
 | 
			
		||||
        st.SetForegroundColour(wxWHITE)
 | 
			
		||||
        st.SetBackgroundColour(wxBLUE)
 | 
			
		||||
 | 
			
		||||
        # Show how to put an image on one of the notebook tabs,
 | 
			
		||||
        # first make the image list:
 | 
			
		||||
        il = wxImageList(16, 16)
 | 
			
		||||
        idx1 = il.Add(images.getSmilesBitmap())
 | 
			
		||||
        self.AssignImageList(il)
 | 
			
		||||
 | 
			
		||||
        # now put an image on the first tab we just created:
 | 
			
		||||
        self.SetPageImage(0, idx1)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        win = self.makeColorPanel(wxRED)
 | 
			
		||||
        self.AddPage(win, "Red")
 | 
			
		||||
 | 
			
		||||
@@ -94,28 +109,27 @@ def runTest(frame, nb, log):
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
overview = """\
 | 
			
		||||
This class represents a notebook control, which manages multiple windows with associated tabs.
 | 
			
		||||
 | 
			
		||||
To use the class, create a wxNotebook object and call AddPage or InsertPage, passing a window to be used as the page. Do not explicitly delete the window for a page that is currently managed by wxNotebook.
 | 
			
		||||
<html><body>
 | 
			
		||||
<h2>wxNotebook</h2>
 | 
			
		||||
<p>
 | 
			
		||||
This class represents a notebook control, which manages multiple
 | 
			
		||||
windows with associated tabs.
 | 
			
		||||
<p>
 | 
			
		||||
To use the class, create a wxNotebook object and call AddPage or
 | 
			
		||||
InsertPage, passing a window to be used as the page. Do not explicitly
 | 
			
		||||
delete the window for a page that is currently managed by wxNotebook.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
if __name__ == "__main__":
 | 
			
		||||
    app = wxPySimpleApp()
 | 
			
		||||
    frame = wxFrame(None, -1, "Test Notebook", size=(600, 400))
 | 
			
		||||
    win = TestNB(frame, -1, sys.stdout)
 | 
			
		||||
    frame.Show(true)
 | 
			
		||||
    app.MainLoop()
 | 
			
		||||
 | 
			
		||||
if __name__ == '__main__':
 | 
			
		||||
    import sys,os
 | 
			
		||||
    import run
 | 
			
		||||
    run.main(['', os.path.basename(sys.argv[0])])
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user