A bit of cleanup and etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-11-14 18:43:55 +00:00
parent c70fd24fa8
commit 80f7e6500b
4 changed files with 6 additions and 7 deletions

View File

@@ -10,7 +10,6 @@ def runTest(frame, nb, log):
dlg = wxMultipleChoiceDialog(frame, dlg = wxMultipleChoiceDialog(frame,
"Pick some from\n this list\nblah blah...", "Pick some from\n this list\nblah blah...",
"m.s.d.", lst) "m.s.d.", lst)
dlg.CenterOnScreen(wxBOTH)
if (dlg.ShowModal() == wxID_OK): if (dlg.ShowModal() == wxID_OK):
print "Selection:", dlg.GetValue(), " -> ", dlg.GetValueString() print "Selection:", dlg.GetValue(), " -> ", dlg.GetValueString()

View File

@@ -34,9 +34,6 @@ class TestPopup(wxPopupWindow):
def OnMouseLeftDown(self, evt): def OnMouseLeftDown(self, evt):
self.ldPos = evt.GetEventObject().ClientToScreen(evt.GetPosition()) self.ldPos = evt.GetEventObject().ClientToScreen(evt.GetPosition())
## if wxPlatform == "__WXMSW__": # this is weird...
## self.wPos = self.GetParent().ClientToScreen(self.GetPosition())
## else:
self.wPos = self.GetPosition() self.wPos = self.GetPosition()
self.CaptureMouse() self.CaptureMouse()

View File

@@ -8,7 +8,6 @@ def runTest(frame, nb, log):
f = open("Main.py", "r") f = open("Main.py", "r")
msg = f.read() msg = f.read()
dlg = wxScrolledMessageDialog(frame, msg, "message test") dlg = wxScrolledMessageDialog(frame, msg, "message test")
dlg.CenterOnScreen(wxBOTH)
dlg.ShowModal() dlg.ShowModal()
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------

View File

@@ -5,9 +5,11 @@ import string
class wxScrolledMessageDialog(wxDialog): class wxScrolledMessageDialog(wxDialog):
def __init__(self, parent, msg, caption, pos = wxDefaultPosition, size = (500,300)): def __init__(self, parent, msg, caption, pos = wxDefaultPosition, size = (500,300)):
wxDialog.__init__(self, parent, -1, caption, pos, size) wxDialog.__init__(self, parent, -1, caption, pos, size)
x, y = pos
if x == -1 and y == -1:
self.CenterOnScreen(wxBOTH)
text = wxTextCtrl(self, -1, msg, wxDefaultPosition, text = wxTextCtrl(self, -1, msg, wxDefaultPosition,
wxDefaultSize, wxDefaultSize,
wxTE_MULTILINE | wxTE_READONLY) wxTE_MULTILINE | wxTE_READONLY)
@@ -19,9 +21,11 @@ class wxScrolledMessageDialog(wxDialog):
class wxMultipleChoiceDialog(wxDialog): class wxMultipleChoiceDialog(wxDialog):
def __init__(self, parent, msg, title, lst, pos = wxDefaultPosition, size = (200,200)): def __init__(self, parent, msg, title, lst, pos = wxDefaultPosition, size = (200,200)):
wxDialog.__init__(self, parent, -1, title, pos, size) wxDialog.__init__(self, parent, -1, title, pos, size)
x, y = pos
if x == -1 and y == -1:
self.CenterOnScreen(wxBOTH)
dc = wxClientDC(self) dc = wxClientDC(self)
height = 0 height = 0
for line in string.split(msg,'\n'): for line in string.split(msg,'\n'):