Added some more docstrings, and also a few little tweaks along the way.

[wxWidgets.git] / wxPython / src / msw / windows.py

diff --git a/wxPython/src/msw/windows.py b/wxPython/src/msw/windows.py
index d311cd5467c9fe85a9e365aaa54cb4c9cac54a99..0f00827fe1e338d137b99dc8d2687279920cf4c3 100644 (file)
--- a/wxPython/src/msw/windows.py
+++ b/wxPython/src/msw/windows.py
@@ -422,10 +422,6 @@ class Dialog(TopLevelWindow):
         """CreateButtonSizer(long flags) -> Sizer"""
         return _windows.Dialog_CreateButtonSizer(*args, **kwargs)
 
-    def SetModal(*args, **kwargs):
-        """SetModal(bool flag)"""
-        return _windows.Dialog_SetModal(*args, **kwargs)
-
     def IsModal(*args, **kwargs):
         """IsModal() -> bool"""
         return _windows.Dialog_IsModal(*args, **kwargs)
@@ -662,9 +658,10 @@ class SplitterWindow(core.Window):
         return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
-        __init__(Window parent, int id, Point point=DefaultPosition, 
-            Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow
+        __init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow
         """
+        if kwargs.has_key('point'): kwargs['pos'] = kwargs['point']
         newobj = _windows.new_SplitterWindow(*args, **kwargs)
         self.this = newobj.this
         self.thisown = 1
@@ -673,8 +670,8 @@ class SplitterWindow(core.Window):
 
     def Create(*args, **kwargs):
         """
-        Create(Window parent, int id, Point point=DefaultPosition, 
-            Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> bool
+        Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize, 
+            long style=SP_3D, String name=SplitterNameStr) -> bool
         """
         return _windows.SplitterWindow_Create(*args, **kwargs)
 
@@ -1601,7 +1598,7 @@ class TaskBarIcon(core.EvtHandler):
         return _windows.TaskBarIcon_SetIcon(*args, **kwargs)
 
     def RemoveIcon(*args, **kwargs):
-        """RemoveIcon(void ??) -> bool"""
+        """RemoveIcon() -> bool"""
         return _windows.TaskBarIcon_RemoveIcon(*args, **kwargs)
 
     def PopupMenu(*args, **kwargs):
@@ -1872,8 +1869,8 @@ class MultiChoiceDialog(Dialog):
         return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
-        __init__(Window parent, String message, String caption, int LCOUNT, 
-            String choices, long style=CHOICEDLG_STYLE, 
+        __init__(Window parent, String message, String caption, int choices=0, 
+            String choices_array, long style=CHOICEDLG_STYLE, 
             Point pos=DefaultPosition) -> MultiChoiceDialog
         """
         newobj = _windows.new_MultiChoiceDialog(*args, **kwargs)
@@ -2664,6 +2661,7 @@ PRINT_MODE_NONE = _windows.PRINT_MODE_NONE
 PRINT_MODE_PREVIEW = _windows.PRINT_MODE_PREVIEW
 PRINT_MODE_FILE = _windows.PRINT_MODE_FILE
 PRINT_MODE_PRINTER = _windows.PRINT_MODE_PRINTER
+PRINT_MODE_STREAM = _windows.PRINT_MODE_STREAM
 class PrintData(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
@@ -2843,6 +2841,14 @@ class PrintData(core.Object):
         """SetPrintMode(int printMode)"""
         return _windows.PrintData_SetPrintMode(*args, **kwargs)
 
+    def GetOutputStream(*args, **kwargs):
+        """GetOutputStream() -> OutputStream"""
+        return _windows.PrintData_GetOutputStream(*args, **kwargs)
+
+    def SetOutputStream(*args, **kwargs):
+        """SetOutputStream(OutputStream outputstream)"""
+        return _windows.PrintData_SetOutputStream(*args, **kwargs)
+
     def __nonzero__(self): return self.Ok() 
 
 class PrintDataPtr(PrintData):
@@ -3247,7 +3253,7 @@ class Printer(core.Object):
         return _windows.Printer_GetAbort(*args, **kwargs)
 
     def GetLastError(*args, **kwargs):
-        """Printer.GetLastError() -> int"""
+        """GetLastError() -> int"""
         return _windows.Printer_GetLastError(*args, **kwargs)
 
     GetLastError = staticmethod(GetLastError)