reopen app according to HIG

[wxWidgets.git] / wxPython / wx / lib / dialogs.py

diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index 5afbd634a2a82cfd03b4be2283273fcfea11b548..304ae1ccbe7f295f14fbc94274cce0d8b21b0395 100644 (file)
--- a/wxPython/wx/lib/dialogs.py
+++ b/wxPython/wx/lib/dialogs.py
@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------

-# Name:        wxPython.lib.dialogs
-# Purpose:     wxScrolledMessageDialog, wxMultipleChoiceDialog and
+# Name:        wx.lib.dialogs
+# Purpose:     ScrolledMessageDialog, MultipleChoiceDialog and

 #              function wrappers for the common dialogs by Kevin Altis.
 #
 # Author:      Various
 #              function wrappers for the common dialogs by Kevin Altis.
 #
 # Author:      Various


@@ -10,50 +10,74 @@
 # Copyright:   (c) 2002 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 # Copyright:   (c) 2002 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------

+# 12/01/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for 2.5 compatability.
+#
+# 12/18/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o wxScrolledMessageDialog -> ScrolledMessageDialog
+# o wxMultipleChoiceDialog -> MultipleChoiceDialog
+#

 
 

-from wxPython import wx
-from layoutf import Layoutf
+import  wx
+import  layoutf

 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

-class wxScrolledMessageDialog(wx.wxDialog):
-    def __init__(self, parent, msg, caption, pos = wx.wxDefaultPosition, size = (500,300)):
-        wx.wxDialog.__init__(self, parent, -1, caption, pos, size)
+class ScrolledMessageDialog(wx.Dialog):
+    def __init__(self, parent, msg, caption, pos = wx.DefaultPosition, 
+                 size = (500,300)):
+        wx.Dialog.__init__(self, parent, -1, caption, pos, size)

         x, y = pos
         if x == -1 and y == -1:
         x, y = pos
         if x == -1 and y == -1:

-            self.CenterOnScreen(wx.wxBOTH)
-        text = wx.wxTextCtrl(self, -1, msg, wx.wxDefaultPosition,
-                             wx.wxDefaultSize,
-                             wx.wxTE_MULTILINE | wx.wxTE_READONLY)
-        ok = wx.wxButton(self, wx.wxID_OK, "OK")
-        text.SetConstraints(Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok)))
-        ok.SetConstraints(Layoutf('b=b5#1;x%w50#1;w!80;h!25', (self,)))
+            self.CenterOnScreen(wx.BOTH)
+
+        text = wx.TextCtrl(self, -1, msg, wx.DefaultPosition, wx.DefaultSize,
+                           wx.TE_MULTILINE | wx.TE_READONLY)
+
+        ok = wx.Button(self, wx.ID_OK, "OK")
+        lc = layoutf.Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok)) 
+        text.SetConstraints(lc)
+
+        lc = layoutf.Layoutf('b=b5#1;x%w50#1;w!80;h!25', (self,))
+        ok.SetConstraints(lc)

         self.SetAutoLayout(1)
         self.Layout()
 
 
         self.SetAutoLayout(1)
         self.Layout()
 
 

-class wxMultipleChoiceDialog(wx.wxDialog):
-    def __init__(self, parent, msg, title, lst, pos = wx.wxDefaultPosition,
-                 size = (200,200), style = wx.wxDEFAULT_DIALOG_STYLE):
-        wx.wxDialog.__init__(self, parent, -1, title, pos, size, style)
+class MultipleChoiceDialog(wx.Dialog):
+    def __init__(self, parent, msg, title, lst, pos = wx.DefaultPosition,
+                 size = (200,200), style = wx.DEFAULT_DIALOG_STYLE):
+        wx.Dialog.__init__(self, parent, -1, title, pos, size, style)
+        

         x, y = pos
         if x == -1 and y == -1:
         x, y = pos
         if x == -1 and y == -1:

-            self.CenterOnScreen(wx.wxBOTH)
-        dc = wx.wxClientDC(self)
+            self.CenterOnScreen(wx.BOTH)
+
+        dc = wx.ClientDC(self)

         height = 0
         for line in msg.splitlines():
             height = height + dc.GetTextExtent(line)[1] + 2
         height = 0
         for line in msg.splitlines():
             height = height + dc.GetTextExtent(line)[1] + 2

-        stat = wx.wxStaticText(self, -1, msg)
-        self.lbox = wx.wxListBox(self, 100, wx.wxDefaultPosition,
-                                 wx.wxDefaultSize, lst, wx.wxLB_MULTIPLE)
-        ok = wx.wxButton(self, wx.wxID_OK, "OK")
-        cancel = wx.wxButton(self, wx.wxID_CANCEL, "Cancel")
-        stat.SetConstraints(Layoutf('t=t10#1;l=l5#1;r=r5#1;h!%d' % (height,),
-                                   (self,)))
-        self.lbox.SetConstraints(Layoutf('t=b10#2;l=l5#1;r=r5#1;b=t5#3',
-                                 (self, stat, ok)))
-        ok.SetConstraints(Layoutf('b=b5#1;x%w25#1;w!80;h!25', (self,)))
-        cancel.SetConstraints(Layoutf('b=b5#1;x%w75#1;w!80;h!25', (self,)))
+
+        stat = wx.StaticText(self, -1, msg)
+        self.lbox = wx.ListBox(self, 100, wx.DefaultPosition, wx.DefaultSize, 
+                               lst, wx.LB_MULTIPLE)
+
+        ok = wx.Button(self, wx.ID_OK, "OK")
+        cancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
+        lc = layoutf.Layoutf('t=t10#1;l=l5#1;r=r5#1;h!%d' % (height,), (self,)) 
+        stat.SetConstraints(lc)
+
+        lc = layoutf.Layoutf('t=b10#2;l=l5#1;r=r5#1;b=t5#3', (self, stat, ok)) 
+        self.lbox.SetConstraints(lc)
+
+        lc = layoutf.Layoutf('b=b5#1;x%w25#1;w!80;h!25', (self,))
+        ok.SetConstraints(lc)
+
+        lc = layoutf.Layoutf('b=b5#1;x%w75#1;w!80;h!25', (self,))
+        cancel.SetConstraints(lc)
+        

         self.SetAutoLayout(1)
         self.lst = lst
         self.Layout()
         self.SetAutoLayout(1)
         self.lst = lst
         self.Layout()


@@ -64,10 +88,11 @@ class wxMultipleChoiceDialog(wx.wxDialog):
     def GetValueString(self):
         sel = self.lbox.GetSelections()
         val = []
     def GetValueString(self):
         sel = self.lbox.GetSelections()
         val = []

+

         for i in sel:
             val.append(self.lst[i])
         for i in sel:
             val.append(self.lst[i])

-        return tuple(val)

 
 

+        return tuple(val)

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -102,45 +127,47 @@ rev 2:
 class DialogResults:
     def __init__(self, returned):
         self.returned = returned
 class DialogResults:
     def __init__(self, returned):
         self.returned = returned

-        self.accepted = returned in (wx.wxID_OK, wx.wxID_YES)
+        self.accepted = returned in (wx.ID_OK, wx.ID_YES)

         self.returnedString = returnedString(returned)
 
     def __repr__(self):
         return str(self.__dict__)
 
 def returnedString(ret):
         self.returnedString = returnedString(returned)
 
     def __repr__(self):
         return str(self.__dict__)
 
 def returnedString(ret):

-    if ret == wx.wxID_OK:
+    if ret == wx.ID_OK:

         return "Ok"
         return "Ok"

-    elif ret == wx.wxID_CANCEL:
+    elif ret == wx.ID_CANCEL:

         return "Cancel"
         return "Cancel"

-    elif ret == wx.wxID_YES:
+    elif ret == wx.ID_YES:

         return "Yes"
         return "Yes"

-    elif ret == wx.wxID_NO:
+    elif ret == wx.ID_NO:

         return "No"
 
 
         return "No"
 
 

-# findDialog was created before wxPython got a Find/Replace dialog
-# but it may be instructive as to how a function wrapper can
-# be added for your own custom dialogs
-# this dialog is always modal, while wxFindReplaceDialog is
-# modeless and so doesn't lend itself to a function wrapper
+## findDialog was created before wxPython got a Find/Replace dialog
+## but it may be instructive as to how a function wrapper can
+## be added for your own custom dialogs
+## this dialog is always modal, while wxFindReplaceDialog is
+## modeless and so doesn't lend itself to a function wrapper

 def findDialog(parent=None, searchText='', wholeWordsOnly=0, caseSensitive=0):
 def findDialog(parent=None, searchText='', wholeWordsOnly=0, caseSensitive=0):

-    dlg = wx.wxDialog(parent, -1, "Find", wx.wxDefaultPosition, wx.wxSize(370, 120))
+    dlg = wx.Dialog(parent, -1, "Find", wx.DefaultPosition, (370, 120))

 
 

-    wx.wxStaticText(dlg, -1, 'Find what:', wx.wxPoint(7, 10))
-    wSearchText = wx.wxTextCtrl(dlg, -1, searchText,
-                                wx.wxPoint(70, 7), wx.wxSize(195, -1))
+    wx.StaticText(dlg, -1, 'Find what:', (7, 10))
+    wSearchText = wx.TextCtrl(dlg, -1, searchText, (70, 7), (195, -1))

     wSearchText.SetValue(searchText)
     wSearchText.SetValue(searchText)

-    wx.wxButton(dlg, wx.wxID_OK, "Find Next", wx.wxPoint(280, 5), wx.wxDefaultSize).SetDefault()
-    wx.wxButton(dlg, wx.wxID_CANCEL, "Cancel", wx.wxPoint(280, 35), wx.wxDefaultSize)
-    wWholeWord = wx.wxCheckBox(dlg, -1, 'Match whole word only',
-                            wx.wxPoint(7, 35), wx.wxDefaultSize, wx.wxNO_BORDER)
+    wx.Button(dlg, wx.ID_OK, "Find Next", (280, 5), wx.DefaultSize).SetDefault()
+    wx.Button(dlg, wx.ID_CANCEL, "Cancel", (280, 35), wx.DefaultSize)
+    wWholeWord = wx.CheckBox(dlg, -1, 'Match whole word only',
+                            (7, 35), wx.DefaultSize, wx.NO_BORDER)
+

     if wholeWordsOnly:
         wWholeWord.SetValue(1)
     if wholeWordsOnly:
         wWholeWord.SetValue(1)

-    wCase = wx.wxCheckBox(dlg, -1, 'Match case',
-                        wx.wxPoint(7, 55), wx.wxDefaultSize, wx.wxNO_BORDER)
+
+    wCase = wx.CheckBox(dlg, -1, 'Match case', (7, 55), wx.DefaultSize, wx.NO_BORDER)
+

     if caseSensitive:
         wCase.SetValue(1)
     if caseSensitive:
         wCase.SetValue(1)

+

     wSearchText.SetSelection(0, len(wSearchText.GetValue()))
     wSearchText.SetFocus()
 
     wSearchText.SetSelection(0, len(wSearchText.GetValue()))
     wSearchText.SetFocus()
 


@@ -154,28 +181,33 @@ def findDialog(parent=None, searchText='', wholeWordsOnly=0, caseSensitive=0):
 
 def colorDialog(parent=None, colorData=None, color=None):
     if colorData:
 
 def colorDialog(parent=None, colorData=None, color=None):
     if colorData:

-        dialog = wx.wxColourDialog(parent, colorData)
+        dialog = wx.ColourDialog(parent, colorData)

     else:
     else:

-        dialog = wx.wxColourDialog(parent)
+        dialog = wx.ColourDialog(parent)

         dialog.GetColourData().SetChooseFull(1)
         dialog.GetColourData().SetChooseFull(1)

+

     if color is not None:
         dialog.GetColourData().SetColour(color)
     if color is not None:
         dialog.GetColourData().SetColour(color)

+

     result = DialogResults(dialog.ShowModal())
     result.colorData = dialog.GetColourData()
     result.color = result.colorData.GetColour().Get()
     dialog.Destroy()
     return result
 
     result = DialogResults(dialog.ShowModal())
     result.colorData = dialog.GetColourData()
     result.color = result.colorData.GetColour().Get()
     dialog.Destroy()
     return result
 

-# it is easier to just duplicate the code than
-# try and replace color with colour in the result
+
+## it is easier to just duplicate the code than
+## try and replace color with colour in the result

 def colourDialog(parent=None, colourData=None, colour=None):
     if colourData:
 def colourDialog(parent=None, colourData=None, colour=None):
     if colourData:

-        dialog = wx.wxColourDialog(parent, colourData)
+        dialog = wx.ColourDialog(parent, colourData)

     else:
     else:

-        dialog = wx.wxColourDialog(parent)
+        dialog = wx.ColourDialog(parent)

         dialog.GetColourData().SetChooseFull(1)
         dialog.GetColourData().SetChooseFull(1)

+

     if colour is not None:
         dialog.GetColourData().SetColour(color)
     if colour is not None:
         dialog.GetColourData().SetColour(color)

+

     result = DialogResults(dialog.ShowModal())
     result.colourData = dialog.GetColourData()
     result.colour = result.colourData.GetColour().Get()
     result = DialogResults(dialog.ShowModal())
     result.colourData = dialog.GetColourData()
     result.colour = result.colourData.GetColour().Get()


@@ -185,11 +217,16 @@ def colourDialog(parent=None, colourData=None, colour=None):
 
 def fontDialog(parent=None, fontData=None, font=None):
     if fontData is None:
 
 def fontDialog(parent=None, fontData=None, font=None):
     if fontData is None:

-        fontData = wx.wxFontData()
+        fontData = wx.FontData()
+        fontData.SetColour(wx.BLACK)
+        fontData.SetInitialFont(wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT))
+

     if font is not None:
         aFontData.SetInitialFont(font)
     if font is not None:
         aFontData.SetInitialFont(font)

-    dialog = wx.wxFontDialog(parent, fontData)
+
+    dialog = wx.FontDialog(parent, fontData)

     result = DialogResults(dialog.ShowModal())
     result = DialogResults(dialog.ShowModal())

+

     if result.accepted:
         fontData = dialog.GetFontData()
         result.fontData = fontData
     if result.accepted:
         fontData = dialog.GetFontData()
         result.fontData = fontData


@@ -200,12 +237,14 @@ def fontDialog(parent=None, fontData=None, font=None):
         result.color = None
         result.colour = None
         result.font = None
         result.color = None
         result.colour = None
         result.font = None

+

     dialog.Destroy()
     return result
 
 
     dialog.Destroy()
     return result
 
 

-def textEntryDialog(parent=None, message='', title='', defaultText='', style=wx.wxOK | wx.wxCANCEL):
-    dialog = wx.wxTextEntryDialog(parent, message, title, defaultText, style)
+def textEntryDialog(parent=None, message='', title='', defaultText='',
+                    style=wx.OK | wx.CANCEL):
+    dialog = wx.TextEntryDialog(parent, message, title, defaultText, style)

     result = DialogResults(dialog.ShowModal())
     result.text = dialog.GetValue()
     dialog.Destroy()
     result = DialogResults(dialog.ShowModal())
     result.text = dialog.GetValue()
     dialog.Destroy()


@@ -213,31 +252,34 @@ def textEntryDialog(parent=None, message='', title='', defaultText='', style=wx.
 
 
 def messageDialog(parent=None, message='', title='Message box',
 
 
 def messageDialog(parent=None, message='', title='Message box',

-                  aStyle = wx.wxOK | wx.wxCANCEL | wx.wxCENTRE,
-                  pos=wx.wxDefaultPosition):
-    dialog = wx.wxMessageDialog(parent, message, title, aStyle, pos)
+                  aStyle = wx.OK | wx.CANCEL | wx.CENTRE,
+                  pos=wx.DefaultPosition):
+    dialog = wx.MessageDialog(parent, message, title, aStyle, pos)

     result = DialogResults(dialog.ShowModal())
     dialog.Destroy()
     return result
 
 
     result = DialogResults(dialog.ShowModal())
     dialog.Destroy()
     return result
 
 

-# KEA alerts are common, so I'm providing a class rather than
-# requiring the user code to set up the right icons and buttons
-# the with messageDialog function
-def alertDialog(parent=None, message='', title='Alert', pos=wx.wxDefaultPosition):
-    return messageDialog(parent, message, title, wx.wxICON_EXCLAMATION | wx.wxOK, pos)
+## KEA: alerts are common, so I'm providing a class rather than
+## requiring the user code to set up the right icons and buttons
+## the with messageDialog function
+def alertDialog(parent=None, message='', title='Alert', pos=wx.DefaultPosition):
+    return messageDialog(parent, message, title, wx.ICON_EXCLAMATION | wx.OK, pos)
+

 
 

+def scrolledMessageDialog(parent=None, message='', title='', pos=wx.DefaultPosition,
+                          size=(500,300)):

 
 

-def scrolledMessageDialog(parent=None, message='', title='', pos=wx.wxDefaultPosition, size=(500,300)):
-    dialog = wxScrolledMessageDialog(parent, message, title, pos, size)
+    dialog = ScrolledMessageDialog(parent, message, title, pos, size)

     result = DialogResults(dialog.ShowModal())
     dialog.Destroy()
     return result
 
 
 def fileDialog(parent=None, title='Open', directory='', filename='', wildcard='*.*',
     result = DialogResults(dialog.ShowModal())
     dialog.Destroy()
     return result
 
 
 def fileDialog(parent=None, title='Open', directory='', filename='', wildcard='*.*',

-                style=wx.wxOPEN | wx.wxMULTIPLE):
-    dialog = wx.wxFileDialog(parent, title, directory, filename, wildcard, style)
+               style=wx.OPEN | wx.MULTIPLE):
+
+    dialog = wx.FileDialog(parent, title, directory, filename, wildcard, style)

     result = DialogResults(dialog.ShowModal())
     if result.accepted:
         result.paths = dialog.GetPaths()
     result = DialogResults(dialog.ShowModal())
     if result.accepted:
         result.paths = dialog.GetPaths()


@@ -247,24 +289,25 @@ def fileDialog(parent=None, title='Open', directory='', filename='', wildcard='*
     return result
 
 
     return result
 
 

-# openFileDialog and saveFileDialog are convenience functions
-# they represent the most common usages of the fileDialog
-# with the most common style options
+## openFileDialog and saveFileDialog are convenience functions
+## they represent the most common usages of the fileDialog
+## with the most common style options

 def openFileDialog(parent=None, title='Open', directory='', filename='',
 def openFileDialog(parent=None, title='Open', directory='', filename='',

-                    wildcard='All Files (*.*)|*.*',
-                    style=wx.wxOPEN | wx.wxMULTIPLE):
+                   wildcard='All Files (*.*)|*.*',
+                   style=wx.OPEN | wx.MULTIPLE):

     return fileDialog(parent, title, directory, filename, wildcard, style)
 
 
 def saveFileDialog(parent=None, title='Save', directory='', filename='',
     return fileDialog(parent, title, directory, filename, wildcard, style)
 
 
 def saveFileDialog(parent=None, title='Save', directory='', filename='',

-                    wildcard='All Files (*.*)|*.*',
-                    style=wx.wxSAVE | wx.wxHIDE_READONLY | wx.wxOVERWRITE_PROMPT):
+                   wildcard='All Files (*.*)|*.*',
+                   style=wx.SAVE | wx.HIDE_READONLY | wx.OVERWRITE_PROMPT):

     return fileDialog(parent, title, directory, filename, wildcard, style)
 
 
 def dirDialog(parent=None, message='Choose a directory', path='', style=0,
     return fileDialog(parent, title, directory, filename, wildcard, style)
 
 
 def dirDialog(parent=None, message='Choose a directory', path='', style=0,

-                pos=wx.wxDefaultPosition, size=wx.wxDefaultSize):
-    dialog = wx.wxDirDialog(parent, message, path, style, pos, size)
+              pos=wx.DefaultPosition, size=wx.DefaultSize):
+
+    dialog = wx.DirDialog(parent, message, path, style, pos, size)

     result = DialogResults(dialog.ShowModal())
     if result.accepted:
         result.path = dialog.GetPath()
     result = DialogResults(dialog.ShowModal())
     if result.accepted:
         result.path = dialog.GetPath()


@@ -276,21 +319,19 @@ def dirDialog(parent=None, message='Choose a directory', path='', style=0,
 directoryDialog = dirDialog
 
 
 directoryDialog = dirDialog
 
 

-def singleChoiceDialog(parent=None, message='', title='', lst=[],
-                  style=wx.wxOK | wx.wxCANCEL | wx.wxCENTRE):
-    dialog = wx.wxSingleChoiceDialog(parent,
-                                    message,
-                                    title,
-                                    lst,
-                                    style)
+def singleChoiceDialog(parent=None, message='', title='', lst=[], 
+                       style=wx.OK | wx.CANCEL | wx.CENTRE):
+    dialog = wx.SingleChoiceDialog(parent, message, title, lst, style)

     result = DialogResults(dialog.ShowModal())
     result.selection = dialog.GetStringSelection()
     dialog.Destroy()
     return result
 
 
     result = DialogResults(dialog.ShowModal())
     result.selection = dialog.GetStringSelection()
     dialog.Destroy()
     return result
 
 

-def multipleChoiceDialog(parent=None, message='', title='', lst=[], pos=wx.wxDefaultPosition, size=(200,200)):
-    dialog = wxMultipleChoiceDialog(parent, message, title, lst, pos, size)
+def multipleChoiceDialog(parent=None, message='', title='', lst=[], pos=wx.DefaultPosition, 
+                         size=(200,200)):
+
+    dialog = MultipleChoiceDialog(parent, message, title, lst, pos, size)

     result = DialogResults(dialog.ShowModal())
     result.selection = dialog.GetValueString()
     dialog.Destroy()
     result = DialogResults(dialog.ShowModal())
     result.selection = dialog.GetValueString()
     dialog.Destroy()


@@ -298,14 +339,16 @@ def multipleChoiceDialog(parent=None, message='', title='', lst=[], pos=wx.wxDef
 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':

-    class MyApp(wx.wxApp):
+    #import os
+    #print os.getpid()
+    
+    class MyApp(wx.App):

 
         def OnInit(self):
 
         def OnInit(self):

-            frame = wx.wxFrame(wx.NULL, -1, "Dialogs", size=(400, 200))
-            panel = wx.wxPanel(frame, -1)
+            self.frame = frame = wx.Frame(None, -1, "Dialogs", size=(400, 200))
+            panel = wx.Panel(frame, -1)

             self.panel = panel
 
             self.panel = panel
 

-            frame.Show(1)

 
             dialogNames = [
                 'alertDialog',
 
             dialogNames = [
                 'alertDialog',


@@ -322,16 +365,27 @@ if __name__ == '__main__':
                 'singleChoiceDialog',
                 'textEntryDialog',
             ]
                 'singleChoiceDialog',
                 'textEntryDialog',
             ]

-            self.nameList = wx.wxListBox(panel, -1, (0, 0), (130, 180), dialogNames, style=wx.wxLB_SINGLE)
-            wx.EVT_LISTBOX(panel, self.nameList.GetId(), self.OnNameListSelected)

 
 

-            tstyle = wx.wxTE_RICH2 | wx.wxTE_PROCESS_TAB | wx.wxTE_MULTILINE
-            self.text1 = wx.wxTextCtrl(panel, -1, pos=(150, 0), size=(200, 180), style=tstyle)
+            self.nameList = wx.ListBox(panel, -1,
+                                       size=(130, 180),
+                                       choices=dialogNames,
+                                       style=wx.LB_SINGLE)
+            self.Bind(wx.EVT_LISTBOX, self.OnNameListSelected, self.nameList)

 
 

-            self.SetTopWindow(frame)
+            tstyle = wx.TE_RICH2 | wx.TE_PROCESS_TAB | wx.TE_MULTILINE
+            self.text1 = wx.TextCtrl(panel, -1, size=(200, 180), style=tstyle)
+
+            sizer = wx.BoxSizer(wx.HORIZONTAL)
+            sizer.Add(self.nameList, 0, wx.EXPAND|wx.ALL, 20)
+            sizer.Add(self.text1, 1,  wx.EXPAND|wx.ALL, 20)
+
+            panel.SetSizer(sizer)

 
 

+            self.SetTopWindow(frame)
+            frame.Show(1)

             return 1
 
             return 1
 

+

         def OnNameListSelected(self, evt):
             import pprint
             sel = evt.GetString()
         def OnNameListSelected(self, evt):
             import pprint
             sel = evt.GetString()


@@ -351,8 +405,8 @@ if __name__ == '__main__':
                 result = fontDialog()
             elif sel == 'messageDialog':
                 result = messageDialog(None, 'Hello from Python and wxPython!',
                 result = fontDialog()
             elif sel == 'messageDialog':
                 result = messageDialog(None, 'Hello from Python and wxPython!',

-                          'A Message Box', wx.wxOK | wx.wxICON_INFORMATION)
-                          #wx.wxYES_NO | wx.wxNO_DEFAULT | wx.wxCANCEL | wx.wxICON_INFORMATION)
+                          'A Message Box', wx.OK | wx.ICON_INFORMATION)
+                          #wx.YES_NO | wx.NO_DEFAULT | wx.CANCEL | wx.ICON_INFORMATION)

                 #result = messageDialog(None, 'message', 'title')
             elif sel == 'multipleChoiceDialog':
                 result = multipleChoiceDialog(None, "message", "title", ['one', 'two', 'three'])
                 #result = messageDialog(None, 'message', 'title')
             elif sel == 'multipleChoiceDialog':
                 result = multipleChoiceDialog(None, "message", "title", ['one', 'two', 'three'])


@@ -381,5 +435,7 @@ if __name__ == '__main__':
                 #self.text1.SetValue(pprint.pformat(result.__dict__))
                 self.text1.SetValue(str(result))
 
                 #self.text1.SetValue(pprint.pformat(result.__dict__))
                 self.text1.SetValue(str(result))
 

-    app = MyApp(0)
+    app = MyApp(True)

     app.MainLoop()
     app.MainLoop()

+
+