don't confuse wxDF_UNICODETEXT and wxDF_TEXT

[wxWidgets.git] / wxPython / src / _window.i

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 83bccaaf2c359ad99b9d21bd668f850f028c8fcb..687bc7088da253814b9a403e3dea648892024a6d 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -187,6 +187,10 @@ Extra Styles
 ");
 
 
+MustHaveApp(wxWindow);
+MustHaveApp(wxWindow::FindFocus);
+MustHaveApp(wxWindow::GetCapture);
+MustHaveApp(wxWindow::GetClassDefaultAttributes);
 
 class wxWindow : public wxEvtHandler
 {
@@ -487,7 +491,7 @@ the borders, scrollbars, other decorations...)", "");
 
     
     DocStr(GetBestSize,
-           "This functions returns the best acceptable minimal size for the
+           "This function returns the best acceptable minimal size for the
 window, if applicable. For example, for a static text control, it will
 be the minimal size such that the control label is not truncated. For
 windows containing subwindows (suzh aswx.Panel), the size returned by
@@ -1432,12 +1436,13 @@ of how to call UpdateWindowUI from an idle function::
 
 
     DocStr(PopupMenu,
-           "Pops up the given menu at the specified coordinates, relative to this
-window, and returns control when the user has dismissed the menu. If a
-menu item is selected, the corresponding menu event is generated and
-will be processed as usual.", "");
-    %name(PopupMenuXY) bool PopupMenu(wxMenu *menu, int x, int y);
-    bool PopupMenu(wxMenu *menu, const wxPoint& pos);
+           "Pops up the given menu at the specified coordinates, relative to this window,
+and returns control when the user has dismissed the menu. If a menu item is
+selected, the corresponding menu event is generated and will be processed as
+usual.  If the default position is given then the current position of the
+mouse cursor will be used.", "");
+    %name(PopupMenuXY) bool PopupMenu(wxMenu *menu, int x=-1, int y=-1);
+    bool PopupMenu(wxMenu *menu, const wxPoint& pos=wxDefaultPosition);
 
 
 
@@ -1850,6 +1855,10 @@ non-None, the search will be limited to the given window
 hierarchy. The search is recursive in both cases.", "");
 
 
+MustHaveApp(wxFindWindowById);
+MustHaveApp(wxFindWindowByName);
+MustHaveApp(wxFindWindowByLabel);
+
 %inline %{
 wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) {
     return wxWindow::FindWindowById(id, parent);