Make storing non-trivial data in wxThreadSpecificInfo possible.

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

diff --git a/interface/wx/event.h b/interface/wx/event.h
index 74655ab7c1dee47921d91745d2a6ebdf2a2a2587..3f499ccd87431f39471e73f3a006e37c8d4e09d7 100644 (file)
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -3,7 +3,6 @@
 // Purpose:     interface of wxEvtHandler, wxEventBlocker and many
 //              wxEvent-derived classes
 // Author:      wxWidgets team
 // Purpose:     interface of wxEvtHandler, wxEventBlocker and many
 //              wxEvent-derived classes
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -523,11 +522,9 @@ public:
 
          @param method The method to call.
          @param x1 The (optional) first parameter to pass to the method.
 
          @param method The method to call.
          @param x1 The (optional) first parameter to pass to the method.

-         @param x2 The (optional) second parameter to pass to the method.
-
-         Note that currently only up to 2 arguments can be passed. For more
-         complicated needs, you can use the CallAfter<T>(const T& fn) overload
-         that can call any functor.
+            Currently, 0, 1 or 2 parameters can be passed. If you need to pass
+            more than 2 arguments, you can use the CallAfter<T>(const T& fn)
+            overload that can call any functor.

 
          @note This method is not available with Visual C++ before version 8
                (Visual Studio 2005) as earlier versions of the compiler don't
 
          @note This method is not available with Visual C++ before version 8
                (Visual Studio 2005) as earlier versions of the compiler don't


@@ -566,7 +563,7 @@ public:
                (Visual Studio 2005) as earlier versions of the compiler don't
                have the required support for C++ templates to implement it.
 
                (Visual Studio 2005) as earlier versions of the compiler don't
                have the required support for C++ templates to implement it.
 

-         @since 2.9.6
+         @since 3.0

      */
     template<typename T>
     void CallAfter(const T& functor);
      */
     template<typename T>
     void CallAfter(const T& functor);


@@ -3471,7 +3468,7 @@ public:
                 wxHelpEvent::Origin origin = Origin_Unknown);
 
     /**
                 wxHelpEvent::Origin origin = Origin_Unknown);
 
     /**

-        Returns the origin of the help event which is one of the ::wxHelpEventOrigin
+        Returns the origin of the help event which is one of the wxHelpEvent::Origin

         values.
 
         The application may handle events generated using the keyboard or mouse
         values.
 
         The application may handle events generated using the keyboard or mouse


@@ -3887,7 +3884,8 @@ public:
 
     /**
         Sets the flags for this event.
 
     /**
         Sets the flags for this event.

-        The @a flags can be a combination of the ::wxNavigationKeyEventFlags values.
+        The @a flags can be a combination of the 
+        wxNavigationKeyEvent::wxNavigationKeyEventFlags values.

     */
     void SetFlags(long flags);
 
     */
     void SetFlags(long flags);