Added convenience form of wxEvtHandler::Connect, only one id; changed

type to wxEventType; fixed my regconf.h mistake in config.cpp (oops)

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

diff --git a/include/wx/event.h b/include/wx/event.h
index aa5431881ceec299963503a8c8f35e95c6744e0b..05bc7792367f3ca3465f8a03b7355ea756c543df 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -1075,11 +1075,16 @@ class WXDLLEXPORT wxEvtHandler: public wxObject
 
   virtual bool ProcessEvent(wxEvent& event);
   virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
 
   virtual bool ProcessEvent(wxEvent& event);
   virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);

-  
-  void Connect( int id, int lastId,
-                int eventType,
+
+  // Dynamic association of a member function handler with the event handler, id and event type
+  void Connect( int id, int lastId, wxEventType eventType,

                wxObjectEventFunction func,
                wxObject *userData = (wxObject *) NULL );
                wxObjectEventFunction func,
                wxObject *userData = (wxObject *) NULL );

+
+  // Convenience function: take just one id
+  inline void Connect( int id, wxEventType eventType,
+               wxObjectEventFunction func,
+               wxObject *userData = (wxObject *) NULL ) { Connect(id, -1, eventType, func, userData); }

                
   bool SearchDynamicEventTable( wxEvent& event );
 
                
   bool SearchDynamicEventTable( wxEvent& event );
 

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 9f25a1f05b1602d63ff24fcbf7813cf90692f083..1510e939a72c3c6fd3f1c00786ceca49c34cdfae 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -42,7 +42,7 @@
 // we must include (one of) these files for wxConfigBase::Create
 #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
   #ifdef __WIN32__
 // we must include (one of) these files for wxConfigBase::Create
 #if defined(__WXMSW__) && defined(wxCONFIG_WIN32_NATIVE)
   #ifdef __WIN32__

-    #include  <wx/msw/iniconf.h>
+    #include  <wx/msw/regconf.h>

   #else  //WIN16
     #include  <wx/msw/iniconf.h>
   #endif
   #else  //WIN16
     #include  <wx/msw/iniconf.h>
   #endif

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 402ee199c2ee9578d5b14cc34468f11b8090eb75..14f9904a0f17bc6b50c8e88abd2c8739f2cc8913 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -398,7 +398,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 )
 {
                     wxObjectEventFunction func,
                     wxObject *userData )
 {