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
This commit is contained in:
		@@ -50,27 +50,27 @@ class WXDLLIMPEXP_PLOT wxPlotWindow;
 | 
				
			|||||||
//-----------------------------------------------------------------------------
 | 
					//-----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
BEGIN_DECLARE_EVENT_TYPES()
 | 
					BEGIN_DECLARE_EVENT_TYPES()
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGING,  0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGING,  941)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGED, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGED, 921)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_CLICKED, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_CLICKED, 922)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_DOUBLECLICKED, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_DOUBLECLICKED, 923)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_IN, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_IN, 924)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_OUT, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_OUT, 925)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATING, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATING, 926)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATED, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATED, 927)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGING, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGING, 928)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGED, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGED, 929)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATING, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATING, 930)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATED, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATED, 931)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGING, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGING, 932)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGED, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGED, 933)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_X_LABEL_EDIT, 0)
 | 
					    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, 0)
 | 
					    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, 0)
 | 
					    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, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_Y_LABEL_EDIT, 937)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_TITLE_EDIT, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_TITLE_EDIT, 938)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_TITLE_EDIT, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_TITLE_EDIT, 939)
 | 
				
			||||||
    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_CREATE, 0)
 | 
					    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_CREATE, 940)
 | 
				
			||||||
END_DECLARE_EVENT_TYPES()
 | 
					END_DECLARE_EVENT_TYPES()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define wxPLOT_X_AXIS          0x0004
 | 
					#define wxPLOT_X_AXIS          0x0004
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -54,27 +54,27 @@
 | 
				
			|||||||
// event types
 | 
					// event types
 | 
				
			||||||
//----------------------------------------------------------------------------
 | 
					//----------------------------------------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const int wxEVT_PLOT_SEL_CHANGING = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGING);
 | 
				
			||||||
const int wxEVT_PLOT_SEL_CHANGED = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_SEL_CHANGED);
 | 
				
			||||||
const int wxEVT_PLOT_CLICKED = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_CLICKED);
 | 
				
			||||||
const int wxEVT_PLOT_DOUBLECLICKED = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_DOUBLECLICKED);
 | 
				
			||||||
const int wxEVT_PLOT_ZOOM_IN = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_IN);
 | 
				
			||||||
const int wxEVT_PLOT_ZOOM_OUT = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_ZOOM_OUT);
 | 
				
			||||||
const int wxEVT_PLOT_VALUE_SEL_CREATING = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATING);
 | 
				
			||||||
const int wxEVT_PLOT_VALUE_SEL_CREATED = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CREATED);
 | 
				
			||||||
const int wxEVT_PLOT_VALUE_SEL_CHANGING = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGING);
 | 
				
			||||||
const int wxEVT_PLOT_VALUE_SEL_CHANGED = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_VALUE_SEL_CHANGED);
 | 
				
			||||||
const int wxEVT_PLOT_AREA_SEL_CREATING = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATING);
 | 
				
			||||||
const int wxEVT_PLOT_AREA_SEL_CREATED = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CREATED);
 | 
				
			||||||
const int wxEVT_PLOT_AREA_SEL_CHANGING = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGING);
 | 
				
			||||||
const int wxEVT_PLOT_AREA_SEL_CHANGED = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_SEL_CHANGED);
 | 
				
			||||||
const int wxEVT_PLOT_BEGIN_X_LABEL_EDIT = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_X_LABEL_EDIT);
 | 
				
			||||||
const int wxEVT_PLOT_END_X_LABEL_EDIT = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_END_X_LABEL_EDIT);
 | 
				
			||||||
const int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_Y_LABEL_EDIT);
 | 
				
			||||||
const int wxEVT_PLOT_END_Y_LABEL_EDIT = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_END_Y_LABEL_EDIT);
 | 
				
			||||||
const int wxEVT_PLOT_BEGIN_TITLE_EDIT = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_BEGIN_TITLE_EDIT);
 | 
				
			||||||
const int wxEVT_PLOT_END_TITLE_EDIT = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_END_TITLE_EDIT);
 | 
				
			||||||
const int wxEVT_PLOT_AREA_CREATE = wxNewEventType();
 | 
					DEFINE_EVENT_TYPE(wxEVT_PLOT_AREA_CREATE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
//----------------------------------------------------------------------------
 | 
					//----------------------------------------------------------------------------
 | 
				
			||||||
// accessor functions for the bitmaps (may return NULL, check for it!)
 | 
					// accessor functions for the bitmaps (may return NULL, check for it!)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user