compilation fix after incorrectly resolved conflict

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 93e2619606e2279c258c653e06e3303744938221..900014b7d460fbd46d96d31e64b295a38a824c50 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -66,6 +66,7 @@ const wxEventType wxEVT_COMMAND_VLBOX_SELECTED =            wxEVT_FIRST + 14;
 const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED =         wxEVT_FIRST + 15;
 const wxEventType wxEVT_COMMAND_TOOL_RCLICKED =             wxEVT_FIRST + 16;
 const wxEventType wxEVT_COMMAND_TOOL_ENTER =                wxEVT_FIRST + 17;
 const wxEventType wxEVT_COMMAND_COMBOBOX_SELECTED =         wxEVT_FIRST + 15;
 const wxEventType wxEVT_COMMAND_TOOL_RCLICKED =             wxEVT_FIRST + 16;
 const wxEventType wxEVT_COMMAND_TOOL_ENTER =                wxEVT_FIRST + 17;

+const wxEventType wxEVT_COMMAND_SPINCTRL_UPDATED =          wxEVT_FIRST + 18;

 
 /* Sockets send events, too */
 const wxEventType wxEVT_SOCKET =                            wxEVT_FIRST + 50;
 
 /* Sockets send events, too */
 const wxEventType wxEVT_SOCKET =                            wxEVT_FIRST + 50;


@@ -506,7 +507,7 @@ public:
     void CopyObject(wxObject& object_dest) const;
 public:
     int               m_commandInt;    // Additional information
     void CopyObject(wxObject& object_dest) const;
 public:
     int               m_commandInt;    // Additional information

-    long              m_extraLong;     
+    long              m_extraLong;

 };
 
 // Mouse event class
 };
 
 // Mouse event class


@@ -605,10 +606,10 @@ public:
     bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
 
     // Find the position of the event
     bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); }
 
     // Find the position of the event

-    void GetPosition(wxCoord *xpos, wxCoord *ypos) const 
+    void GetPosition(wxCoord *xpos, wxCoord *ypos) const

     {
         if (xpos)
     {
         if (xpos)

-            *xpos = m_x; 
+            *xpos = m_x;

         if (ypos)
             *ypos = m_y;
     }
         if (ypos)
             *ypos = m_y;
     }


@@ -617,7 +618,7 @@ public:
     void GetPosition(long *xpos, long *ypos) const
     {
         if (xpos)
     void GetPosition(long *xpos, long *ypos) const
     {
         if (xpos)

-            *xpos = (long)m_x; 
+            *xpos = (long)m_x;

         if (ypos)
             *ypos = (long)m_y;
     }
         if (ypos)
             *ypos = (long)m_y;
     }


@@ -631,10 +632,10 @@ public:
 
     // Compatibility
 #if WXWIN_COMPATIBILITY
 
     // Compatibility
 #if WXWIN_COMPATIBILITY

-    void Position(long *xpos, long *ypos) const 
+    void Position(long *xpos, long *ypos) const

     {
         if (xpos)
     {
         if (xpos)

-            *xpos = (long)m_x; 
+            *xpos = (long)m_x;

         if (ypos)
             *ypos = (long)m_y;
     }
         if (ypos)
             *ypos = (long)m_y;
     }


@@ -692,14 +693,14 @@ public:
     // Find the position of the event
     void GetPosition(wxCoord *xpos, wxCoord *ypos) const
     {
     // Find the position of the event
     void GetPosition(wxCoord *xpos, wxCoord *ypos) const
     {

-        if (xpos) *xpos = m_x; 
+        if (xpos) *xpos = m_x;

         if (ypos) *ypos = m_y;
     }
 
 #ifndef __WIN16__
     void GetPosition(long *xpos, long *ypos) const
     {
         if (ypos) *ypos = m_y;
     }
 
 #ifndef __WIN16__
     void GetPosition(long *xpos, long *ypos) const
     {

-        if (xpos) *xpos = (long)m_x; 
+        if (xpos) *xpos = (long)m_x;

         if (ypos) *ypos = (long)m_y;
     }
 #endif
         if (ypos) *ypos = (long)m_y;
     }
 #endif


@@ -1363,7 +1364,7 @@ public:
     // process all pending events
     void ProcessPendingEvents();
 
     // process all pending events
     void ProcessPendingEvents();
 

-    // add a 
+    // add a

 #if wxUSE_THREADS
     bool ProcessThreadEvent(wxEvent& event);
 #endif
 #if wxUSE_THREADS
     bool ProcessThreadEvent(wxEvent& event);
 #endif


@@ -1395,7 +1396,13 @@ public:
     bool SearchDynamicEventTable( wxEvent& event );
 
 #if wxUSE_THREADS
     bool SearchDynamicEventTable( wxEvent& event );
 
 #if wxUSE_THREADS

-    void ClearEventLocker() { delete m_eventsLocker; m_eventsLocker = NULL; };
+    void ClearEventLocker()
+   {
+#  if !defined(__VISAGECPP__)
+      delete m_eventsLocker;
+      m_eventsLocker = NULL;
+#endif
+   };

 #endif
 
     // old stuff
 #endif
 
     // old stuff


@@ -1430,7 +1437,11 @@ protected:
     wxList*             m_dynamicEvents;
     wxList*             m_pendingEvents;
 #if wxUSE_THREADS
     wxList*             m_dynamicEvents;
     wxList*             m_pendingEvents;
 #if wxUSE_THREADS

+#if defined (__VISAGECPP__)
+    wxCriticalSection   m_eventsLocker;
+#  else

     wxCriticalSection*  m_eventsLocker;
     wxCriticalSection*  m_eventsLocker;

+#  endif

 #endif
 
     // optimization: instead of using costly IsKindOf() to decide whether we're
 #endif
 
     // optimization: instead of using costly IsKindOf() to decide whether we're


@@ -1639,6 +1650,7 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 #define EVT_TOOL_RCLICKED_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
 #define EVT_TOOL_ENTER(id, fn) { wxEVT_COMMAND_TOOL_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
 #define EVT_CHECKLISTBOX(id, fn) { wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
 #define EVT_TOOL_RCLICKED_RANGE(id1, id2, fn) { wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
 #define EVT_TOOL_ENTER(id, fn) { wxEVT_COMMAND_TOOL_ENTER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
 #define EVT_CHECKLISTBOX(id, fn) { wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },

+#define EVT_SPINCTRL(id, fn) { wxEVT_COMMAND_SPINCTRL_UPDATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },

 
 // Generic command events
 #define EVT_COMMAND_LEFT_CLICK(id, fn) { wxEVT_COMMAND_LEFT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
 
 // Generic command events
 #define EVT_COMMAND_LEFT_CLICK(id, fn) { wxEVT_COMMAND_LEFT_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },