Commented setsockopt as it doesn't work anywhere. I will use signals for timeout.

[wxWidgets.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 9f66f5bbe0bc68ef28eb87cd22f6fbeaf35bbea2..d0e063d025d75db9c5f64f92525b7e837add2992 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -60,6 +60,8 @@
     IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxNavigationKeyEvent, wxCommandEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxPaletteChangedEvent, wxEvent)
     IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)

+    IMPLEMENT_DYNAMIC_CLASS(wxWindowCreateEvent, wxEvent)
+    IMPLEMENT_DYNAMIC_CLASS(wxWindowDestroyEvent, wxEvent)

 
     const wxEventTable *wxEvtHandler::GetEventTable() const
         { return &wxEvtHandler::sm_eventTable; }
 
     const wxEventTable *wxEvtHandler::GetEventTable() const
         { return &wxEvtHandler::sm_eventTable; }


@@ -91,7 +93,6 @@ wxEvent::wxEvent(int theId)
 {
     m_eventType = wxEVT_NULL;
     m_eventObject = (wxObject *) NULL;
 {
     m_eventType = wxEVT_NULL;
     m_eventObject = (wxObject *) NULL;

-    m_eventHandle = (char *) NULL;

     m_timeStamp = 0;
     m_id = theId;
     m_skipped = FALSE;
     m_timeStamp = 0;
     m_id = theId;
     m_skipped = FALSE;


@@ -106,7 +107,6 @@ void wxEvent::CopyObject(wxObject& object_dest) const
 
     obj->m_eventType = m_eventType;
     obj->m_eventObject = m_eventObject;
 
     obj->m_eventType = m_eventType;
     obj->m_eventObject = m_eventObject;

-    obj->m_eventHandle = m_eventHandle;

     obj->m_timeStamp = m_timeStamp;
     obj->m_id = m_id;
     obj->m_skipped = m_skipped;
     obj->m_timeStamp = m_timeStamp;
     obj->m_id = m_id;
     obj->m_skipped = m_skipped;


@@ -127,7 +127,7 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
     m_extraLong = 0;
     m_commandInt = 0;
     m_id = theId;
     m_extraLong = 0;
     m_commandInt = 0;
     m_id = theId;

-    m_commandString = (wxChar *) NULL;
+    m_commandString = wxEmptyString;

     m_isCommandEvent = TRUE;
 }
 
     m_isCommandEvent = TRUE;
 }
 


@@ -164,12 +164,22 @@ wxScrollEvent::wxScrollEvent(wxEventType commandType,
 wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
                                    int pos,
                                    int orient)
 wxScrollWinEvent::wxScrollWinEvent(wxEventType commandType,
                                    int pos,
                                    int orient)

-             : wxEvent(commandType)

 {
 {

+    m_eventType = commandType;

     m_extraLong = orient;
     m_commandInt = pos;
 }
 
     m_extraLong = orient;
     m_commandInt = pos;
 }
 

+void wxScrollWinEvent::CopyObject(wxObject& obj_d) const
+{
+    wxScrollWinEvent *obj = (wxScrollWinEvent*)&obj_d; 
+
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_extraLong    = m_extraLong;
+    obj->m_commandInt   = m_commandInt;
+}
+

 /*
  * Mouse events
  *
 /*
  * Mouse events
  *


@@ -326,6 +336,7 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
     m_metaDown = FALSE;
     m_altDown = FALSE;
     m_keyCode = 0;
     m_metaDown = FALSE;
     m_altDown = FALSE;
     m_keyCode = 0;

+    m_scanCode = 0;

 }
 
 void wxKeyEvent::CopyObject(wxObject& obj_d) const
 }
 
 void wxKeyEvent::CopyObject(wxObject& obj_d) const


@@ -405,7 +416,78 @@ void wxShowEvent::CopyObject(wxObject& obj_d) const
 
     obj->m_show = m_show;
 }
 
     obj->m_show = m_show;
 }

- 
+
+void wxJoystickEvent::CopyObject(wxObject& obj_d) const
+{
+    wxJoystickEvent *obj = (wxJoystickEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_pos = m_pos;
+    obj->m_zPosition = m_zPosition;
+    obj->m_buttonChange = m_buttonChange;
+    obj->m_buttonState = m_buttonState;
+    obj->m_joyStick = m_joyStick;
+} 
+
+void wxDropFilesEvent::CopyObject(wxObject& obj_d) const
+{
+    wxDropFilesEvent *obj = (wxDropFilesEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_noFiles = m_noFiles;
+    obj->m_pos = m_pos;
+    // TODO: Problem with obj->m_files. It should be deallocated by the
+    // destructor of the event. 
+}
+
+void wxIdleEvent::CopyObject(wxObject& obj_d) const
+{
+    wxIdleEvent *obj = (wxIdleEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_requestMore = m_requestMore;
+}
+
+void wxUpdateUIEvent::CopyObject(wxObject &obj_d) const
+{
+    wxUpdateUIEvent *obj = (wxUpdateUIEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_checked = m_checked;
+    obj->m_enabled = m_enabled;
+    obj->m_text = m_text;
+    obj->m_setText = m_setText;
+    obj->m_setChecked = m_setChecked;
+    obj->m_setEnabled = m_setEnabled;
+}
+
+void wxPaletteChangedEvent::CopyObject(wxObject &obj_d) const
+{
+    wxPaletteChangedEvent *obj = (wxPaletteChangedEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_changedWindow = m_changedWindow;
+}
+
+void wxQueryNewPaletteEvent::CopyObject(wxObject& obj_d) const
+{
+    wxQueryNewPaletteEvent *obj = (wxQueryNewPaletteEvent *)&obj_d;
+    wxEvent::CopyObject(obj_d);
+
+    obj->m_paletteRealized = m_paletteRealized;
+}
+
+wxWindowCreateEvent::wxWindowCreateEvent(wxWindow *win)
+                   : wxEvent(wxEVT_CREATE)
+{
+    SetEventObject(win);
+}
+
+wxWindowDestroyEvent::wxWindowDestroyEvent(wxWindow *win)
+                    : wxEvent(wxEVT_DESTROY)
+{
+    SetEventObject(win);
+}

 
 /*
  * Event handler
 
 /*
  * Event handler


@@ -458,7 +540,6 @@ wxEvtHandler::~wxEvtHandler()
 
 #ifdef __WXGTK__
 extern bool g_isIdle;
 
 #ifdef __WXGTK__
 extern bool g_isIdle;

-

 extern void wxapp_install_idle_handler();
 #endif
 
 extern void wxapp_install_idle_handler();
 #endif
 


@@ -467,7 +548,6 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
     wxEvent *event_main;
     wxCriticalSectionLocker locker(*m_eventsLocker);
 
     wxEvent *event_main;
     wxCriticalSectionLocker locker(*m_eventsLocker);
 

-

     // check that we are really in a child thread
     wxASSERT( !wxThread::IsMain() );
 
     // check that we are really in a child thread
     wxASSERT( !wxThread::IsMain() );
 


@@ -482,8 +562,10 @@ bool wxEvtHandler::ProcessThreadEvent(wxEvent& event)
     wxPendingEvents->Append(this);
     wxPendingEventsLocker->Leave();
 
     wxPendingEvents->Append(this);
     wxPendingEventsLocker->Leave();
 

+    // TODO: Wake up idle handler for the other platforms.

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();

 #endif
 
     return TRUE;
 #endif
 
     return TRUE;


@@ -510,26 +592,27 @@ void wxEvtHandler::ProcessPendingEvents()
 
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {
 
 bool wxEvtHandler::ProcessEvent(wxEvent& event)
 {

-    // check that our flag corresponds to reality
+    /* check that our flag corresponds to reality */

     wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
 
     wxASSERT( m_isWindow == IsKindOf(CLASSINFO(wxWindow)) );
 

-    // An event handler can be enabled or disabled
+    /* An event handler can be enabled or disabled */

     if ( GetEvtHandlerEnabled() )
     {
 #if wxUSE_THREADS
     if ( GetEvtHandlerEnabled() )
     {
 #if wxUSE_THREADS

-       // Check whether we are in a child thread.
+       /* Check whether we are in a child thread. */

         if (!wxThread::IsMain())
           return ProcessThreadEvent(event);
 #endif
         if (!wxThread::IsMain())
           return ProcessThreadEvent(event);
 #endif

-        // Handle per-instance dynamic event tables first
+        /* Handle per-instance dynamic event tables first */

 
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 
 
         if ( m_dynamicEvents && SearchDynamicEventTable(event) )
             return TRUE;
 

-        // Then static per-class event tables
+        /* Then static per-class event tables */

 
         const wxEventTable *table = GetEventTable();
 
 
         const wxEventTable *table = GetEventTable();
 

+#if wxUSE_VALIDATORS

         // Try the associated validator first, if this is a window.
         // Problem: if the event handler of the window has been replaced,
         // this wxEvtHandler may no longer be a window.
         // Try the associated validator first, if this is a window.
         // Problem: if the event handler of the window has been replaced,
         // this wxEvtHandler may no longer be a window.


@@ -538,7 +621,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
         // THIS CAN BE CURED if PushEventHandler is used instead of
         // SetEventHandler, and then processing will be passed down the
         // chain of event handlers.
         // THIS CAN BE CURED if PushEventHandler is used instead of
         // SetEventHandler, and then processing will be passed down the
         // chain of event handlers.

-        if ( m_isWindow )
+        if (m_isWindow)

         {
             wxWindow *win = (wxWindow *)this;
 
         {
             wxWindow *win = (wxWindow *)this;
 


@@ -553,9 +636,10 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
                 }
             }
         }
                 }
             }
         }

+#endif

 
         // Search upwards through the inheritance hierarchy
 
         // Search upwards through the inheritance hierarchy

-        while ( table )
+        while (table)

         {
             if ( SearchEventTable((wxEventTable&)*table, event) )
                 return TRUE;
         {
             if ( SearchEventTable((wxEventTable&)*table, event) )
                 return TRUE;