This is how wxPlotWindow would look like with the

    suggested event type creation.

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

diff --git a/contrib/include/wx/plot/plot.h b/contrib/include/wx/plot/plot.h
index 68b948d17b8937f2833a95667ca5d3d033d16051..d031f77dd6aa64c1fab45eff238264aa3656b213 100644 (file)
--- a/contrib/include/wx/plot/plot.h
+++ b/contrib/include/wx/plot/plot.h
@@ -38,27 +38,27 @@ class WXDLLEXPORT wxPlotWindow;
 // classes
 //-----------------------------------------------------------------------------
 
-extern int wxEVT_PLOT_SEL_CHANGING;
-extern int wxEVT_PLOT_SEL_CHANGED;
-extern int wxEVT_PLOT_CLICKED;
-extern int wxEVT_PLOT_DOUBLECLICKED;
-extern int wxEVT_PLOT_ZOOM_IN;
-extern int wxEVT_PLOT_ZOOM_OUT;
-extern int wxEVT_PLOT_VALUE_SEL_CREATING;
-extern int wxEVT_PLOT_VALUE_SEL_CREATED;
-extern int wxEVT_PLOT_VALUE_SEL_CHANGING;
-extern int wxEVT_PLOT_VALUE_SEL_CHANGED;
-extern int wxEVT_PLOT_AREA_SEL_CREATING;
-extern int wxEVT_PLOT_AREA_SEL_CREATED;
-extern int wxEVT_PLOT_AREA_SEL_CHANGING;
-extern int wxEVT_PLOT_AREA_SEL_CHANGED;
-extern int wxEVT_PLOT_BEGIN_X_LABEL_EDIT;
-extern int wxEVT_PLOT_END_X_LABEL_EDIT;
-extern int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT;
-extern int wxEVT_PLOT_END_Y_LABEL_EDIT;
-extern int wxEVT_PLOT_BEGIN_TITLE_EDIT;
-extern int wxEVT_PLOT_END_TITLE_EDIT;
-extern int wxEVT_PLOT_AREA_CREATE;
+extern const int wxEVT_PLOT_SEL_CHANGING;
+extern const int wxEVT_PLOT_SEL_CHANGED;
+extern const int wxEVT_PLOT_CLICKED;
+extern const int wxEVT_PLOT_DOUBLECLICKED;
+extern const int wxEVT_PLOT_ZOOM_IN;
+extern const int wxEVT_PLOT_ZOOM_OUT;
+extern const int wxEVT_PLOT_VALUE_SEL_CREATING;
+extern const int wxEVT_PLOT_VALUE_SEL_CREATED;
+extern const int wxEVT_PLOT_VALUE_SEL_CHANGING;
+extern const int wxEVT_PLOT_VALUE_SEL_CHANGED;
+extern const int wxEVT_PLOT_AREA_SEL_CREATING;
+extern const int wxEVT_PLOT_AREA_SEL_CREATED;
+extern const int wxEVT_PLOT_AREA_SEL_CHANGING;
+extern const int wxEVT_PLOT_AREA_SEL_CHANGED;
+extern const int wxEVT_PLOT_BEGIN_X_LABEL_EDIT;
+extern const int wxEVT_PLOT_END_X_LABEL_EDIT;
+extern const int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT;
+extern const int wxEVT_PLOT_END_Y_LABEL_EDIT;
+extern const int wxEVT_PLOT_BEGIN_TITLE_EDIT;
+extern const int wxEVT_PLOT_END_TITLE_EDIT;
+extern const int wxEVT_PLOT_AREA_CREATE;
 
 //-----------------------------------------------------------------------------
 // consts

diff --git a/contrib/src/plot/Makefile.in b/contrib/src/plot/Makefile.in
index 3d3d55a65fe3e51535acd65e63368c62d259fb17..77a75d9b3910e7e45cead29577a74c755c7d6109 100644 (file)
--- a/contrib/src/plot/Makefile.in
+++ b/contrib/src/plot/Makefile.in
@@ -4,7 +4,7 @@ top_srcdir = @top_srcdir@/..
 top_builddir = ../../..
 libsrc_dir = contrib/src/plot
 
-TARGET_LIBNAME=libplot
+TARGET_LIBNAME=libwx_plot
 
 LIBVERSION_CURRENT=1
 LIBVERSION_REVISION=0

diff --git a/contrib/src/plot/plot.cpp b/contrib/src/plot/plot.cpp
index 5f46be05e8a61c8848c80faa07a6fb6866281b54..1ed90f76ac495f51a79206eb91d00960283fdbfd 100644 (file)
--- a/contrib/src/plot/plot.cpp
+++ b/contrib/src/plot/plot.cpp
@@ -33,6 +33,7 @@
 
 #include "wx/plot/plot.h"
 #include "wx/bmpbuttn.h"
+#include "wx/module.h"
 
 #include <math.h>
 
@@ -53,27 +54,27 @@
 // event types
 //----------------------------------------------------------------------------
 
-int wxEVT_PLOT_SEL_CHANGING = wxNewId();
-int wxEVT_PLOT_SEL_CHANGED = wxNewId();
-int wxEVT_PLOT_CLICKED = wxNewId();
-int wxEVT_PLOT_DOUBLECLICKED = wxNewId();
-int wxEVT_PLOT_ZOOM_IN = wxNewId();
-int wxEVT_PLOT_ZOOM_OUT = wxNewId();
-int wxEVT_PLOT_VALUE_SEL_CREATING = wxNewId();
-int wxEVT_PLOT_VALUE_SEL_CREATED = wxNewId();
-int wxEVT_PLOT_VALUE_SEL_CHANGING = wxNewId();
-int wxEVT_PLOT_VALUE_SEL_CHANGED = wxNewId();
-int wxEVT_PLOT_AREA_SEL_CREATING = wxNewId();
-int wxEVT_PLOT_AREA_SEL_CREATED = wxNewId();
-int wxEVT_PLOT_AREA_SEL_CHANGING = wxNewId();
-int wxEVT_PLOT_AREA_SEL_CHANGED = wxNewId();
-int wxEVT_PLOT_BEGIN_X_LABEL_EDIT = wxNewId();
-int wxEVT_PLOT_END_X_LABEL_EDIT = wxNewId();
-int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT = wxNewId();
-int wxEVT_PLOT_END_Y_LABEL_EDIT = wxNewId();
-int wxEVT_PLOT_BEGIN_TITLE_EDIT = wxNewId();
-int wxEVT_PLOT_END_TITLE_EDIT = wxNewId();
-int wxEVT_PLOT_AREA_CREATE = wxNewId();
+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();
 
 //----------------------------------------------------------------------------
 // accessor functions for the bitmaps (may return NULL, check for it!)