X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7214297d16aed4c160c1cbef6b19f153ca065ab7..c96faa7c9b1926d63a2fff32ac4508d3138a7bee:/include/wx/event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index 24a0d2b4f1..6a1fd599d9 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -778,7 +778,7 @@ public:
     {
         // GetVeto() will return FALSE anyhow...
         wxCHECK_RET( m_canVeto,
-                     "call to Veto() ignored (can't veto this event)" );
+                     _T("call to Veto() ignored (can't veto this event)") );
 
         m_veto = veto;
     }
@@ -1194,6 +1194,10 @@ public:
 
     bool SearchDynamicEventTable( wxEvent& event );
 
+#if wxUSE_THREADS
+    void ClearEventLocker() { delete m_eventsLocker; m_eventsLocker = NULL; };
+#endif
+
 private:
     static const wxEventTableEntry         sm_eventTableEntries[];
 
@@ -1203,18 +1207,18 @@ protected:
     virtual const wxEventTable *GetEventTable() const;
 
 protected:
-    wxEvtHandler*      m_nextHandler;
-    wxEvtHandler*      m_previousHandler;
-    bool               m_enabled;           // Is event handler enabled?
-    wxList*            m_dynamicEvents;
-    wxList*	       m_pendingEvents;
+    wxEvtHandler*       m_nextHandler;
+    wxEvtHandler*       m_previousHandler;
+    bool                m_enabled;           // Is event handler enabled?
+    wxList*             m_dynamicEvents;
+    wxList*	            m_pendingEvents;
 #if wxUSE_THREADS
-    wxCriticalSection* m_eventsLocker;
+    wxCriticalSection*  m_eventsLocker;
 #endif
 
     // optimization: instead of using costly IsKindOf() to decide whether we're
     // a window (which is true in 99% of cases), use this flag
-    bool              m_isWindow;
+    bool                m_isWindow;
 };
 
 typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
@@ -1427,5 +1431,13 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 #define EVT_UPDATE_UI(id, func) \
  { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, (wxObject *) NULL },\
 
+/*
+ * Helper functions
+ */
+
+// Find a window with the focus, that is also a descendant of the given window.
+// This is used to determine the window to initially send commands to.
+wxWindow* wxFindFocusDescendant(wxWindow* ancestor);
+
 #endif
         // _WX_EVENTH__