Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / uiaction.h

diff --git a/include/wx/uiaction.h b/include/wx/uiaction.h
index e662b2c3c32e780464a6c29dffdc29cebe300c3c..68de3dde6a713665d5e55ba49aacecc3486d4f04 100644 (file)
--- a/include/wx/uiaction.h
+++ b/include/wx/uiaction.h
@@ -4,7 +4,7 @@
 // Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
 // Modified by:
 // Created:     2010-03-06
 // Author:      Kevin Ollivier, Steven Lamerton, Vadim Zeitlin
 // Modified by:
 // Created:     2010-03-06

-// RCS-ID:      $Id: menu.cpp 54129 2008-06-11 19:30:52Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Kevin Ollivier
 //              (c) 2010 Steven Lamerton
 //              (c) 2010 Vadim Zeitlin
 // Copyright:   (c) Kevin Ollivier
 //              (c) 2010 Steven Lamerton
 //              (c) 2010 Vadim Zeitlin


@@ -45,7 +45,9 @@ public:
     bool MouseDblClick(int button = wxMOUSE_BTN_LEFT);
     bool MouseDragDrop(long x1, long y1, long x2, long y2,
                        int button = wxMOUSE_BTN_LEFT);
     bool MouseDblClick(int button = wxMOUSE_BTN_LEFT);
     bool MouseDragDrop(long x1, long y1, long x2, long y2,
                        int button = wxMOUSE_BTN_LEFT);

-
+    bool MouseDragDrop(const wxPoint& p1, const wxPoint& p2,
+                       int button = wxMOUSE_BTN_LEFT)
+    { return MouseDragDrop(p1.x, p1.y, p2.x, p2.y, button); }

 
     // Keyboard simulation
     // -------------------
 
     // Keyboard simulation
     // -------------------


@@ -58,8 +60,8 @@ public:
         { return Key(keycode, modifiers, false); }
 
     // Higher level methods for generating both the key press and release for a
         { return Key(keycode, modifiers, false); }
 
     // Higher level methods for generating both the key press and release for a

-    // single key or for all characters in the ASCII string "text" which can
-    // currently contain letters only (no digits, no punctuation).
+    // single key or for all characters in the ASCII string "text" which can currently
+    // contain letters, digits and characters for the definition of numbers [+-., ].

     bool Char(int keycode, int modifiers = wxMOD_NONE);
 
     bool Text(const char *text);
     bool Char(int keycode, int modifiers = wxMOD_NONE);
 
     bool Text(const char *text);


@@ -70,11 +72,17 @@ private:
     // implementation level it makes more sense to have them in a single
     // function.
     //
     // implementation level it makes more sense to have them in a single
     // function.
     //

-    // This is a simple wrapper verifying the input parameters validity around
-    // the platform-specific DoKey() method implemented in platform-specific
-    // files.
+    // It calls DoModifiers() to simulate pressing the modifier keys if
+    // necessary and then DoKey() for the key itself.

     bool Key(int keycode, int modifiers, bool isDown);
 
     bool Key(int keycode, int modifiers, bool isDown);
 

+    // Call DoKey() for all modifier keys whose bits are set in the parameter.
+    void SimulateModifiers(int modifier, bool isDown);
+
+
+    // The low-level port-specific function which really generates the key
+    // presses. It should generate exactly one key event with the given
+    // parameters.

     bool DoKey(int keycode, int modifiers, bool isDown);
 };
 
     bool DoKey(int keycode, int modifiers, bool isDown);
 };