added support for colour cursors in wxGTK (patch 1655576)

[wxWidgets.git] / contrib / include / wx / plot / plot.h

diff --git a/contrib/include/wx/plot/plot.h b/contrib/include/wx/plot/plot.h
index 93b3ff4bba91ad6e56dbe9b11885a37aed9e2364..b2d59d7e268be0d1b516f27b7a53015de195b5a4 100644 (file)
--- a/contrib/include/wx/plot/plot.h
+++ b/contrib/include/wx/plot/plot.h
@@ -12,15 +12,12 @@
 #ifndef _WX_PLOT_H_
 #define _WX_PLOT_H_
 
 #ifndef _WX_PLOT_H_
 #define _WX_PLOT_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "plot.h"
-#endif
-

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

-#include "wx/scrolwin.h"
-#include "wx/event.h"

 #include "wx/dynarray.h"
 #include "wx/dynarray.h"

+#include "wx/event.h"
+#include "wx/pen.h"
+#include "wx/scrolwin.h"

 
 #ifdef WXMAKINGDLL_PLOT
     #define WXDLLIMPEXP_PLOT WXEXPORT
 
 #ifdef WXMAKINGDLL_PLOT
     #define WXDLLIMPEXP_PLOT WXEXPORT


@@ -288,7 +285,11 @@ class WXDLLIMPEXP_PLOT wxPlotWindow: public wxScrolledWindow
 {
 public:
     wxPlotWindow() {}
 {
 public:
     wxPlotWindow() {}

-    wxPlotWindow( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flags = wxPLOT_DEFAULT );
+    wxPlotWindow(wxWindow *parent,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 int flags = wxPLOT_DEFAULT);

     ~wxPlotWindow();
 
     // curve accessors
     ~wxPlotWindow();
 
     // curve accessors