This way the plot events work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
32f3104396
commit
adb85931ab
@ -18,7 +18,7 @@
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
#include "wx/plot.h"
|
||||
#include "wx/plot/plot.h"
|
||||
|
||||
#include "wx/image.h"
|
||||
#include "wx/listctrl.h"
|
||||
|
@ -49,6 +49,32 @@
|
||||
#include "wx/plot/plot_dwn.xpm"
|
||||
#endif
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// 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();
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// accessor functions for the bitmaps (may return NULL, check for it!)
|
||||
//----------------------------------------------------------------------------
|
||||
@ -60,32 +86,6 @@ static wxBitmap *GetZoomOutBitmap();
|
||||
static wxBitmap *GetUpBitmap();
|
||||
static wxBitmap *GetDownBitmap();
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// event types
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
int wxEVT_PLOT_SEL_CHANGING;
|
||||
int wxEVT_PLOT_SEL_CHANGED;
|
||||
int wxEVT_PLOT_CLICKED;
|
||||
int wxEVT_PLOT_DOUBLECLICKED;
|
||||
int wxEVT_PLOT_ZOOM_IN;
|
||||
int wxEVT_PLOT_ZOOM_OUT;
|
||||
int wxEVT_PLOT_VALUE_SEL_CREATING;
|
||||
int wxEVT_PLOT_VALUE_SEL_CREATED;
|
||||
int wxEVT_PLOT_VALUE_SEL_CHANGING;
|
||||
int wxEVT_PLOT_VALUE_SEL_CHANGED;
|
||||
int wxEVT_PLOT_AREA_SEL_CREATING;
|
||||
int wxEVT_PLOT_AREA_SEL_CREATED;
|
||||
int wxEVT_PLOT_AREA_SEL_CHANGING;
|
||||
int wxEVT_PLOT_AREA_SEL_CHANGED;
|
||||
int wxEVT_PLOT_BEGIN_X_LABEL_EDIT;
|
||||
int wxEVT_PLOT_END_X_LABEL_EDIT;
|
||||
int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT;
|
||||
int wxEVT_PLOT_END_Y_LABEL_EDIT;
|
||||
int wxEVT_PLOT_BEGIN_TITLE_EDIT;
|
||||
int wxEVT_PLOT_END_TITLE_EDIT;
|
||||
int wxEVT_PLOT_AREA_CREATE;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// consts
|
||||
//-----------------------------------------------------------------------------
|
||||
@ -1153,52 +1153,3 @@ static wxBitmap *GetDownBitmap()
|
||||
return s_bitmap;
|
||||
}
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// wxPlotModule
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
class wxPlotModule : public wxModule
|
||||
{
|
||||
public:
|
||||
bool OnInit();
|
||||
void OnExit();
|
||||
|
||||
private:
|
||||
DECLARE_CLASS(wxPlotModule)
|
||||
};
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPlotModule, wxModule)
|
||||
|
||||
bool wxPlotModule::OnInit()
|
||||
{
|
||||
wxEVT_PLOT_SEL_CHANGING = wxNewId();
|
||||
wxEVT_PLOT_SEL_CHANGED = wxNewId();
|
||||
wxEVT_PLOT_CLICKED = wxNewId();
|
||||
wxEVT_PLOT_DOUBLECLICKED = wxNewId();
|
||||
wxEVT_PLOT_ZOOM_IN = wxNewId();
|
||||
wxEVT_PLOT_ZOOM_OUT = wxNewId();
|
||||
wxEVT_PLOT_VALUE_SEL_CREATING = wxNewId();
|
||||
wxEVT_PLOT_VALUE_SEL_CREATED = wxNewId();
|
||||
wxEVT_PLOT_VALUE_SEL_CHANGING = wxNewId();
|
||||
wxEVT_PLOT_VALUE_SEL_CHANGED = wxNewId();
|
||||
wxEVT_PLOT_AREA_SEL_CREATING = wxNewId();
|
||||
wxEVT_PLOT_AREA_SEL_CREATED = wxNewId();
|
||||
wxEVT_PLOT_AREA_SEL_CHANGING = wxNewId();
|
||||
wxEVT_PLOT_AREA_SEL_CHANGED = wxNewId();
|
||||
wxEVT_PLOT_BEGIN_X_LABEL_EDIT = wxNewId();
|
||||
wxEVT_PLOT_END_X_LABEL_EDIT = wxNewId();
|
||||
wxEVT_PLOT_BEGIN_Y_LABEL_EDIT = wxNewId();
|
||||
wxEVT_PLOT_END_Y_LABEL_EDIT = wxNewId();
|
||||
wxEVT_PLOT_BEGIN_TITLE_EDIT = wxNewId();
|
||||
wxEVT_PLOT_END_TITLE_EDIT = wxNewId();
|
||||
wxEVT_PLOT_AREA_CREATE = wxNewId();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxPlotModule::OnExit()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user