No changes, just merge some strings in wxSVGFileDC.

[wxWidgets.git] / interface / wx / kbdstate.h

diff --git a/interface/wx/kbdstate.h b/interface/wx/kbdstate.h
index 49162c98e3bbf8f26b74a416914ebca06a746556..27060a379a96212d2579fe8ef0ee216e81808f3c 100644 (file)
--- a/interface/wx/kbdstate.h
+++ b/interface/wx/kbdstate.h
@@ -4,7 +4,7 @@
 // Author:      wxWidgets team
 // Created:     2008-09-19
 // RCS-ID:      $Id$
 // Author:      wxWidgets team
 // Created:     2008-09-19
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -15,10 +15,11 @@
     information about the modifier keys which were pressed when the event
     occurred.
 
     information about the modifier keys which were pressed when the event
     occurred.
 

-    This class is implemented entirely inline in @<wx/keystate.h@> and thus has
+    This class is implemented entirely inline in @<wx/kbdstate.h@> and thus has

     no linking requirements.
 
     no linking requirements.
 

-    @category{misc}
+    @nolibrary
+    @category{events}

 
     @see wxKeyEvent, wxMouseState
  */
 
     @see wxKeyEvent, wxMouseState
  */


@@ -30,20 +31,20 @@ public:
 
         By default, no modifiers are active.
      */
 
         By default, no modifiers are active.
      */

-    wxKeyboardState(bool controlDown,
-                    bool shiftDown,
-                    bool altDown,
-                    bool metaDown);
+    wxKeyboardState(bool controlDown = false,
+                    bool shiftDown = false,
+                    bool altDown = false,
+                    bool metaDown = false);

 
     /**
         Return the bit mask of all pressed modifier keys.
 
     /**
         Return the bit mask of all pressed modifier keys.

-        
+

         The return value is a combination of @c wxMOD_ALT, @c wxMOD_CONTROL,
         @c wxMOD_SHIFT and @c wxMOD_META bit masks. Additionally, @c wxMOD_NONE
         is defined as 0, i.e. corresponds to no modifiers (see HasModifiers())
         The return value is a combination of @c wxMOD_ALT, @c wxMOD_CONTROL,
         @c wxMOD_SHIFT and @c wxMOD_META bit masks. Additionally, @c wxMOD_NONE
         is defined as 0, i.e. corresponds to no modifiers (see HasModifiers())

-        and @c wxMOD_CMD is either @c wxMOD_CONTROL (MSW and Unix) or @c
-        wxMOD_META (Mac), see CmdDown(). See @ref page_keymodifiers for the
-        full list of modifiers.
+        and @c wxMOD_CMD is either @c wxMOD_CONTROL (MSW and Unix) or
+        @c wxMOD_META (Mac), see CmdDown().
+        See ::wxKeyModifier for the full list of modifiers.

 
         Notice that this function is easier to use correctly than, for example,
         ControlDown() because when using the latter you also have to remember to
 
         Notice that this function is easier to use correctly than, for example,
         ControlDown() because when using the latter you also have to remember to


@@ -129,5 +130,12 @@ public:
         Notice that GetModifiers() should usually be used instead of this one.
      */
     bool CmdDown() const;
         Notice that GetModifiers() should usually be used instead of this one.
      */
     bool CmdDown() const;

+
+    
+    void SetControlDown(bool down);
+    void SetShiftDown(bool down);
+    void SetAltDown(bool down);
+    void SetMetaDown(bool down);
+

 };
 
 };