In GetPath(), don't append separator if there's already one at the end

[wxWidgets.git] / wxPython / demo / wxDialog.py

diff --git a/wxPython/demo/wxDialog.py b/wxPython/demo/wxDialog.py
index f7a2cf1adf7d52c24190738dae501a8adfe40aff..8d614756e15a66835ddad75ffd546ec0cf74cc4e 100644 (file)
--- a/wxPython/demo/wxDialog.py
+++ b/wxPython/demo/wxDialog.py
@@ -4,11 +4,50 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):

-    win = wxDialog(frame, -1, "This is a wxDialog", wxDefaultPosition, wxSize(350, 200))
+    win = wxDialog(frame, -1, "This is a wxDialog", size=wxSize(350, 200), style=wxCAPTION)

 
 

-    wxStaticText(win, -1, "This is a wxDialog", wxPoint(20, 20))
-    wxButton(win, wxID_OK,     " OK ", wxPoint(75, 120), wxDefaultSize).SetDefault()
-    wxButton(win, wxID_CANCEL, " Cancel ", wxPoint(200, 120), wxDefaultSize)
+    sizer = wxBoxSizer(wxVERTICAL)
+
+    label = wxStaticText(win, -1, "This is a wxDialog")
+    sizer.Add(label, 0, wxALIGN_CENTRE|wxALL, 5)
+
+    box = wxBoxSizer(wxHORIZONTAL)
+
+    label = wxStaticText(win, -1, "Field #1:")
+    box.Add(label, 0, wxALIGN_CENTRE|wxALL, 5)
+
+    text = wxTextCtrl(win, -1, "", size=(80,-1))
+    box.Add(text, 1, wxALIGN_CENTRE|wxALL, 5)
+
+    sizer.AddSizer(box, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5)
+
+    box = wxBoxSizer(wxHORIZONTAL)
+
+    label = wxStaticText(win, -1, "Field #2:")
+    box.Add(label, 0, wxALIGN_CENTRE|wxALL, 5)
+
+    text = wxTextCtrl(win, -1, "", size=(80,-1))
+    box.Add(text, 1, wxALIGN_CENTRE|wxALL, 5)
+
+    sizer.AddSizer(box, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5)
+
+    line = wxStaticLine(win, -1, size=(20,-1), style=wxLI_HORIZONTAL)
+    sizer.Add(line, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxTOP, 5)
+
+    box = wxBoxSizer(wxHORIZONTAL)
+
+    btn = wxButton(win, wxID_OK, " OK ")
+    btn.SetDefault()
+    box.Add(btn, 0, wxALIGN_CENTRE|wxALL, 5)
+
+    btn = wxButton(win, wxID_CANCEL, " Cancel ")
+    box.Add(btn, 0, wxALIGN_CENTRE|wxALL, 5)
+
+    sizer.AddSizer(box, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5)
+
+    win.SetSizer(sizer)
+    win.SetAutoLayout(true)
+    sizer.Fit(win)

 
     val = win.ShowModal()
     if val == wxID_OK:
 
     val = win.ShowModal()
     if val == wxID_OK: