X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73c5ed369625e01f374c3379ee28e0c027ba6eb6..9f06bcb3b8aea7aa709754a217c26e94fe2d5954:/utils/wxPython/src/msw/wx.py

diff --git a/utils/wxPython/src/msw/wx.py b/utils/wxPython/src/msw/wx.py
index ec1c7569be..623173aeb7 100644
--- a/utils/wxPython/src/msw/wx.py
+++ b/utils/wxPython/src/msw/wx.py
@@ -185,6 +185,8 @@ wxCB_SORT = wxc.wxCB_SORT
 wxCB_READONLY = wxc.wxCB_READONLY
 wxRA_HORIZONTAL = wxc.wxRA_HORIZONTAL
 wxRA_VERTICAL = wxc.wxRA_VERTICAL
+wxRA_SPECIFY_ROWS = wxc.wxRA_SPECIFY_ROWS
+wxRA_SPECIFY_COLS = wxc.wxRA_SPECIFY_COLS
 wxRB_GROUP = wxc.wxRB_GROUP
 wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR
 wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL
@@ -492,6 +494,7 @@ FALSE = wxc.FALSE
 false = wxc.false
 TRUE = wxc.TRUE
 true = wxc.true
+wxVERSION_STRING = wxc.wxVERSION_STRING
 wxEVT_NULL = wxc.wxEVT_NULL
 wxEVT_FIRST = wxc.wxEVT_FIRST
 wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED
@@ -1182,6 +1185,15 @@ wxPyDefaultSize.Set(-1,-1)
 wxDefaultPosition = wxPyDefaultPosition
 wxDefaultSize     = wxPyDefaultSize
 
+
+# This is to cover up a bug in SWIG.  We are redefining
+# the shadow class that is generated for wxAcceleratorTable
+# because SWIG incorrectly uses "arg0.this"
+class wxAcceleratorTable(wxAcceleratorTablePtr):
+    def __init__(self,arg0) :
+        self.this = miscc.new_wxAcceleratorTable(arg0)
+        self.thisown = 1
+
 #----------------------------------------------------------------------
 
 ## class wxPyStdOutWindow(wxFrame):
@@ -1249,7 +1261,23 @@ class wxApp(wxPyApp):
 #----------------------------------------------------------------------------
 #
 # $Log$
-# Revision 1.5  1999/02/01 00:11:12  RD
+# Revision 1.8  1999/03/05 07:23:07  RD
+# Minor wxPython changes for wxWin 2.0
+#
+# Revision 1.11  1999/02/20 09:02:55  RD
+# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
+# window handle.  If you can get the window handle into the python code,
+# it should just work...  More news on this later.
+#
+# Added wxImageList, wxToolTip.
+#
+# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
+# wxRegConfig class.
+#
+# As usual, some bug fixes, tweaks, etc.
+#
+# Revision 1.10  1999/02/01 00:10:39  RD
+#
 # Added the missing EVT_LIST_ITEM_SELECTED and friends.
 #
 # Revision 1.9  1999/01/30 07:30:09  RD