X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/994453b843b007de6367fedbf4a49ac9d920c63c..bbc3761ee897d2cdae209c60d415ba00fe825554:/wxPython/src/msw/_windows.py?ds=sidebyside diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py index 016d08db16..20f481b11b 100644 --- a/wxPython/src/msw/_windows.py +++ b/wxPython/src/msw/_windows.py @@ -679,9 +679,16 @@ class Dialog(TopLevelWindow): """CreateTextSizer(self, String message) -> Sizer""" return _windows_.Dialog_CreateTextSizer(*args, **kwargs) - def CreateButtonSizer(*args, **kwargs): - """CreateButtonSizer(self, long flags, bool separated=False, int distance=0) -> Sizer""" - return _windows_.Dialog_CreateButtonSizer(*args, **kwargs) + def _CreateButtonSizer(*args, **kwargs): + """_CreateButtonSizer(self, long flags) -> Sizer""" + return _windows_.Dialog__CreateButtonSizer(*args, **kwargs) + + def CreateButtonSizer(self, flags, *ignored): + return self._CreateButtonSizer(flags) + + def CreateSeparatedButtonSizer(*args, **kwargs): + """CreateSeparatedButtonSizer(self, long flags) -> Sizer""" + return _windows_.Dialog_CreateSeparatedButtonSizer(*args, **kwargs) def CreateStdDialogButtonSizer(*args, **kwargs): """CreateStdDialogButtonSizer(self, long flags) -> StdDialogButtonSizer""" @@ -1892,6 +1899,11 @@ class VScrolledWindow(Panel): """GetLinesHeight(self, size_t lineMin, size_t lineMax) -> int""" return _windows_.VScrolledWindow_GetLinesHeight(*args, **kwargs) + FirstVisibleLine = property(GetFirstVisibleLine,doc="See `GetFirstVisibleLine`") + LastVisibleLine = property(GetLastVisibleLine,doc="See `GetLastVisibleLine`") + LineCount = property(GetLineCount,SetLineCount,doc="See `GetLineCount` and `SetLineCount`") + VisibleBegin = property(GetVisibleBegin,doc="See `GetVisibleBegin`") + VisibleEnd = property(GetVisibleEnd,doc="See `GetVisibleEnd`") _windows_.VScrolledWindow_swigregister(VScrolledWindow) def PreVScrolledWindow(*args, **kwargs): @@ -2014,6 +2026,12 @@ class VListBox(VScrolledWindow): """OnDrawBackground(self, DC dc, Rect rect, size_t n)""" return _windows_.VListBox_OnDrawBackground(*args, **kwargs) + FirstSelected = property(GetFirstSelected,doc="See `GetFirstSelected`") + ItemCount = property(GetItemCount,SetItemCount,doc="See `GetItemCount` and `SetItemCount`") + Margins = property(GetMargins,SetMargins,doc="See `GetMargins` and `SetMargins`") + SelectedCount = property(GetSelectedCount,doc="See `GetSelectedCount`") + Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") + SelectionBackground = property(GetSelectionBackground,SetSelectionBackground,doc="See `GetSelectionBackground` and `SetSelectionBackground`") _windows_.VListBox_swigregister(VListBox) VListBoxNameStr = cvar.VListBoxNameStr @@ -2088,9 +2106,8 @@ class TaskBarIcon(_core.EvtHandler): Deletes the C++ object this Python object is a proxy for. """ - val = _windows_.TaskBarIcon_Destroy(*args, **kwargs) - args[0].thisown = 0 - return val + args[0].this.own(False) + return _windows_.TaskBarIcon_Destroy(*args, **kwargs) def IsOk(*args, **kwargs): """IsOk(self) -> bool""" @@ -2784,7 +2801,6 @@ class FontData(_core.Object): AllowSymbols = property(GetAllowSymbols,SetAllowSymbols,doc="See `GetAllowSymbols` and `SetAllowSymbols`") ChosenFont = property(GetChosenFont,SetChosenFont,doc="See `GetChosenFont` and `SetChosenFont`") Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") - EnableEffects = property(GetEnableEffects,doc="See `GetEnableEffects`") InitialFont = property(GetInitialFont,SetInitialFont,doc="See `GetInitialFont` and `SetInitialFont`") ShowHelp = property(GetShowHelp,SetShowHelp,doc="See `GetShowHelp` and `SetShowHelp`") _windows_.FontData_swigregister(FontData) @@ -2885,7 +2901,7 @@ class ProgressDialog(Frame): unless the Cancel button has been pressed, and ``skip`` is ``False`` unless the Skip button (if any) has been pressed. - If the ``continue`` return value is ``false``, the application can either + If the ``continue`` return value is ``False``, the application can either immediately destroy the dialog or ask the user for confirmation, and if the abort is not confirmed the dialog may be resumed with `Resume` function. @@ -3857,10 +3873,11 @@ class PrintData(_core.Object): """GetOrientation(self) -> int""" return _windows_.PrintData_GetOrientation(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PrintData_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PrintData_IsOk(*args, **kwargs) + Ok = IsOk def GetPrinterName(*args, **kwargs): """GetPrinterName(self) -> String""" return _windows_.PrintData_GetPrinterName(*args, **kwargs) @@ -3945,7 +3962,7 @@ class PrintData(_core.Object): """SetFilename(self, String filename)""" return _windows_.PrintData_SetFilename(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() def GetPrivData(*args, **kwargs): """GetPrivData(self) -> PyObject""" return _windows_.PrintData_GetPrivData(*args, **kwargs) @@ -4060,10 +4077,11 @@ class PageSetupDialogData(_core.Object): """GetPrintData(self) -> PrintData""" return _windows_.PageSetupDialogData_GetPrintData(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PageSetupDialogData_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PageSetupDialogData_IsOk(*args, **kwargs) + Ok = IsOk def SetDefaultInfo(*args, **kwargs): """SetDefaultInfo(self, bool flag)""" return _windows_.PageSetupDialogData_SetDefaultInfo(*args, **kwargs) @@ -4108,7 +4126,7 @@ class PageSetupDialogData(_core.Object): """CalculatePaperSizeFromId(self)""" return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() DefaultInfo = property(GetDefaultInfo,SetDefaultInfo,doc="See `GetDefaultInfo` and `SetDefaultInfo`") DefaultMinMargins = property(GetDefaultMinMargins,SetDefaultMinMargins,doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`") MarginBottomRight = property(GetMarginBottomRight,SetMarginBottomRight,doc="See `GetMarginBottomRight` and `SetMarginBottomRight`") @@ -4263,10 +4281,11 @@ class PrintDialogData(_core.Object): """GetEnableHelp(self) -> bool""" return _windows_.PrintDialogData_GetEnableHelp(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PrintDialogData_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PrintDialogData_IsOk(*args, **kwargs) + Ok = IsOk def GetPrintData(*args, **kwargs): """GetPrintData(self) -> PrintData""" return _windows_.PrintDialogData_GetPrintData(*args, **kwargs) @@ -4275,7 +4294,7 @@ class PrintDialogData(_core.Object): """SetPrintData(self, PrintData printData)""" return _windows_.PrintDialogData_SetPrintData(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() AllPages = property(GetAllPages,SetAllPages,doc="See `GetAllPages` and `SetAllPages`") Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") FromPage = property(GetFromPage,SetFromPage,doc="See `GetFromPage` and `SetFromPage`") @@ -4701,10 +4720,11 @@ class PrintPreview(_core.Object): """GetMinPage(self) -> int""" return _windows_.PrintPreview_GetMinPage(*args, **kwargs) - def Ok(*args, **kwargs): - """Ok(self) -> bool""" - return _windows_.PrintPreview_Ok(*args, **kwargs) + def IsOk(*args, **kwargs): + """IsOk(self) -> bool""" + return _windows_.PrintPreview_IsOk(*args, **kwargs) + Ok = IsOk def SetOk(*args, **kwargs): """SetOk(self, bool ok)""" return _windows_.PrintPreview_SetOk(*args, **kwargs) @@ -4717,7 +4737,7 @@ class PrintPreview(_core.Object): """DetermineScaling(self)""" return _windows_.PrintPreview_DetermineScaling(*args, **kwargs) - def __nonzero__(self): return self.Ok() + def __nonzero__(self): return self.IsOk() Canvas = property(GetCanvas,SetCanvas,doc="See `GetCanvas` and `SetCanvas`") CurrentPage = property(GetCurrentPage,SetCurrentPage,doc="See `GetCurrentPage` and `SetCurrentPage`") Frame = property(GetFrame,SetFrame,doc="See `GetFrame` and `SetFrame`")