Some compilation fixes

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

diff --git a/include/wx/event.h b/include/wx/event.h
index e72c49617100d3c2502bb15725976408a15f5a0d..4d959cc105b47d1bcec20eb314fbc5c04ffb6da1 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -45,7 +45,7 @@ class WXDLLEXPORT wxList;
 typedef int wxEventType;
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-// must define these in the .cpp for VA or else you get multiply defined symbols everywhere
+// must define these static for VA or else you get multiply defined symbols everywhere
 extern const wxEventType wxEVT_NULL;
 extern const wxEventType wxEVT_FIRST;
 
@@ -69,8 +69,9 @@ extern const wxEventType wxEVT_COMMAND_TOOL_RCLICKED;
 extern const wxEventType wxEVT_COMMAND_TOOL_ENTER;
 extern const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED;
 
-/* Sockets send events, too */
+/* Sockets and timers send events, too */
 extern const wxEventType wxEVT_SOCKET;
+extern const wxEventType wxEVT_TIMER;
 
 /* Mouse event types */
 extern const wxEventType wxEVT_LEFT_DOWN;
@@ -230,7 +231,6 @@ extern const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED;
  /* Tab and notebook control event types */
 extern const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED;
 extern const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING;
-
 extern const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED;
 extern const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING;
 
@@ -284,6 +284,9 @@ const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED =          wxEVT_FIRST + 18;
 /* Sockets send events, too */
 const wxEventType wxEVT_SOCKET =                            wxEVT_FIRST + 50;
 
+/* And timers do as well */
+const wxEventType wxEVT_TIMER =                             wxEVT_FIRST + 80;
+
 /* Mouse event types */
 const wxEventType wxEVT_LEFT_DOWN =                         wxEVT_FIRST + 100;
 const wxEventType wxEVT_LEFT_UP =                           wxEVT_FIRST + 101;