Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor updates, fixes, etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-01-31 21:07:04 +00:00
parent 9e46ac75de
commit eec92d76f8
49 changed files with 891 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
utils/wxPython/demo/.cvsignore
View File

@@ -2,4 +2,5 @@
.emacs.desktop
hangman_dict.txt
setup.bat
test.out
tmphtml.txt

6
utils/wxPython/demo/wxButton.py
View File

@@ -18,8 +18,10 @@ class TestPanel(wxPanel):
EVT_BUTTON(self, 20, self.OnClick)
bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
mask = wxMaskColour(bmp, wxBLUE)
bmp.SetMask(mask)
# the mask is still having troubles on win95/98...
#mask = wxMaskColour(bmp, wxBLUE)
#bmp.SetMask(mask)
wxBitmapButton(self, 30, bmp, wxPoint(140, 20),
wxSize(bmp.GetWidth()+10, bmp.GetHeight()+10))
EVT_BUTTON(self, 30, self.OnClick)

8
utils/wxPython/demo/wxHtmlWindow.py
View File

@@ -18,7 +18,7 @@ class MyHtmlWindow(wxHtmlWindow):
def OnLinkClicked(self, linkinfo):
self.log.WriteText('OnLinkClicked: %s\n' % linkinfo.GetHref())
# Virtuals in the base class have been renamed with base_ on the font.
# Virtuals in the base class have been renamed with base_ on the front.
self.base_OnLinkClicked(linkinfo)
@@ -26,6 +26,8 @@ class MyHtmlWindow(wxHtmlWindow):
self.log.WriteText('OnSetTitle: %s\n' % title)
self.base_OnSetTitle(title)
def __del__(self):
print 'MyHtmlWindow.__del__'
class TestHtmlPanel(wxPanel):
@@ -37,7 +39,6 @@ class TestHtmlPanel(wxPanel):
if not self.cwd:
self.cwd = os.getcwd()
self.html = MyHtmlWindow(self, -1, log)
self.html.SetRelatedFrame(frame, "wxPython: (A Demonstration) -- %s")
self.html.SetRelatedStatusBar(0)
@@ -86,6 +87,9 @@ class TestHtmlPanel(wxPanel):
self.OnShowDefault(None)
def __del__(self):
print 'TestHtmlPanel.__del__'
def OnShowDefault(self, event):

95
utils/wxPython/demo/wxNotebook.py
View File

@@ -8,55 +8,65 @@ import wxScrolledWindow
#----------------------------------------------------------------------------
def runTest(frame, nb, log):
class TestNB(wxNotebook):
def __init__(self, parent, id, log):
wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
self.log = log
testWin = wxNotebook(nb, -1, style=wxNB_BOTTOM)
win = ColorPanel.ColoredPanel(self, wxBLUE)
self.AddPage(win, "Blue")
st = wxStaticText(win, -1,
"You can put nearly any type of window here,\n"
"and the tabs can be on any side... (look below.)",
wxPoint(10, 10))
st.SetForegroundColour(wxWHITE)
st.SetBackgroundColour(wxBLUE)
win = ColorPanel.ColoredPanel(testWin, wxBLUE)
testWin.AddPage(win, "Blue")
st = wxStaticText(win, -1,
"You can put nearly any type of window here,\n"
"and the tabs can be on any side... (look below.)",
wxPoint(10, 10))
st.SetForegroundColour(wxWHITE)
st.SetBackgroundColour(wxBLUE)
win = ColorPanel.ColoredPanel(self, wxRED)
self.AddPage(win, "Red")
win = ColorPanel.ColoredPanel(testWin, wxRED)
testWin.AddPage(win, "Red")
win = wxScrolledWindow.MyCanvas(self)
self.AddPage(win, 'ScrolledWindow')
win = wxScrolledWindow.MyCanvas(testWin)
testWin.AddPage(win, 'ScrolledWindow')
win = ColorPanel.ColoredPanel(self, wxGREEN)
self.AddPage(win, "Green")
win = ColorPanel.ColoredPanel(testWin, wxGREEN)
testWin.AddPage(win, "Green")
win = wxGrid.TestGrid(self, log)
self.AddPage(win, "Grid")
win = wxGrid.TestGrid(testWin, log)
testWin.AddPage(win, "Grid")
win = wxListCtrl.TestListCtrlPanel(self, log)
self.AddPage(win, 'List')
win = wxListCtrl.TestListCtrlPanel(testWin, log)
testWin.AddPage(win, 'List')
win = ColorPanel.ColoredPanel(self, wxCYAN)
self.AddPage(win, "Cyan")
win = ColorPanel.ColoredPanel(testWin, wxCYAN)
testWin.AddPage(win, "Cyan")
win = ColorPanel.ColoredPanel(self, wxWHITE)
self.AddPage(win, "White")
win = ColorPanel.ColoredPanel(testWin, wxWHITE)
testWin.AddPage(win, "White")
win = ColorPanel.ColoredPanel(self, wxBLACK)
self.AddPage(win, "Black")
win = ColorPanel.ColoredPanel(testWin, wxBLACK)
testWin.AddPage(win, "Black")
win = ColorPanel.ColoredPanel(self, wxNamedColour('MIDNIGHT BLUE'))
self.AddPage(win, "MIDNIGHT BLUE")
win = ColorPanel.ColoredPanel(testWin, wxNamedColour('MIDNIGHT BLUE'))
testWin.AddPage(win, "MIDNIGHT BLUE")
win = ColorPanel.ColoredPanel(self, wxNamedColour('INDIAN RED'))
self.AddPage(win, "INDIAN RED")
win = ColorPanel.ColoredPanel(testWin, wxNamedColour('INDIAN RED'))
testWin.AddPage(win, "INDIAN RED")
EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(), self.OnPageChanged)
def OnPageChanged(self, event):
self.log.write('OnPageChanged\n')
event.Skip()
return testWin
#----------------------------------------------------------------------------
def runTest(frame, nb, log):
testWin = TestNB(nb, -1, log)
return testWin
#----------------------------------------------------------------------------
@@ -74,25 +84,4 @@ This class represents a notebook control, which manages multiple windows with as
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.
wxNotebook()
-------------------------
Default constructor.
wxNotebook(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size, long style = 0, const wxString& name = "notebook")
Constructs a notebook control.
Parameters
-------------------
parent = The parent window. Must be non-NULL.
id = The window identifier.
pos = The window position.
size = The window size.
style = The window style. Its value is a bit list of zero or more of wxTC_MULTILINE, wxTC_RIGHTJUSTIFY, wxTC_FIXEDWIDTH and wxTC_OWNERDRAW.
"""

9
utils/wxPython/demo/wxRadioBox.py
View File

@@ -7,6 +7,7 @@ class TestRadioButtons(wxPanel):
def __init__(self, parent, log):
self.log = log
wxPanel.__init__(self, parent, -1)
#self.SetBackgroundColour(wxBLUE)
sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
'six', 'seven', 'eight']
@@ -14,11 +15,15 @@ class TestRadioButtons(wxPanel):
rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(35, 30), wxDefaultSize,
sampleList, 3, wxRA_SPECIFY_COLS)
EVT_RADIOBOX(self, 30, self.EvtRadioBox)
#rb.SetBackgroundColour(wxBLUE)
rb.SetToolTip(wxToolTip("This is a ToolTip!"))
wxRadioButton(self, 32, "wxRadioButton", (235, 35))
wxRadioButton(self, 33, "wxRadioButton", (235, 55))
rb = wxRadioBox(self, 30, "", wxPoint(35, 120), wxDefaultSize,
rb = wxRadioBox(self, 35, "", wxPoint(35, 120), wxDefaultSize,
sampleList, 3, wxRA_SPECIFY_COLS | wxNO_BORDER)
EVT_RADIOBOX(self, 30, self.EvtRadioBox)
EVT_RADIOBOX(self, 35, self.EvtRadioBox)
def EvtRadioBox(self, event):

9
utils/wxPython/demo/wxScrolledWindow.py
View File

@@ -73,10 +73,19 @@ class MyCanvas(wxScrolledWindow):
for a in range(0, 360, 45):
dc.DrawRotatedText("Rotated text...", 300, 300, a)
dc.SetPen(wxTRANSPARENT_PEN)
dc.SetBrush(wxBLUE_BRUSH)
dc.DrawRectangle(50,500,50,50)
dc.DrawRectangle(100,500,50,50)
#from wxPython import dch
#dch.FillRect(dc, wxRect(50, 400, 50, 50), wxBLACK)
self.DrawSavedLines(dc)
dc.EndDrawing()
def DrawSavedLines(self, dc):
dc.SetPen(wxPen(wxNamedColour('MEDIUM FOREST GREEN'), 4))
for line in self.lines: