Allow for Cmd-click on wxMac

[wxWidgets.git] / wxPython / src / _event.i

diff --git a/wxPython/src/_event.i b/wxPython/src/_event.i
index 3ddc61936a0777eaa7e4385e058afd34274a6d21..dfeebbde88675d783c51d8ddad266bf5b7ad119e 100644 (file)
--- a/wxPython/src/_event.i
+++ b/wxPython/src/_event.i
@@ -597,7 +597,8 @@ public:
 
 
     DocStr(GetPosition,   // sets the docstring for both
 
 
     DocStr(GetPosition,   // sets the docstring for both

-           "Returns the position of the mouse in window coordinates when the event happened.");
+           "Returns the position of the mouse in window coordinates when the event
+happened.", "");

     wxPoint GetPosition();
 
     DocDeclAName(
     wxPoint GetPosition();
 
     DocDeclAName(


@@ -695,14 +696,16 @@ public:
     %pythoncode { KeyCode = GetKeyCode }
 
     %extend {
     %pythoncode { KeyCode = GetKeyCode }
 
     %extend {

-        int GetUniChar() {
+        int GetUnicodeKey() {

         %#if wxUSE_UNICODE
         %#if wxUSE_UNICODE

-            return self->m_uniChar;
+            return self->GetUnicodeKey();

         %#else
             return 0;
         %#endif
         }
     }
         %#else
             return 0;
         %#endif
         }
     }

+    %pythoncode { GetUniChar = GetUnicodeKey }
+    

     
     // get the raw key code (platform-dependent)
     wxUint32 GetRawKeyCode() const;
     
     // get the raw key code (platform-dependent)
     wxUint32 GetRawKeyCode() const;


@@ -712,7 +715,7 @@ public:
 
     
     DocStr(GetPosition,   // sets the docstring for both
 
     
     DocStr(GetPosition,   // sets the docstring for both

-           "Find the position of the event.");
+           "Find the position of the event.", "");

     wxPoint GetPosition();
 
     DocDeclAName(
     wxPoint GetPosition();
 
     DocDeclAName(


@@ -1103,17 +1106,24 @@ public:
     
     // direction: forward (True) or backward (False)
     bool GetDirection() const;
     
     // direction: forward (True) or backward (False)
     bool GetDirection() const;

-    void SetDirection(bool bForward);
+    void SetDirection(bool forward);

 
     // it may be a window change event (MDI, notebook pages...) or a control
     // change event
     bool IsWindowChange() const;
 
     // it may be a window change event (MDI, notebook pages...) or a control
     // change event
     bool IsWindowChange() const;

-    void SetWindowChange(bool bIs);
+    void SetWindowChange(bool ischange);

 
 

+    void SetFlags(long flags);
+    

     // the child which has the focus currently (may be NULL - use
     // wxWindow::FindFocus then)
     wxWindow* GetCurrentFocus() const;
     void SetCurrentFocus(wxWindow *win);
     // the child which has the focus currently (may be NULL - use
     // wxWindow::FindFocus then)
     wxWindow* GetCurrentFocus() const;
     void SetCurrentFocus(wxWindow *win);

+
+    enum {
+        IsForward,
+        WinChange
+    };

 };
 
 
 };
 
 


@@ -1211,7 +1221,7 @@ public:
 
 class wxPyEvent : public wxEvent {
 public:
 
 class wxPyEvent : public wxEvent {
 public:

-    %addtofunc wxPyEvent     "self.SetSelf(self)"
+    %pythonAppend wxPyEvent     "self.SetSelf(self)"

     wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL );
     ~wxPyEvent();
 
     wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL );
     ~wxPyEvent();
 


@@ -1223,7 +1233,7 @@ public:
 
 class wxPyCommandEvent : public wxCommandEvent {
 public:
 
 class wxPyCommandEvent : public wxCommandEvent {
 public:

-    %addtofunc wxPyCommandEvent     "self.SetSelf(self)"
+    %pythonAppend wxPyCommandEvent     "self.SetSelf(self)"

     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
     ~wxPyCommandEvent();
 
     wxPyCommandEvent(wxEventType commandType = wxEVT_NULL, int id=0);
     ~wxPyCommandEvent();