Changes for wxEventType

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 11e5e3ba7110e814da753257c3638caf14fa4fce..0389138540c4d75172411de96668d06a5402e9f7 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -24,7 +24,9 @@
  * Event types
  *
  */
  * Event types
  *
  */

-enum {
+
+enum wxEventType {
+ wxEVT_NULL = 0,

  wxEVT_FIRST = 10000,
 
  // New names
  wxEVT_FIRST = 10000,
 
  // New names


@@ -177,7 +179,7 @@ enum {
  wxEVT_COMMAND_TAB_SEL_CHANGED,
  wxEVT_COMMAND_TAB_SEL_CHANGING,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
  wxEVT_COMMAND_TAB_SEL_CHANGED,
  wxEVT_COMMAND_TAB_SEL_CHANGING,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,

- wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING

 };
 
 // Compatibility
 };
 
 // Compatibility


@@ -245,8 +247,8 @@ public:
   wxEvent(int id = 0);
   inline ~wxEvent(void) {}
 
   wxEvent(int id = 0);
   inline ~wxEvent(void) {}
 

-  inline void SetEventType(WXTYPE typ) { m_eventType = typ; }
-  inline WXTYPE GetEventType(void) const { return m_eventType; }
+  inline void SetEventType(wxEventType typ) { m_eventType = typ; }
+  inline wxEventType GetEventType(void) const { return m_eventType; }

   inline wxObject *GetEventObject(void) const { return m_eventObject; }
   inline void SetEventObject(wxObject *obj) { m_eventObject = obj; }
   inline long GetTimestamp(void) const { return m_timeStamp; }
   inline wxObject *GetEventObject(void) const { return m_eventObject; }
   inline void SetEventObject(wxObject *obj) { m_eventObject = obj; }
   inline long GetTimestamp(void) const { return m_timeStamp; }


@@ -263,7 +265,7 @@ public:
   bool              m_skipped;
   wxObject*         m_eventObject;
   char*             m_eventHandle;         // Handle of an underlying windowing system event
   bool              m_skipped;
   wxObject*         m_eventObject;
   char*             m_eventHandle;         // Handle of an underlying windowing system event

-  WXTYPE            m_eventType;
+  wxEventType            m_eventType;

   long              m_timeStamp;
   int               m_id;
   wxObject*         m_callbackUserData;
   long              m_timeStamp;
   int               m_id;
   wxObject*         m_callbackUserData;


@@ -292,7 +294,7 @@ class WXDLLEXPORT wxCommandEvent: public wxEvent
 {
   DECLARE_DYNAMIC_CLASS(wxCommandEvent)
 
 {
   DECLARE_DYNAMIC_CLASS(wxCommandEvent)
 

-  wxCommandEvent(WXTYPE commandType = 0, int id = 0);
+  wxCommandEvent(wxEventType commandType = wxEVT_NULL, int id = 0);

   inline ~wxCommandEvent(void) {}
 
   /*
   inline ~wxCommandEvent(void) {}
 
   /*


@@ -346,7 +348,7 @@ class WXDLLEXPORT wxScrollEvent: public wxCommandEvent
   DECLARE_DYNAMIC_CLASS(wxScrollEvent)
 
  public:
   DECLARE_DYNAMIC_CLASS(wxScrollEvent)
 
  public:

-  wxScrollEvent(WXTYPE commandType = 0, int id = 0, int pos = 0, int orient = 0);
+  wxScrollEvent(wxEventType commandType = wxEVT_NULL, int id = 0, int pos = 0, int orient = 0);

   inline ~wxScrollEvent(void) {}
 
   /*
   inline ~wxScrollEvent(void) {}
 
   /*


@@ -394,7 +396,7 @@ class WXDLLEXPORT wxMouseEvent: public wxEvent
   DECLARE_DYNAMIC_CLASS(wxMouseEvent)
 
  public:
   DECLARE_DYNAMIC_CLASS(wxMouseEvent)
 
  public:

-  wxMouseEvent(WXTYPE mouseType = 0);
+  wxMouseEvent(wxEventType mouseType = wxEVT_NULL);

 
   // Was it a button event? (*doesn't* mean: is any button *down*?)
   inline bool IsButton(void) const { return Button(-1); }
 
   // Was it a button event? (*doesn't* mean: is any button *down*?)
   inline bool IsButton(void) const { return Button(-1); }


@@ -496,7 +498,7 @@ class WXDLLEXPORT wxKeyEvent: public wxEvent
   DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxKeyEvent)
 
 public:

-  wxKeyEvent(WXTYPE keyType = 0);
+  wxKeyEvent(wxEventType keyType = wxEVT_NULL);

 
   // Find state of shift/control keys
   inline bool ControlDown(void) const { return m_controlDown; }
 
   // Find state of shift/control keys
   inline bool ControlDown(void) const { return m_controlDown; }


@@ -605,7 +607,7 @@ class WXDLLEXPORT wxFocusEvent: public wxEvent
   DECLARE_DYNAMIC_CLASS(wxFocusEvent)
 
  public:
   DECLARE_DYNAMIC_CLASS(wxFocusEvent)
 
  public:

-  inline wxFocusEvent(WXTYPE type = 0, int Id = 0) { m_eventType = type; m_id = Id; }
+  inline wxFocusEvent(wxEventType type = wxEVT_NULL, int Id = 0) { m_eventType = type; m_id = Id; }

 };
 
 // Activate event class
 };
 
 // Activate event class


@@ -620,7 +622,7 @@ class WXDLLEXPORT wxActivateEvent: public wxEvent
 
  public:
   bool m_active;
 
  public:
   bool m_active;

-  inline wxActivateEvent(WXTYPE type = 0, bool active = TRUE, int Id = 0) { m_eventType = type; m_active = active; m_id = Id; }
+  inline wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = TRUE, int Id = 0) { m_eventType = type; m_active = active; m_id = Id; }

   inline bool GetActive(void) const { return m_active; }
 };
 
   inline bool GetActive(void) const { return m_active; }
 };
 


@@ -653,7 +655,7 @@ class WXDLLEXPORT wxMenuEvent: public wxEvent
 public:
   int m_menuId;
 
 public:
   int m_menuId;
 

-  inline wxMenuEvent(WXTYPE type = 0, int id = 0) { m_eventType = type; m_menuId = id; }
+  inline wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0) { m_eventType = type; m_menuId = id; }

 
   inline int GetMenuId(void) const { return m_menuId; }
 };
 
   inline int GetMenuId(void) const { return m_menuId; }
 };


@@ -670,7 +672,7 @@ class WXDLLEXPORT wxCloseEvent: public wxEvent
   DECLARE_DYNAMIC_CLASS(wxCloseEvent)
 public:
 
   DECLARE_DYNAMIC_CLASS(wxCloseEvent)
 public:
 

-  inline wxCloseEvent(WXTYPE type = 0, int id = 0)
+  inline wxCloseEvent(wxEventType type = wxEVT_NULL, int id = 0)

      { m_eventType = type; m_sessionEnding = TRUE; m_loggingOff = TRUE; m_veto = FALSE;
        m_id = id; m_force = FALSE; }
 
      { m_eventType = type; m_sessionEnding = TRUE; m_loggingOff = TRUE; m_veto = FALSE;
        m_id = id; m_force = FALSE; }
 


@@ -764,7 +766,7 @@ class WXDLLEXPORT wxJoystickEvent: public wxEvent
   int       m_buttonState; // Which buttons are down?
   int       m_joyStick; // Which joystick?
 
   int       m_buttonState; // Which buttons are down?
   int       m_joyStick; // Which joystick?
 

-  inline wxJoystickEvent(WXTYPE type = 0, int state = 0, int joystick = wxJOYSTICK1, int change = 0)
+  inline wxJoystickEvent(wxEventType type = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0)

      { m_eventType = type; m_buttonState = state; m_pos = wxPoint(0,0); m_zPosition = 0;
        m_joyStick = joystick; m_buttonChange = change; }
 
      { m_eventType = type; m_buttonState = state; m_pos = wxPoint(0,0); m_zPosition = 0;
        m_joyStick = joystick; m_buttonChange = change; }
 


@@ -820,7 +822,7 @@ class WXDLLEXPORT wxDropFilesEvent: public wxEvent
   wxPoint   m_pos;
   wxString* m_files;        // Memory (de)allocated by code calling ProcessEvent
 
   wxPoint   m_pos;
   wxString* m_files;        // Memory (de)allocated by code calling ProcessEvent
 

-  inline wxDropFilesEvent(WXTYPE type = 0, int noFiles = 0, wxString *files = NULL)
+  inline wxDropFilesEvent(wxEventType type = wxEVT_NULL, int noFiles = 0, wxString *files = NULL)

      { m_eventType = type; m_noFiles = noFiles; m_files = files; }
 
   inline wxPoint GetPosition(void) const { return m_pos; }
      { m_eventType = type; m_noFiles = noFiles; m_files = files; }
 
   inline wxPoint GetPosition(void) const { return m_pos; }


@@ -925,9 +927,10 @@ typedef void (wxObject::*wxObjectEventFunction)(wxEvent&);
 
 struct WXDLLEXPORT wxEventTableEntry
 {
 
 struct WXDLLEXPORT wxEventTableEntry
 {

-       int             m_eventType;            // main event type
-       int             m_id;                       // control/menu/toolbar id
-       int             m_lastId;                       // used for ranges of ids
+    // For some reason, this can't be wxEventType, or VC++ complains.
+       int                     m_eventType;            // main event type
+       int                             m_id;                       // control/menu/toolbar id
+       int                             m_lastId;                       // used for ranges of ids

        wxObjectEventFunction   m_fn;   // function to call: not wxEventFunction, because
                                                    // of dependency problems
        wxObject*       m_callbackUserData;
        wxObjectEventFunction   m_fn;   // function to call: not wxEventFunction, because
                                                    // of dependency problems
        wxObject*       m_callbackUserData;