little tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/wxMiniFrame.py b/wxPython/demo/wxMiniFrame.py
index f3cd53a40a2d3f3a9eaa3bc02e62a3b45c639dba..3a5f66f5eed7c3d53c7ee187687064bad07ab290 100644 (file)
--- a/wxPython/demo/wxMiniFrame.py
+++ b/wxPython/demo/wxMiniFrame.py
@@ -22,7 +22,7 @@ class MyMiniFrame(wxMiniFrame):
 
 def runTest(frame, nb, log):
     win = MyMiniFrame(frame, -1, "This is a wxMiniFrame",
 
 def runTest(frame, nb, log):
     win = MyMiniFrame(frame, -1, "This is a wxMiniFrame",

-                      wxDefaultPosition, wxSize(200, 200),
+                      (250, 250), (200, 200),

                       wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ)
     frame.otherWin = win
     win.Show(true)
                       wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ)
     frame.otherWin = win
     win.Show(true)

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 4b01bdb564927d8392a2938fb347a248e747c6af..31c9b763916096fdf2c5f51009cb7af155e01881 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -476,6 +476,7 @@ enum {
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,

+    wxNB_MULTILINE,

 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,