Ensure that key events are sent to focused window first in wxGTK.

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 8303647c39b9f2d52d2a93404b3f988c59bbf157..762b73a07b5fcf322d5ed71d2e5cfa521c179e32 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1244,7 +1244,7 @@ public:
     {
         // make sure our string member (which uses COW, aka refcounting) is not
         // shared by other wxString instances:
     {
         // make sure our string member (which uses COW, aka refcounting) is not
         // shared by other wxString instances:

-        SetString(GetString().c_str());
+        SetString(GetString().Clone());

     }
 
     virtual wxEvent *Clone() const
     }
 
     virtual wxEvent *Clone() const


@@ -1699,10 +1699,10 @@ public:
         { return wxPoint(m_x, m_y); }
 
     // Get X position
         { return wxPoint(m_x, m_y); }
 
     // Get X position

-    wxCoord GetX() const { return m_x; }
+    wxCoord GetX() const;

 
     // Get Y position
 
     // Get Y position

-    wxCoord GetY() const { return m_y; }
+    wxCoord GetY() const;

 
     // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal
     // key events even though the event had been handled (by default they would
 
     // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal
     // key events even though the event had been handled (by default they would


@@ -1766,6 +1766,7 @@ private:
     {
         m_x = evt.m_x;
         m_y = evt.m_y;
     {
         m_x = evt.m_x;
         m_y = evt.m_y;

+        m_hasPosition = evt.m_hasPosition;

 
         m_keyCode = evt.m_keyCode;
 
 
         m_keyCode = evt.m_keyCode;
 


@@ -1776,11 +1777,19 @@ private:
 #endif
     }
 
 #endif
     }
 

+    // Initialize m_x and m_y using the current mouse cursor position if
+    // necessary.
+    void InitPositionIfNecessary() const;
+

     // If this flag is true, the normal key events should still be generated
     // even if wxEVT_CHAR_HOOK had been handled. By default it is false as
     // handling wxEVT_CHAR_HOOK suppresses all the subsequent events.
     bool m_allowNext;
 
     // If this flag is true, the normal key events should still be generated
     // even if wxEVT_CHAR_HOOK had been handled. By default it is false as
     // handling wxEVT_CHAR_HOOK suppresses all the subsequent events.
     bool m_allowNext;
 

+    // If true, m_x and m_y were already initialized. If false, try to get them
+    // when they're requested.
+    bool m_hasPosition;
+

     DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 };
 
     DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 };
 


@@ -2997,7 +3006,7 @@ public:
 protected:
     // Init the hash table with the entries of the static event table.
     void InitHashTable();
 protected:
     // Init the hash table with the entries of the static event table.
     void InitHashTable();

-    // Helper funtion of InitHashTable() to insert 1 entry into the hash table.
+    // Helper function of InitHashTable() to insert 1 entry into the hash table.

     void AddEntry(const wxEventTableEntry &entry);
     // Allocate and init with null pointers the base hash table.
     void AllocEventTypeTable(size_t size);
     void AddEntry(const wxEventTableEntry &entry);
     // Allocate and init with null pointers the base hash table.
     void AllocEventTypeTable(size_t size);