Copy some missing samples, and contrib for Motif/Mac

[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 6b60dbb49dade691901c147e3c17bf93a3b9913d..d4c53db834e5d9cbc8f37352c381a5d58f3004e7 100644 (file)
--- a/contrib/include/wx/plot/plot.h
+++ b/contrib/include/wx/plot/plot.h
@@ -22,17 +22,28 @@
 #include "wx/event.h"
 #include "wx/dynarray.h"
 
 #include "wx/event.h"
 #include "wx/dynarray.h"
 

+#ifdef WXMAKINGDLL_PLOT
+    #define WXDLLIMPEXP_PLOT WXEXPORT
+    #define WXDLLIMPEXP_DATA_PLOT(type) WXEXPORT type
+#elif defined(WXUSINGDLL)
+    #define WXDLLIMPEXP_PLOT WXIMPORT
+    #define WXDLLIMPEXP_DATA_PLOT(type) WXIMPORT type
+#else // not making nor using DLL
+    #define WXDLLIMPEXP_PLOT
+    #define WXDLLIMPEXP_DATA_PLOT(type) type
+#endif
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotEvent;
-class WXDLLEXPORT wxPlotCurve;
-class WXDLLEXPORT wxPlotValues;
-class WXDLLEXPORT wxPlotArea;
-class WXDLLEXPORT wxPlotXAxisArea;
-class WXDLLEXPORT wxPlotYAxisArea;
-class WXDLLEXPORT wxPlotWindow;
+class WXDLLIMPEXP_PLOT wxPlotEvent;
+class WXDLLIMPEXP_PLOT wxPlotCurve;
+class WXDLLIMPEXP_PLOT wxPlotValues;
+class WXDLLIMPEXP_PLOT wxPlotArea;
+class WXDLLIMPEXP_PLOT wxPlotXAxisArea;
+class WXDLLIMPEXP_PLOT wxPlotYAxisArea;
+class WXDLLIMPEXP_PLOT wxPlotWindow;

 
 //-----------------------------------------------------------------------------
 // consts
 
 //-----------------------------------------------------------------------------
 // consts


@@ -74,7 +85,7 @@ extern const int wxEVT_PLOT_AREA_CREATE;
 // wxPlotEvent
 //-----------------------------------------------------------------------------
 
 // wxPlotEvent
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotEvent: public wxNotifyEvent
+class WXDLLIMPEXP_PLOT wxPlotEvent: public wxNotifyEvent

 {
 public:
     wxPlotEvent( wxEventType commandType = wxEVT_NULL, int id = 0 );
 {
 public:
     wxPlotEvent( wxEventType commandType = wxEVT_NULL, int id = 0 );


@@ -104,7 +115,7 @@ private:
 // wxPlotCurve
 //-----------------------------------------------------------------------------
 
 // wxPlotCurve
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotCurve: public wxObject
+class WXDLLIMPEXP_PLOT wxPlotCurve: public wxObject

 {
 public:
     wxPlotCurve( int offsetY, double startY, double endY );
 {
 public:
     wxPlotCurve( int offsetY, double startY, double endY );


@@ -146,7 +157,7 @@ private:
 // wxPlotOnOffCurve
 //-----------------------------------------------------------------------------
 
 // wxPlotOnOffCurve
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotOnOff
+class WXDLLIMPEXP_PLOT wxPlotOnOff

 {
 public:
     wxPlotOnOff() { }
 {
 public:
     wxPlotOnOff() { }


@@ -156,9 +167,10 @@ public:
     void     *m_clientData;
 };
 
     void     *m_clientData;
 };
 

-WX_DECLARE_EXPORTED_OBJARRAY(wxPlotOnOff, wxArrayPlotOnOff);
+WX_DECLARE_OBJARRAY_WITH_DECL(wxPlotOnOff, wxArrayPlotOnOff,
+                              class WXDLLIMPEXP_PLOT);

 
 

-class WXDLLEXPORT wxPlotOnOffCurve: public wxObject
+class WXDLLIMPEXP_PLOT wxPlotOnOffCurve: public wxObject

 {
 public:
     wxPlotOnOffCurve( int offsetY );
 {
 public:
     wxPlotOnOffCurve( int offsetY );


@@ -198,7 +210,7 @@ private:
 // wxPlotArea
 //-----------------------------------------------------------------------------
 
 // wxPlotArea
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotArea: public wxWindow
+class WXDLLIMPEXP_PLOT wxPlotArea: public wxWindow

 {
 public:
     wxPlotArea() {}
 {
 public:
     wxPlotArea() {}


@@ -225,7 +237,7 @@ private:
 // wxPlotXAxisArea
 //-----------------------------------------------------------------------------
 
 // wxPlotXAxisArea
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotXAxisArea: public wxWindow
+class WXDLLIMPEXP_PLOT wxPlotXAxisArea: public wxWindow

 {
 public:
     wxPlotXAxisArea() {}
 {
 public:
     wxPlotXAxisArea() {}


@@ -245,7 +257,7 @@ private:
 // wxPlotYAxisArea
 //-----------------------------------------------------------------------------
 
 // wxPlotYAxisArea
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotYAxisArea: public wxWindow
+class WXDLLIMPEXP_PLOT wxPlotYAxisArea: public wxWindow

 {
 public:
     wxPlotYAxisArea() {}
 {
 public:
     wxPlotYAxisArea() {}


@@ -265,7 +277,7 @@ private:
 // wxPlotWindow
 //-----------------------------------------------------------------------------
 
 // wxPlotWindow
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPlotWindow: public wxScrolledWindow
+class WXDLLIMPEXP_PLOT wxPlotWindow: public wxScrolledWindow

 {
 public:
     wxPlotWindow() {}
 {
 public:
     wxPlotWindow() {}