Add wxACCEL_CMD, move constants to _accel.i

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_accel.i b/wxPython/src/_accel.i
index 334cf13c5609dd7a6346c834c5bdae412a7f581a..f9b6c2f12a0d03e593d1038368690087dbaeb146 100644 (file)
--- a/wxPython/src/_accel.i
+++ b/wxPython/src/_accel.i
@@ -30,6 +30,14 @@
 //---------------------------------------------------------------------------
 %newgroup;
 
 //---------------------------------------------------------------------------
 %newgroup;
 

+enum {
+    wxACCEL_ALT,
+    wxACCEL_CTRL,
+    wxACCEL_SHIFT,
+    wxACCEL_NORMAL,
+    wxACCEL_CMD,
+};
+

 DocStr(wxAcceleratorEntry,
 "A class used to define items in an `wx.AcceleratorTable`.  wxPython
 programs can choose to use wx.AcceleratorEntry objects, but using a
 DocStr(wxAcceleratorEntry,
 "A class used to define items in an `wx.AcceleratorTable`.  wxPython
 programs can choose to use wx.AcceleratorEntry objects, but using a


@@ -45,8 +53,8 @@ public:
         "Construct a wx.AcceleratorEntry.",
         "
     :param flags: A bitmask of wx.ACCEL_ALT, wx.ACCEL_SHIFT,
         "Construct a wx.AcceleratorEntry.",
         "
     :param flags: A bitmask of wx.ACCEL_ALT, wx.ACCEL_SHIFT,

-                wx.ACCEL_CTRL or wx.ACCEL_NORMAL used to specify
-                which modifier keys are held down.
+                wx.ACCEL_CTRL, wx.ACCEL_CMD,  or wx.ACCEL_NORMAL
+                used to specify which modifier keys are held down.

     :param keyCode: The keycode to be detected
     :param cmdID: The menu or control command ID to use for the
                 accellerator event.
     :param keyCode: The keycode to be detected
     :param cmdID: The menu or control command ID to use for the
                 accellerator event.


@@ -93,7 +101,7 @@ convenient way to program some event handling. For example, you can
 use an accelerator table to make a hotkey generate an event no matter
 which window within a frame has the focus.
 
 use an accelerator table to make a hotkey generate an event no matter
 which window within a frame has the focus.
 

-Foe example::
+For example::

 
     aTable = wx.AcceleratorTable([(wx.ACCEL_ALT,  ord('X'), exitID),
                                   (wx.ACCEL_CTRL, ord('H'), helpID),
 
     aTable = wx.AcceleratorTable([(wx.ACCEL_ALT,  ord('X'), exitID),
                                   (wx.ACCEL_CTRL, ord('H'), helpID),

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 0315e31fd8dcddf71cae098b8caf2712bafa0261..a7e862a5158feb7e7115b2d0cef4f90fc4bb0951 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -158,6 +158,11 @@ typedef unsigned long   wxUIntPtr;
 %typemap(constcode) wxEventType "PyDict_SetItemString(d, \"$symname\", PyInt_FromLong($value));";
 
 
 %typemap(constcode) wxEventType "PyDict_SetItemString(d, \"$symname\", PyInt_FromLong($value));";
 
 

+%define %property(NAME, STUFF...)
+    %pythoncode {
+        NAME = property(STUFF)
+    }
+%enddef

 
 //----------------------------------------------------------------------
 // Macros for the docstring and autodoc features of SWIG.  These will
 
 //----------------------------------------------------------------------
 // Macros for the docstring and autodoc features of SWIG.  These will


@@ -687,11 +692,6 @@ enum {
    
     wxID_HIGHEST,
 
    
     wxID_HIGHEST,
 

-    wxACCEL_ALT,
-    wxACCEL_CTRL,
-    wxACCEL_SHIFT,
-    wxACCEL_NORMAL,
-

     wxPD_AUTO_HIDE,
     wxPD_APP_MODAL,
     wxPD_CAN_ABORT,
     wxPD_AUTO_HIDE,
     wxPD_APP_MODAL,
     wxPD_CAN_ABORT,