applied patch 410892 (wxCopyFile uses ::CopyFile under Win32, has overwrite parameter)

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 3a7ab33ba521f477f2ab29afbf14a39f592f0db7..933a8c4ac7ea08e563da49c1b0fa9243200a0460 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -74,8 +74,10 @@ typedef int wxEventType;
 #define BEGIN_DECLARE_EVENT_TYPES() enum {
 #define END_DECLARE_EVENT_TYPES() };
 #define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,
 #define BEGIN_DECLARE_EVENT_TYPES() enum {
 #define END_DECLARE_EVENT_TYPES() };
 #define DECLARE_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,

+#define DECLARE_LOCAL_EVENT_TYPE(name, value) name = wxEVT_FIRST + value,

 #define DEFINE_EVENT_TYPE(name)
 
 #define DEFINE_EVENT_TYPE(name)
 

+

 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 
 #define DECLARE_EVENT_TABLE_ENTRY(type, id, idLast, fn, obj) \
 #else // !WXWIN_COMPATIBILITY_EVENT_TYPES
 
 #define DECLARE_EVENT_TABLE_ENTRY(type, id, idLast, fn, obj) \


@@ -85,6 +87,7 @@ typedef int wxEventType;
 #define END_DECLARE_EVENT_TYPES()
 #define DECLARE_EVENT_TYPE(name, value) \
     extern const wxEventType WXDLLEXPORT name;
 #define END_DECLARE_EVENT_TYPES()
 #define DECLARE_EVENT_TYPE(name, value) \
     extern const wxEventType WXDLLEXPORT name;

+#define DECLARE_LOCAL_EVENT_TYPE(name, value) extern const wxEventType name;

 #define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
 
 // generate a new unique event type
 #define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType();
 
 // generate a new unique event type


@@ -370,6 +373,7 @@ public:
  wxEVT_COMMAND_SCROLLBAR_UPDATED
  wxEVT_COMMAND_VLBOX_SELECTED
  wxEVT_COMMAND_COMBOBOX_SELECTED
  wxEVT_COMMAND_SCROLLBAR_UPDATED
  wxEVT_COMMAND_VLBOX_SELECTED
  wxEVT_COMMAND_COMBOBOX_SELECTED

+ wxEVT_COMMAND_TOGGLEBUTTON_CLICKED

 */
 
 class WXDLLEXPORT wxCommandEvent : public wxEvent
 */
 
 class WXDLLEXPORT wxCommandEvent : public wxEvent


@@ -1696,7 +1700,7 @@ typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&);
         { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \
     const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 
         { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \
     const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
 

-#define END_EVENT_TABLE() DECLARE_EVENT_TABLE_ENTRY( 0, 0, 0, 0, 0 ) };
+#define END_EVENT_TABLE() DECLARE_EVENT_TABLE_ENTRY( wxEVT_NULL, 0, 0, 0, 0 ) };

 
 /*
  * Event table macros
 
 /*
  * Event table macros