use wxEventType coherently with the docs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index 476ac5b5183f847854f9eded7080d2f81a4bb210..23f1f353766161d4875c69aec522820da80267c2 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -2297,21 +2297,21 @@ public:
     // winid and event type
     void Connect(int winid,
                  int lastId,
     // winid and event type
     void Connect(int winid,
                  int lastId,

-                 int eventType,
+                 wxEventType eventType,

                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL);
 
     // Convenience function: take just one id
     void Connect(int winid,
                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL);
 
     // Convenience function: take just one id
     void Connect(int winid,

-                 int eventType,
+                 wxEventType eventType,

                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { Connect(winid, wxID_ANY, eventType, func, userData, eventSink); }
 
     // Even more convenient: without id (same as using id of wxID_ANY)
                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
         { Connect(winid, wxID_ANY, eventType, func, userData, eventSink); }
 
     // Even more convenient: without id (same as using id of wxID_ANY)

-    void Connect(int eventType,
+    void Connect(wxEventType eventType,

                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL)
                  wxObjectEventFunction func,
                  wxObject *userData = (wxObject *) NULL,
                  wxEvtHandler *eventSink = (wxEvtHandler *) NULL)

diff --git a/src/common/event.cpp b/src/common/event.cpp
index c60c8dc26553b368c54721742da74c2e7ceaf6e1..590c3adf3e0939eee70349257d7f743f21b964f2 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -1298,7 +1298,7 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
         return true;
 
     // propagate the event upwards the window chain and/or to the application
         return true;
 
     // propagate the event upwards the window chain and/or to the application

-    // object if it wasn't processed at this level 
+    // object if it wasn't processed at this level

     return TryParent(event);
 }
 
     return TryParent(event);
 }
 


@@ -1383,7 +1383,7 @@ bool wxEvtHandler::SearchEventTable(wxEventTable& table, wxEvent& event)
 }
 
 void wxEvtHandler::Connect( int id, int lastId,
 }
 
 void wxEvtHandler::Connect( int id, int lastId,

-                            int eventType,
+                            wxEventType eventType,

                             wxObjectEventFunction func,
                             wxObject *userData,
                             wxEvtHandler* eventSink )
                             wxObjectEventFunction func,
                             wxObject *userData,
                             wxEvtHandler* eventSink )