X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..5a8c929eb49b1ecfad4fa3c3d4e7dbd11213653a:/include/wx/event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index 20855f2a76..606a73749d 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -82,6 +82,7 @@ enum wxEventType {
 
 /* Character input event type  */
  wxEVT_CHAR,
+ wxEVT_NAVIGATION_KEY,
 
  /*
   * Scrollbar event identifiers
@@ -156,6 +157,8 @@ enum wxEventType {
  wxEVT_COMMAND_TREE_SET_INFO,
  wxEVT_COMMAND_TREE_ITEM_EXPANDED,
  wxEVT_COMMAND_TREE_ITEM_EXPANDING,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
  wxEVT_COMMAND_TREE_SEL_CHANGED,
  wxEVT_COMMAND_TREE_SEL_CHANGING,
  wxEVT_COMMAND_TREE_KEY_DOWN,
@@ -906,6 +909,33 @@ class WXDLLEXPORT wxSysColourChangedEvent: public wxEvent
      { m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
 };
 
+/*
+ Event generated by dialog navigation keys
+ wxEVT_NAVIGATION_KEY
+ */
+// must derive from command event to be propagated to the parent
+class WXDLLEXPORT wxNavigationKeyEvent : public wxCommandEvent
+{
+  DECLARE_DYNAMIC_CLASS(wxNavigationKeyEvent)
+
+public:
+  wxNavigationKeyEvent() : wxCommandEvent(wxEVT_NAVIGATION_KEY) { }
+
+  // direction: forward (true) or backward (false)
+  bool GetDirection() const        { return m_commandInt == 1; }
+  void SetDirection(bool bForward) { m_commandInt = bForward;  }
+
+  // it may be a window change event (MDI, notebook pages...) or a control
+  // change event
+  bool IsWindowChange() const    { return m_extraLong == 1; }
+  void SetWindowChange(bool bIs) { m_extraLong = bIs; }
+
+  // the child which has the focus currently (may be NULL - use 
+  // wxWindow::FindFocus then)
+  wxWindow* GetCurrentFocus() const { return (wxWindow *)m_clientData; }
+  void SetCurrentFocus(wxWindow *win) { m_clientData = (char *)win; }
+};
+
 /* TODO
  wxEVT_POWER,
  wxEVT_CREATE,
@@ -966,31 +996,6 @@ class WXDLLEXPORT wxEvtHandler: public wxObject
   // Default behaviour
   virtual long Default(void) { if (GetNextHandler()) return GetNextHandler()->Default(); else return 0; };
 
-/*
-#if WXWIN_COMPATIBILITY
-  virtual void OldOnMenuCommand(int WXUNUSED(cmd));
-  virtual void OldOnMenuSelect(int WXUNUSED(cmd));
-  virtual void OldOnInitMenuPopup(int WXUNUSED(pos));
-  virtual void OldOnScroll(wxCommandEvent& WXUNUSED(event));
-  virtual void OldOnPaint(void);
-  virtual void OldOnSize(int WXUNUSED(width), int WXUNUSED(height));
-  virtual void OldOnMove(int WXUNUSED(x), int WXUNUSED(y));
-  virtual void OldOnMouseEvent(wxMouseEvent& WXUNUSED(event));
-  virtual void OldOnChar(wxKeyEvent& WXUNUSED(event));
-  // Under Windows, we can intercept character input per dialog or frame
-  virtual bool OldOnCharHook(wxKeyEvent& WXUNUSED(event));
-  virtual void OldOnActivate(bool WXUNUSED(active));
-  virtual void OldOnSetFocus(void);
-  virtual void OldOnKillFocus(void);
-  virtual bool OldOnSysColourChange(void);
-  virtual void OldOnDropFiles(int n, char *files[], int x, int y);
-
-  virtual void OnDefaultAction(wxControl *WXUNUSED(initiatingItem)) {};
-  virtual void OnChangeFocus(wxControl *WXUNUSED(from), wxControl *WXUNUSED(to)) {};
-  virtual bool OnFunctionKey(wxKeyEvent &WXUNUSED(event)) { return FALSE; };
-#endif
-*/
-
   virtual bool OnClose(void);
 
   inline char *GetClientData(void) const { return m_clientData; }
@@ -1092,6 +1097,7 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 #define EVT_SHOW(func) { wxEVT_SHOW, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxShowEventFunction) & func, NULL },
 #define EVT_MAXIMIZE(func) { wxEVT_MAXIMIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMaximizeEventFunction) & func, NULL },
 #define EVT_ICONIZE(func) { wxEVT_ICONIZE, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxIconizeEventFunction) & func, NULL },
+#define EVT_NAVIGATION_KEY(func) { wxEVT_NAVIGATION_KEY, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & func, NULL },
 
 // Mouse events
 #define EVT_LEFT_DOWN(func) { wxEVT_LEFT_DOWN, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxMouseEventFunction) & func, NULL },