Replace wxDataViewCtrl::StartEditor() with EditItem().

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

diff --git a/interface/wx/event.h b/interface/wx/event.h
index 5cb9c497aa53d11c9d1ae44e1c5b4019284c32ad..639f8bdb59fe009fd1b3df6e30c7d4d3cf6774f9 100644 (file)
--- a/interface/wx/event.h
+++ b/interface/wx/event.h
@@ -1560,6 +1560,23 @@ public:
 
 
 
 
 
 

+enum
+{
+    wxJOYSTICK1,
+    wxJOYSTICK2
+};
+
+// Which button is down?
+enum
+{
+    wxJOY_BUTTON_ANY = -1,
+    wxJOY_BUTTON1    = 1,
+    wxJOY_BUTTON2    = 2,
+    wxJOY_BUTTON3    = 4,
+    wxJOY_BUTTON4    = 8
+};
+
+

 /**
     @class wxJoystickEvent
 
 /**
     @class wxJoystickEvent
 


@@ -1645,11 +1662,15 @@ public:
 
     /**
         Returns the x, y position of the joystick event.
 
     /**
         Returns the x, y position of the joystick event.

+
+        These coordinates are valid for all the events except wxEVT_JOY_ZMOVE.

     */
     wxPoint GetPosition() const;
 
     /**
         Returns the z position of the joystick event.
     */
     wxPoint GetPosition() const;
 
     /**
         Returns the z position of the joystick event.

+
+        This method can only be used for wxEVT_JOY_ZMOVE events.

     */
     int GetZPosition() const;
 
     */
     int GetZPosition() const;
 


@@ -3870,9 +3891,12 @@ public:
     wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL);
 
     /**
     wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL);
 
     /**

-        Returns the menu which is being opened or closed. This method should only be
-        used with the @c OPEN and @c CLOSE events and even for them the
-        returned pointer may be @NULL in some ports.
+        Returns the menu which is being opened or closed.
+
+        This method can only be used with the @c OPEN and @c CLOSE events.
+
+        The returned value is never @NULL in the ports implementing this
+        function, which currently includes all the major ones.

     */
     wxMenu* GetMenu() const;
 
     */
     wxMenu* GetMenu() const;