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

Fixes and other changes to the demo and some library modules so they

Browse Source 
work better (or at all) on wxMac


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-08-13 23:59:08 +00:00
parent c50c32efd1
commit eb0f373c99
17 changed files with 133 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/demo/Main.py
View File

@@ -306,8 +306,8 @@ class wxPythonDemo(wxFrame):
self.treeMap = {}
self.tree = wxTreeCtrl(splitter, tID,
style=wxTR_HAS_BUTTONS |
wxTR_EDIT_LABELS |
wxTR_HAS_VARIABLE_ROW_HEIGHT)
wxTR_HAS_VARIABLE_ROW_HEIGHT
)
#self.tree.SetBackgroundColour(wxNamedColour("Pink"))
root = self.tree.AddRoot("wxPython Overview")

2
wxPython/demo/run.py
View File

@@ -33,7 +33,7 @@ class RunDemoApp(wxApp):
def __init__(self, name, module):
self.name = name
self.demoModule = module
wxApp.__init__(self, wxPlatform == "__WXMAC__")
wxApp.__init__(self, 0) ##wxPlatform == "__WXMAC__")
def OnInit(self):

2
wxPython/demo/wxArtProvider.py
View File

@@ -165,11 +165,13 @@ class TestPanel(wxPanel):
def OnSelectClient(self, evt):
self.log.write("OnSelectClient\n")
self.client = eval(evt.GetString())
self.getArt()
def OnSelectID(self, evt):
self.log.write("OnSelectID\n")
self.artid = eval(evt.GetString())
self.getArt()

5
wxPython/demo/wxCalendar.py
View File

@@ -62,7 +62,10 @@ class TestPanel(wxPanel):
monthlist = GetMonthList()
mID = NewId()
self.date = wxComboBox(self, mID, Month[start_month], wxPoint(100, 20), wxSize(90, -1), monthlist, wxCB_DROPDOWN)
self.date = wxComboBox(self, mID, "",
wxPoint(100, 20), wxSize(90, -1),
monthlist, wxCB_DROPDOWN)
self.date.SetSelection(start_month-1)
EVT_COMBOBOX(self, mID, self.EvtComboBox)
# set start month and year

7
wxPython/demo/wxFileDialog.py
View File

@@ -1,10 +1,15 @@
from wxPython.wx import *
import string
#---------------------------------------------------------------------------
wildcard = "Python source (*.py)|*.py|" \
"Compiled Python (*.pyc)|*.pyc|" \
"All files (*.*)|*.*"
def runTest(frame, nb, log):
dlg = wxFileDialog(frame, "Choose a file", ".", "", "*.*", wxOPEN|wxMULTIPLE)
dlg = wxFileDialog(frame, "Choose a file", "", "", wildcard, wxOPEN|wxMULTIPLE)
if dlg.ShowModal() == wxID_OK:
for path in dlg.GetPaths():
log.WriteText('You selected: %s\n' % path)

3
wxPython/demo/wxFontDialog.py
View File

@@ -8,8 +8,9 @@ def runTest(frame, nb, log):
data.EnableEffects(true)
font_colour = wxColour(255, 0, 0) # colour of font (red)
data.SetColour(font_colour) # set colour
print data.GetColour()
##print data.GetColour()
dlg = wxFontDialog(frame, data)
dlg.SetSize((250,250))
if dlg.ShowModal() == wxID_OK:
data = dlg.GetFontData()
font = data.GetChosenFont()

8
wxPython/demo/wxMenu.py
View File

@@ -19,6 +19,12 @@ class MyFrame(wxFrame):
self.CreateStatusBar()
self.SetStatusText("This is the statusbar")
tc = wxTextCtrl(self, -1, """
A bunch of bogus menus have been created for this frame. You
can play around with them to see how they behave and then
check the source for this sample to see how to implement them.
""", style=wxTE_READONLY|wxTE_MULTILINE)
# Prepare the menu bar
menuBar = wxMenuBar()
@@ -28,7 +34,7 @@ class MyFrame(wxFrame):
menu1.Append(102, "Venus", "")
menu1.Append(103, "Earth", "You may select Earth too")
menu1.AppendSeparator()
menu1.Append(104, "Exit", "Close this frame")
menu1.Append(104, "Close", "Close this frame")
# Add menu to the menu bar
menuBar.Append(menu1, "&Planets")

3
wxPython/demo/wxNotebook.py
View File

@@ -19,7 +19,8 @@ class TestNB(wxNotebook):
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.)",
"and if the platform supports it then the\n"
"tabs can be on any side of the notebook.",
wxPoint(10, 10))
st.SetForegroundColour(wxWHITE)
st.SetBackgroundColour(wxBLUE)

17
wxPython/demo/wxPopupWindow.py
View File

@@ -1,5 +1,12 @@
from wxPython.wx import *
havePopupWindow = 1
try:
wxPopupWindow
except NameError:
havePopupWindow = 0
wxPopupWindow = wxPopupTransientWindow = wxWindow
#---------------------------------------------------------------------------
class TestPopup(wxPopupWindow):
@@ -158,8 +165,14 @@ class TestPopupWithListbox(wxPopupWindow):
#---------------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
if havePopupWindow:
win = TestPanel(nb, log)
return win
else:
dlg = wxMessageDialog(frame, 'wxPopupWindow is not available on this platform.',
'Sorry', wxOK | wxICON_INFORMATION)
dlg.ShowModal()
dlg.Destroy()
#---------------------------------------------------------------------------

2
wxPython/demo/wxProgressDialog.py
View File

@@ -13,7 +13,7 @@ def runTest(frame, nb, log):
keepGoing = true
count = 0
while keepGoing and count <= max:
while keepGoing and count < max:
count = count + 1
wxSleep(1)

37
wxPython/demo/wxRadioBox.py
View File

@@ -3,6 +3,11 @@ from wxPython.wx import *
#---------------------------------------------------------------------------
RBOX1 = wxNewId()
RBOX2 = wxNewId()
RBUT1 = wxNewId()
RBUT2 = wxNewId()
class TestRadioButtons(wxPanel):
def __init__(self, parent, log):
self.log = log
@@ -12,20 +17,32 @@ class TestRadioButtons(wxPanel):
sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
'six', 'seven', 'eight']
rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(35, 30), wxDefaultSize,
sampleList, 3, wxRA_SPECIFY_COLS)
EVT_RADIOBOX(self, 30, self.EvtRadioBox)
sizer = wxBoxSizer(wxVERTICAL)
rb = wxRadioBox(self, RBOX1, "wxRadioBox",
wxDefaultPosition, wxDefaultSize,
sampleList, 2, wxRA_SPECIFY_COLS)
EVT_RADIOBOX(self, RBOX1, self.EvtRadioBox)
#rb.SetBackgroundColour(wxBLUE)
rb.SetToolTip(wxToolTip("This is a ToolTip!"))
#rb.SetLabel("wxRadioBox")
sizer.Add(rb, 0, wxALL, 20)
wxRadioButton(self, 32, "wxRadioButton", (235, 35))
wxRadioButton(self, 33, "wxRadioButton", (235, 55))
EVT_RADIOBUTTON(self, 32, self.EvtRadioButton)
EVT_RADIOBUTTON(self, 33, self.EvtRadioButton)
rb = wxRadioBox(self, 35, "", wxPoint(35, 120), wxDefaultSize,
rb = wxRadioBox(self, RBOX2, "", wxDefaultPosition, wxDefaultSize,
sampleList, 3, wxRA_SPECIFY_COLS | wxNO_BORDER)
EVT_RADIOBOX(self, 35, self.EvtRadioBox)
EVT_RADIOBOX(self, RBOX2, self.EvtRadioBox)
rb.SetToolTip(wxToolTip("This box has no label"))
sizer.Add(rb, 0, wxLEFT|wxRIGHT|wxBOTTOM, 20)
sizer.Add(wxStaticText(self, -1, "These are plain wxRadioButtons"),
0, wxLEFT|wxRIGHT, 20)
sizer.Add(wxRadioButton(self, RBUT1, "wxRadioButton 1"),
0, wxLEFT|wxRIGHT, 20)
sizer.Add(wxRadioButton(self, RBUT2, "wxRadioButton 2"),
0, wxLEFT|wxRIGHT, 20)
EVT_RADIOBUTTON(self, RBUT1, self.EvtRadioButton)
EVT_RADIOBUTTON(self, RBUT2, self.EvtRadioButton)
self.SetSizer(sizer)
def EvtRadioBox(self, event):

8
wxPython/demo/wxStatusBar.py
View File

@@ -71,12 +71,14 @@ class CustomStatusBar(wxStatusBar):
class TestCustomStatusBar(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, 'Test Custom StatusBar',
wxPoint(0,0), wxSize(500, 300))
wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
wxFrame.__init__(self, parent, -1, 'Test Custom StatusBar')
#wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
self.sb = CustomStatusBar(self, log)
self.SetStatusBar(self.sb)
tc = wxTextCtrl(self, -1, "", style=wxTE_READONLY|wxTE_MULTILINE)
self.SetSize((500, 300))
EVT_CLOSE(self, self.OnCloseWindow)
def OnCloseWindow(self, event):

18
wxPython/demo/wxToggleButton.py
View File

@@ -1,6 +1,12 @@
from wxPython.wx import *
haveToggleBtn = 1
try:
wxToggleButton
except NameError:
haveToggleBtn = 0
#----------------------------------------------------------------------
class TestPanel(wxPanel):
@@ -25,8 +31,16 @@ class TestPanel(wxPanel):
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
if haveToggleBtn:
win = TestPanel(nb, log)
return win
else:
dlg = wxMessageDialog(frame, 'wxToggleButton is not available on this platform.',
'Sorry', wxOK | wxICON_INFORMATION)
dlg.ShowModal()
dlg.Destroy()
#----------------------------------------------------------------------

11
wxPython/demo/wxToolBar.py
View File

@@ -54,11 +54,12 @@ class TestToolBar(wxFrame):
EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick) # Match all
EVT_TIMER(self, -1, self.OnClearSB)
tb.AddSeparator()
cbID = wxNewId()
tb.AddControl(wxComboBox(tb, cbID, "", choices=["", "This", "is a", "wxComboBox"],
size=(150,-1), style=wxCB_DROPDOWN))
EVT_COMBOBOX(self, cbID, self.OnCombo)
if wxPlatform != "__WXMAC__":
tb.AddSeparator()
cbID = wxNewId()
tb.AddControl(wxComboBox(tb, cbID, "", choices=["", "This", "is a", "wxComboBox"],
size=(150,-1), style=wxCB_DROPDOWN))
EVT_COMBOBOX(self, cbID, self.OnCombo)
tb.Realize()