Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxACCEL_CMD, move constants to _accel.i

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-08-29 18:53:10 +00:00
parent da14a87dee
commit 1cc14cea1c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wxPython/src/_accel.i
View File

@@ -30,6 +30,14 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
%newgroup; %newgroup;
enum {
wxACCEL_ALT,
wxACCEL_CTRL,
wxACCEL_SHIFT,
wxACCEL_NORMAL,
wxACCEL_CMD,
};
DocStr(wxAcceleratorEntry, DocStr(wxAcceleratorEntry,
"A class used to define items in an `wx.AcceleratorTable`. wxPython "A class used to define items in an `wx.AcceleratorTable`. wxPython
programs can choose to use wx.AcceleratorEntry objects, but using a programs can choose to use wx.AcceleratorEntry objects, but using a
@@ -45,8 +53,8 @@ public:
"Construct a wx.AcceleratorEntry.", "Construct a wx.AcceleratorEntry.",
" "
:param flags: A bitmask of wx.ACCEL_ALT, wx.ACCEL_SHIFT, :param flags: A bitmask of wx.ACCEL_ALT, wx.ACCEL_SHIFT,
wx.ACCEL_CTRL or wx.ACCEL_NORMAL used to specify wx.ACCEL_CTRL, wx.ACCEL_CMD, or wx.ACCEL_NORMAL
which modifier keys are held down. used to specify which modifier keys are held down.
:param keyCode: The keycode to be detected :param keyCode: The keycode to be detected
:param cmdID: The menu or control command ID to use for the :param cmdID: The menu or control command ID to use for the
accellerator event. 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 use an accelerator table to make a hotkey generate an event no matter
which window within a frame has the focus. which window within a frame has the focus.
Foe example:: For example::
aTable = wx.AcceleratorTable([(wx.ACCEL_ALT, ord('X'), exitID), aTable = wx.AcceleratorTable([(wx.ACCEL_ALT, ord('X'), exitID),
(wx.ACCEL_CTRL, ord('H'), helpID), (wx.ACCEL_CTRL, ord('H'), helpID),

10
wxPython/src/_defs.i
View File

@@ -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_AUTO_HIDE,
wxPD_APP_MODAL, wxPD_APP_MODAL,
wxPD_CAN_ABORT, wxPD_CAN_ABORT,