Some stubs includes removed from wxMotif; wxNotebook sample hack to make it display;

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

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 09a8f871d0f058cd7f4dd237935e8a523cbe8009..402ee199c2ee9578d5b14cc34468f11b8090eb75 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -35,6 +35,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)

+IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)

 IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)


@@ -54,7 +55,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
 IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)

-IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxCommandEvent)

 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)


@@ -62,9 +63,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxQueryNewPaletteEvent, wxEvent)
 const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
 
 const wxEventTable wxEvtHandler::sm_eventTable =
 const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
 
 const wxEventTable wxEvtHandler::sm_eventTable =

-       { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
+       { (const wxEventTable *) NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+
+const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0,
+#ifdef __SGI_CC__
+// stupid SGI compiler --- offer aug 98
+       0L }
+#else 
+       NULL }
+#endif 
+};

 
 #endif
 
 
 #endif
 


@@ -80,12 +88,12 @@ const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL
 wxEvent::wxEvent(int theId)
 {
   m_eventType = wxEVT_NULL;
 wxEvent::wxEvent(int theId)
 {
   m_eventType = wxEVT_NULL;

-  m_eventObject = NULL;
-  m_eventHandle = 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;

-  m_callbackUserData = NULL;
+  m_callbackUserData = (wxObject *) NULL;

 }
 
 /*
 }
 
 /*


@@ -96,11 +104,12 @@ wxEvent::wxEvent(int theId)
 wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
 {
   m_eventType = commandType;
 wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
 {
   m_eventType = commandType;

-  m_clientData = NULL;
+  m_clientData = (char *) NULL;
+  m_clientObject = (wxClientData *) NULL;

   m_extraLong = 0;
   m_commandInt = 0;
   m_id = theId;
   m_extraLong = 0;
   m_commandInt = 0;
   m_id = theId;

-  m_commandString = NULL;
+  m_commandString = (char *) NULL;

 }
 
 /*
 }
 
 /*


@@ -127,6 +136,11 @@ wxMouseEvent::wxMouseEvent(wxEventType commandType)
   m_altDown = FALSE;
   m_controlDown = FALSE;
   m_shiftDown = FALSE;
   m_altDown = FALSE;
   m_controlDown = FALSE;
   m_shiftDown = FALSE;

+  m_leftDown = FALSE;
+  m_rightDown = FALSE;
+  m_middleDown = FALSE;
+  m_x = 0;
+  m_y = 0;

 }
 
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)
 }
 
 // True if was a button dclick event (1 = left, 2 = middle, 3 = right)


@@ -250,11 +264,10 @@ wxKeyEvent::wxKeyEvent(wxEventType type)
 
 wxEvtHandler::wxEvtHandler(void)
 {
 
 wxEvtHandler::wxEvtHandler(void)
 {

-  m_clientData = NULL;
-  m_nextHandler = NULL;
-  m_previousHandler = NULL;
+  m_nextHandler = (wxEvtHandler *) NULL;
+  m_previousHandler = (wxEvtHandler *) NULL;

   m_enabled = TRUE;
   m_enabled = TRUE;

-  m_dynamicEvents = NULL;
+  m_dynamicEvents = (wxList *) NULL;

 }
 
 wxEvtHandler::~wxEvtHandler(void)
 }
 
 wxEvtHandler::~wxEvtHandler(void)


@@ -358,11 +371,11 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
 {
   int i = 0;
   int commandId = event.GetId();
 {
   int i = 0;
   int commandId = event.GetId();

-  
-  while (table.entries[i].m_fn != NULL)
-  {
-//    wxEventType eventType = (wxEventType) table.entries[i].m_eventType;

 
 

+  // BC++ doesn't like while (table.entries[i].m_fn)
+
+  while (table.entries[i].m_fn != 0L)
+  {

     if ((event.GetEventType() == table.entries[i].m_eventType) &&
         (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1)
           (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) ||
     if ((event.GetEventType() == table.entries[i].m_eventType) &&
         (table.entries[i].m_id == -1 || // Match, if event spec says any id will do (id == -1)
           (table.entries[i].m_lastId == -1 && commandId == table.entries[i].m_id) ||


@@ -413,8 +426,6 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
   {
     wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
     
   {
     wxEventTableEntry *entry = (wxEventTableEntry*)node->Data();
     

-//    wxEventType eventType = (wxEventType) entry->m_eventType;
-  

     if (entry->m_fn)
     {
     if ((event.GetEventType() == entry->m_eventType) &&
     if (entry->m_fn)
     {
     if ((event.GetEventType() == entry->m_eventType) &&


@@ -433,7 +444,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event )
       else
             return TRUE;
        }
       else
             return TRUE;
        }

-    };
+    }

     node = node->Next();
   }
   return FALSE;
     node = node->Next();
   }
   return FALSE;