setter by ref for

[wxWidgets.git] / contrib / include / wx / ogl / drawnp.h

diff --git a/contrib/include/wx/ogl/drawnp.h b/contrib/include/wx/ogl/drawnp.h
index 98ca0a8b6500f4633765f5703063ffdc103814dc..d80643301b3bfb4f5244cd83aea7e4a2356f93e1 100644 (file)
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/contrib/include/wx/ogl/drawnp.h
@@ -16,7 +16,6 @@
 #pragma interface "drawnp.h"
 #endif
 
 #pragma interface "drawnp.h"
 #endif
 

-#include <wx/ogl/drawn.h>

 
 /*
  * Drawing operations
 
 /*
  * Drawing operations


@@ -55,7 +54,7 @@
  *
  */
 
  *
  */
 

-class wxDrawOp: public wxObject
+class WXDLLIMPEXP_OGL wxDrawOp: public wxObject

 {
 public:
   inline wxDrawOp(int theOp) { m_op = theOp; }
 {
 public:
   inline wxDrawOp(int theOp) { m_op = theOp; }


@@ -65,9 +64,10 @@ public:
   inline virtual void Rotate(double x, double y, double theta, double sinTheta, double cosTheta) {};
   virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;
   virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
   inline virtual void Rotate(double x, double y, double theta, double sinTheta, double cosTheta) {};
   virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;
   virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;

+#if wxUSE_PROLOGIO

   virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
   virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
   virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
   virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;

-
+#endif

   inline int GetOp() const { return m_op; }
 
   // Draw an outline using the current operation. By default, return FALSE (not drawn)
   inline int GetOp() const { return m_op; }
 
   // Draw an outline using the current operation. By default, return FALSE (not drawn)


@@ -92,14 +92,16 @@ protected:
  *
  */
 
  *
  */
 

-class wxOpSetGDI: public wxDrawOp
+class WXDLLIMPEXP_OGL wxOpSetGDI: public wxDrawOp

 {
  public:
   wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
   void Do(wxDC& dc, double xoffset, double yoffset);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
 {
  public:
   wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
   void Do(wxDC& dc, double xoffset, double yoffset);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

+#if wxUSE_PROLOGIO

   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);

+#endif

 
 public:
   int               m_mode;
 
 public:
   int               m_mode;


@@ -115,7 +117,7 @@ public:
  *
  */
 
  *
  */
 

-class wxOpSetClipping: public wxDrawOp
+class WXDLLIMPEXP_OGL wxOpSetClipping: public wxDrawOp

 {
 public:
   wxOpSetClipping(int theOp, double theX1, double theY1, double theX2, double theY2);
 {
 public:
   wxOpSetClipping(int theOp, double theX1, double theY1, double theX2, double theY2);


@@ -123,8 +125,10 @@ public:
   void Scale(double xScale, double yScale);
   void Translate(double x, double y);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   void Scale(double xScale, double yScale);
   void Translate(double x, double y);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

+#if wxUSE_PROLOGIO

   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);

+#endif

 
 public:
   double     m_x1;
 
 public:
   double     m_x1;


@@ -138,7 +142,7 @@ public:
  *
  */
 
  *
  */
 

-class wxOpDraw: public wxDrawOp
+class WXDLLIMPEXP_OGL wxOpDraw: public wxDrawOp

 {
  public:
   wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
 {
  public:
   wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,


@@ -149,8 +153,10 @@ class wxOpDraw: public wxDrawOp
   void Translate(double x, double y);
   void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   void Translate(double x, double y);
   void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

+#if wxUSE_PROLOGIO

   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);

+#endif

 
 public:
   double     m_x1;
 
 public:
   double     m_x1;


@@ -169,7 +175,7 @@ public:
  *
  */
 
  *
  */
 

-class wxOpPolyDraw: public wxDrawOp
+class WXDLLIMPEXP_OGL wxOpPolyDraw: public wxDrawOp

 {
 public:
   wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);
 {
 public:
   wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);


@@ -179,8 +185,10 @@ public:
   void Translate(double x, double y);
   void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   void Translate(double x, double y);
   void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

+#if wxUSE_PROLOGIO

   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);

+#endif

 
   // Draw an outline using the current operation.
   virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
 
   // Draw an outline using the current operation.
   virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,