fixed deadlock when calling wxPostEvent() from worker thread

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

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 20f481b11ba093fee2815a316665c84eccd947fa..83fd5b92c7f8a3051c72cce7c6f95345b2800f2b 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -405,6 +405,10 @@ class TopLevelWindow(_core.Window):
         """GetTitle(self) -> String"""
         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
+    def EnableCloseButton(*args, **kwargs):
+        """EnableCloseButton(self, bool enable) -> bool"""
+        return _windows_.TopLevelWindow_EnableCloseButton(*args, **kwargs)
+
     def SetShape(*args, **kwargs):
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_SetShape(*args, **kwargs)
@@ -434,10 +438,6 @@ class TopLevelWindow(_core.Window):
         return _windows_.TopLevelWindow_CenterOnScreen(*args, **kwargs)
 
     CentreOnScreen = CenterOnScreen 
-    def EnableCloseButton(*args, **kwargs):
-        """EnableCloseButton(self, bool enable=True) -> bool"""
-        return _windows_.TopLevelWindow_EnableCloseButton(*args, **kwargs)
-
     def GetDefaultItem(*args, **kwargs):
         """
         GetDefaultItem(self) -> Window
@@ -753,6 +753,7 @@ def Dialog_GetClassDefaultAttributes(*args, **kwargs):
 
 #---------------------------------------------------------------------------
 
+DEFAULT_MINIFRAME_STYLE = _windows_.DEFAULT_MINIFRAME_STYLE
 class MiniFrame(Frame):
     """Proxy of C++ MiniFrame class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -761,7 +762,7 @@ class MiniFrame(Frame):
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> MiniFrame
+            long style=DEFAULT_MINIFRAME_STYLE, String name=FrameNameStr) -> MiniFrame
         """
         _windows_.MiniFrame_swiginit(self,_windows_.new_MiniFrame(*args, **kwargs))
         self._setOORInfo(self)
@@ -770,7 +771,7 @@ class MiniFrame(Frame):
         """
         Create(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> bool
+            long style=DEFAULT_MINIFRAME_STYLE, String name=FrameNameStr) -> bool
         """
         return _windows_.MiniFrame_Create(*args, **kwargs)
 
@@ -1757,7 +1758,7 @@ class PopupTransientWindow(PopupWindow):
     def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, int style=BORDER_NONE) -> PopupTransientWindow"""
         _windows_.PopupTransientWindow_swiginit(self,_windows_.new_PopupTransientWindow(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)
+        self._setOORInfo(self);PopupTransientWindow._setCallbackInfo(self, self, PopupTransientWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1818,7 +1819,7 @@ class VScrolledWindow(Panel):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> VScrolledWindow
         """
         _windows_.VScrolledWindow_swiginit(self,_windows_.new_VScrolledWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)
+        self._setOORInfo(self);VScrolledWindow._setCallbackInfo(self, self, VScrolledWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1921,7 +1922,7 @@ class VListBox(VScrolledWindow):
             Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> VListBox
         """
         _windows_.VListBox_swiginit(self,_windows_.new_VListBox(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, VListBox)
+        self._setOORInfo(self);VListBox._setCallbackInfo(self, self, VListBox)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -2050,7 +2051,7 @@ class HtmlListBox(VListBox):
             Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> HtmlListBox
         """
         _windows_.HtmlListBox_swiginit(self,_windows_.new_HtmlListBox(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)
+        self._setOORInfo(self);HtmlListBox._setCallbackInfo(self, self, HtmlListBox)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -2083,6 +2084,41 @@ def PreHtmlListBox(*args, **kwargs):
     val = _windows_.new_PreHtmlListBox(*args, **kwargs)
     return val
 
+HLB_DEFAULT_STYLE = _windows_.HLB_DEFAULT_STYLE
+HLB_MULTIPLE = _windows_.HLB_MULTIPLE
+class SimpleHtmlListBox(HtmlListBox,_core.ItemContainer):
+    """Proxy of C++ SimpleHtmlListBox class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+            long style=HLB_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=SimpleHtmlListBoxNameStr) -> SimpleHtmlListBox
+        """
+        _windows_.SimpleHtmlListBox_swiginit(self,_windows_.new_SimpleHtmlListBox(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+            long style=HLB_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=SimpleHtmlListBoxNameStr) -> bool
+        """
+        return _windows_.SimpleHtmlListBox_Create(*args, **kwargs)
+
+_windows_.SimpleHtmlListBox_swigregister(SimpleHtmlListBox)
+SimpleHtmlListBoxNameStr = cvar.SimpleHtmlListBoxNameStr
+
+def PreSimpleHtmlListBox(*args, **kwargs):
+    """PreSimpleHtmlListBox() -> SimpleHtmlListBox"""
+    val = _windows_.new_PreSimpleHtmlListBox(*args, **kwargs)
+    return val
+
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):
@@ -2092,12 +2128,12 @@ class TaskBarIcon(_core.EvtHandler):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> TaskBarIcon"""
         _windows_.TaskBarIcon_swiginit(self,_windows_.new_TaskBarIcon(*args, **kwargs))
-        self._setCallbackInfo(self, TaskBarIcon, 0)
+        TaskBarIcon._setCallbackInfo(self, self, TaskBarIcon)
 
     __swig_destroy__ = _windows_.delete_TaskBarIcon
     __del__ = lambda self : None;
     def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
         return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)
 
     def Destroy(*args, **kwargs):
@@ -2908,16 +2944,17 @@ class ProgressDialog(Frame):
         """
         return _windows_.ProgressDialog_Update(*args, **kwargs)
 
-    def UpdatePulse(*args, **kwargs):
+    def Pulse(*args, **kwargs):
         """
-        UpdatePulse(self, String newmsg) --> (continue, skip)
+        Pulse(self, String newmsg) --> (continue, skip)
 
         Just like `Update` but switches the dialog to use a gauge in
         interminante mode and calls `wx.Gauge.Pulse` to show the user a bit of
         progress.
         """
-        return _windows_.ProgressDialog_UpdatePulse(*args, **kwargs)
+        return _windows_.ProgressDialog_Pulse(*args, **kwargs)
 
+    UpdatePulse =  Pulse 
     def Resume(*args, **kwargs):
         """
         Resume(self)
@@ -3297,16 +3334,13 @@ class PyWindow(_core.Window):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyWindow
         """
         _windows_.PyWindow_swiginit(self,_windows_.new_PyWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)
+        self._setOORInfo(self);PyWindow._setCallbackInfo(self, self, PyWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyWindow__setCallbackInfo(*args, **kwargs)
 
-    def SetBestSize(*args, **kwargs):
-        """SetBestSize(self, Size size)"""
-        return _windows_.PyWindow_SetBestSize(*args, **kwargs)
-
+    SetBestSize = wx.Window.SetInitialSize 
     def DoEraseBackground(*args, **kwargs):
         """DoEraseBackground(self, DC dc) -> bool"""
         return _windows_.PyWindow_DoEraseBackground(*args, **kwargs)
@@ -3477,16 +3511,13 @@ class PyPanel(Panel):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel
         """
         _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)
+        self._setOORInfo(self);PyPanel._setCallbackInfo(self, self, PyPanel)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyPanel__setCallbackInfo(*args, **kwargs)
 
-    def SetBestSize(*args, **kwargs):
-        """SetBestSize(self, Size size)"""
-        return _windows_.PyPanel_SetBestSize(*args, **kwargs)
-
+    SetBestSize = wx.Window.SetInitialSize 
     def DoEraseBackground(*args, **kwargs):
         """DoEraseBackground(self, DC dc) -> bool"""
         return _windows_.PyPanel_DoEraseBackground(*args, **kwargs)
@@ -3657,16 +3688,13 @@ class PyScrolledWindow(ScrolledWindow):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow
         """
         _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)
+        self._setOORInfo(self);PyScrolledWindow._setCallbackInfo(self, self, PyScrolledWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs)
 
-    def SetBestSize(*args, **kwargs):
-        """SetBestSize(self, Size size)"""
-        return _windows_.PyScrolledWindow_SetBestSize(*args, **kwargs)
-
+    SetBestSize = wx.Window.SetInitialSize 
     def DoEraseBackground(*args, **kwargs):
         """DoEraseBackground(self, DC dc) -> bool"""
         return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs)
@@ -3873,6 +3901,10 @@ class PrintData(_core.Object):
         """GetOrientation(self) -> int"""
         return _windows_.PrintData_GetOrientation(*args, **kwargs)
 
+    def IsOrientationReversed(*args, **kwargs):
+        """IsOrientationReversed(self) -> bool"""
+        return _windows_.PrintData_IsOrientationReversed(*args, **kwargs)
+
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""
         return _windows_.PrintData_IsOk(*args, **kwargs)
@@ -3910,6 +3942,10 @@ class PrintData(_core.Object):
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 
+    def GetMedia(*args, **kwargs):
+        """GetMedia(self) -> int"""
+        return _windows_.PrintData_GetMedia(*args, **kwargs)
+
     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)
@@ -3922,6 +3958,10 @@ class PrintData(_core.Object):
         """SetOrientation(self, int orient)"""
         return _windows_.PrintData_SetOrientation(*args, **kwargs)
 
+    def SetOrientationReversed(*args, **kwargs):
+        """SetOrientationReversed(self, bool reversed)"""
+        return _windows_.PrintData_SetOrientationReversed(*args, **kwargs)
+
     def SetPrinterName(*args, **kwargs):
         """SetPrinterName(self, String name)"""
         return _windows_.PrintData_SetPrinterName(*args, **kwargs)
@@ -3954,6 +3994,10 @@ class PrintData(_core.Object):
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 
+    def SetMedia(*args, **kwargs):
+        """SetMedia(self, int media)"""
+        return _windows_.PrintData_SetMedia(*args, **kwargs)
+
     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)
@@ -4398,7 +4442,7 @@ class Printout(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self, String title=PrintoutTitleStr) -> Printout"""
         _windows_.Printout_swiginit(self,_windows_.new_Printout(*args, **kwargs))
-        self._setCallbackInfo(self, Printout)
+        Printout._setCallbackInfo(self, self, Printout)
 
     __swig_destroy__ = _windows_.delete_Printout
     __del__ = lambda self : None;
@@ -4418,6 +4462,54 @@ class Printout(_core.Object):
         """SetDC(self, DC dc)"""
         return _windows_.Printout_SetDC(*args, **kwargs)
 
+    def FitThisSizeToPaper(*args, **kwargs):
+        """FitThisSizeToPaper(self, Size imageSize)"""
+        return _windows_.Printout_FitThisSizeToPaper(*args, **kwargs)
+
+    def FitThisSizeToPage(*args, **kwargs):
+        """FitThisSizeToPage(self, Size imageSize)"""
+        return _windows_.Printout_FitThisSizeToPage(*args, **kwargs)
+
+    def FitThisSizeToPageMargins(*args, **kwargs):
+        """FitThisSizeToPageMargins(self, Size imageSize, PageSetupDialogData pageSetupData)"""
+        return _windows_.Printout_FitThisSizeToPageMargins(*args, **kwargs)
+
+    def MapScreenSizeToPaper(*args, **kwargs):
+        """MapScreenSizeToPaper(self)"""
+        return _windows_.Printout_MapScreenSizeToPaper(*args, **kwargs)
+
+    def MapScreenSizeToPage(*args, **kwargs):
+        """MapScreenSizeToPage(self)"""
+        return _windows_.Printout_MapScreenSizeToPage(*args, **kwargs)
+
+    def MapScreenSizeToPageMargins(*args, **kwargs):
+        """MapScreenSizeToPageMargins(self, PageSetupDialogData pageSetupData)"""
+        return _windows_.Printout_MapScreenSizeToPageMargins(*args, **kwargs)
+
+    def MapScreenSizeToDevice(*args, **kwargs):
+        """MapScreenSizeToDevice(self)"""
+        return _windows_.Printout_MapScreenSizeToDevice(*args, **kwargs)
+
+    def GetLogicalPaperRect(*args, **kwargs):
+        """GetLogicalPaperRect(self) -> Rect"""
+        return _windows_.Printout_GetLogicalPaperRect(*args, **kwargs)
+
+    def GetLogicalPageRect(*args, **kwargs):
+        """GetLogicalPageRect(self) -> Rect"""
+        return _windows_.Printout_GetLogicalPageRect(*args, **kwargs)
+
+    def GetLogicalPageMarginsRect(*args, **kwargs):
+        """GetLogicalPageMarginsRect(self, PageSetupDialogData pageSetupData) -> Rect"""
+        return _windows_.Printout_GetLogicalPageMarginsRect(*args, **kwargs)
+
+    def SetLogicalOrigin(*args, **kwargs):
+        """SetLogicalOrigin(self, int x, int y)"""
+        return _windows_.Printout_SetLogicalOrigin(*args, **kwargs)
+
+    def OffsetLogicalOrigin(*args, **kwargs):
+        """OffsetLogicalOrigin(self, int xoff, int yoff)"""
+        return _windows_.Printout_OffsetLogicalOrigin(*args, **kwargs)
+
     def SetPageSizePixels(*args, **kwargs):
         """SetPageSizePixels(self, int w, int h)"""
         return _windows_.Printout_SetPageSizePixels(*args, **kwargs)
@@ -4450,6 +4542,14 @@ class Printout(_core.Object):
         """GetPPIPrinter() -> (x,y)"""
         return _windows_.Printout_GetPPIPrinter(*args, **kwargs)
 
+    def SetPaperRectPixels(*args, **kwargs):
+        """SetPaperRectPixels(self, Rect paperRectPixels)"""
+        return _windows_.Printout_SetPaperRectPixels(*args, **kwargs)
+
+    def GetPaperRectPixels(*args, **kwargs):
+        """GetPaperRectPixels(self) -> Rect"""
+        return _windows_.Printout_GetPaperRectPixels(*args, **kwargs)
+
     def IsPreview(*args, **kwargs):
         """IsPreview(self) -> bool"""
         return _windows_.Printout_IsPreview(*args, **kwargs)
@@ -4759,7 +4859,7 @@ class PyPrintPreview(PrintPreview):
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
         """
         _windows_.PyPrintPreview_swiginit(self,_windows_.new_PyPrintPreview(*args))
-        self._setCallbackInfo(self, PyPrintPreview)
+        PyPrintPreview._setCallbackInfo(self, self, PyPrintPreview)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4813,7 +4913,7 @@ class PyPreviewFrame(PreviewFrame):
             long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PyPreviewFrame
         """
         _windows_.PyPreviewFrame_swiginit(self,_windows_.new_PyPreviewFrame(*args, **kwargs))
-        self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)
+        self._setOORInfo(self);PyPreviewFrame._setCallbackInfo(self, self, PyPreviewFrame)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4867,7 +4967,7 @@ class PyPreviewControlBar(PreviewControlBar):
             long style=0, String name=PanelNameStr) -> PyPreviewControlBar
         """
         _windows_.PyPreviewControlBar_swiginit(self,_windows_.new_PyPreviewControlBar(*args, **kwargs))
-        self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)
+        self._setOORInfo(self);PyPreviewControlBar._setCallbackInfo(self, self, PyPreviewControlBar)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""