Fix previous change in case somebody is still using

WXWIN_COMPATIBILITY_EVENT_TYPES from wxWidgets 2.2...

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

diff --git a/contrib/include/wx/plot/plot.h b/contrib/include/wx/plot/plot.h
index 5c51df8f264f5fd341ab2bb9fa7a03debeba3981..409a3a08705fcf1f7c8f32504ccf7b7d5cb1c91e 100644 (file)
--- a/contrib/include/wx/plot/plot.h
+++ b/contrib/include/wx/plot/plot.h
@@ -50,27 +50,27 @@ class WXDLLIMPEXP_PLOT wxPlotWindow;
 //-----------------------------------------------------------------------------
 
 BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGING,  0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGED, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_CLICKED, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_DOUBLECLICKED, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_IN, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_OUT, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATING, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATED, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGING, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGED, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATING, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATED, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGING, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGED, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_X_LABEL_EDIT, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_X_LABEL_EDIT, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_Y_LABEL_EDIT, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_TITLE_EDIT, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_TITLE_EDIT, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_CREATE, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGING,  941)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGED, 921)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_CLICKED, 922)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_DOUBLECLICKED, 923)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_IN, 924)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_OUT, 925)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATING, 926)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATED, 927)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGING, 928)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGED, 929)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATING, 930)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATED, 931)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGING, 932)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGED, 933)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_X_LABEL_EDIT, 934)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_X_LABEL_EDIT, 935)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, 936)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_Y_LABEL_EDIT, 937)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_TITLE_EDIT, 938)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_TITLE_EDIT, 939)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_CREATE, 940)
 END_DECLARE_EVENT_TYPES()
 
 #define wxPLOT_X_AXIS          0x0004

diff --git a/contrib/src/plot/plot.cpp b/contrib/src/plot/plot.cpp
index cd44a0694c79016b72e04724d9d0a4dea3f5c662..d3c4290643d91b8d7fd049d6b1845d1e4a9af805 100644 (file)
--- a/contrib/src/plot/plot.cpp
+++ b/contrib/src/plot/plot.cpp
@@ -54,27 +54,27 @@
 // event types
 //----------------------------------------------------------------------------
 
-const int wxEVT_PLOT_SEL_CHANGING = wxNewEventType();
-const int wxEVT_PLOT_SEL_CHANGED = wxNewEventType();
-const int wxEVT_PLOT_CLICKED = wxNewEventType();
-const int wxEVT_PLOT_DOUBLECLICKED = wxNewEventType();
-const int wxEVT_PLOT_ZOOM_IN = wxNewEventType();
-const int wxEVT_PLOT_ZOOM_OUT = wxNewEventType();
-const int wxEVT_PLOT_VALUE_SEL_CREATING = wxNewEventType();
-const int wxEVT_PLOT_VALUE_SEL_CREATED = wxNewEventType();
-const int wxEVT_PLOT_VALUE_SEL_CHANGING = wxNewEventType();
-const int wxEVT_PLOT_VALUE_SEL_CHANGED = wxNewEventType();
-const int wxEVT_PLOT_AREA_SEL_CREATING = wxNewEventType();
-const int wxEVT_PLOT_AREA_SEL_CREATED = wxNewEventType();
-const int wxEVT_PLOT_AREA_SEL_CHANGING = wxNewEventType();
-const int wxEVT_PLOT_AREA_SEL_CHANGED = wxNewEventType();
-const int wxEVT_PLOT_BEGIN_X_LABEL_EDIT = wxNewEventType();
-const int wxEVT_PLOT_END_X_LABEL_EDIT = wxNewEventType();
-const int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT = wxNewEventType();
-const int wxEVT_PLOT_END_Y_LABEL_EDIT = wxNewEventType();
-const int wxEVT_PLOT_BEGIN_TITLE_EDIT = wxNewEventType();
-const int wxEVT_PLOT_END_TITLE_EDIT = wxNewEventType();
-const int wxEVT_PLOT_AREA_CREATE = wxNewEventType();
+DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGING);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGED);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_CLICKED);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_DOUBLECLICKED);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_IN);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_OUT);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATING);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATED);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGING);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGED);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATING);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATED);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGING);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGED);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_X_LABEL_EDIT);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_END_X_LABEL_EDIT);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_END_Y_LABEL_EDIT);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_TITLE_EDIT);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_END_TITLE_EDIT);
+DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_CREATE);
 
 //----------------------------------------------------------------------------
 // accessor functions for the bitmaps (may return NULL, check for it!)