X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..5a332fb5e08328833f78c4ca999d5d102239a309:/contrib/include/wx/ogl/drawnp.h

diff --git a/contrib/include/wx/ogl/drawnp.h b/contrib/include/wx/ogl/drawnp.h
index 98ca0a8b65..d837811f7c 100644
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/contrib/include/wx/ogl/drawnp.h
@@ -16,7 +16,6 @@
 #pragma interface "drawnp.h"
 #endif
 
-#include <wx/ogl/drawn.h>
 
 /*
  * Drawing operations
@@ -55,31 +54,32 @@
  *
  */
 
-class wxDrawOp: public wxObject
+class WXDLLIMPEXP_OGL wxDrawOp: public wxObject
 {
 public:
   inline wxDrawOp(int theOp) { m_op = theOp; }
   inline ~wxDrawOp() {}
-  inline virtual void Scale(double xScale, double yScale) {};
-  inline virtual void Translate(double x, double y) {};
-  inline virtual void Rotate(double x, double y, double theta, double sinTheta, double cosTheta) {};
+  inline virtual void Scale(double WXUNUSED(xScale), double WXUNUSED(yScale)) {};
+  inline virtual void Translate(double WXUNUSED(x), double WXUNUSED(y)) {};
+  inline virtual void Rotate(double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(theta), double WXUNUSED(sinTheta), double WXUNUSED(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;
-
+#endif
   inline int GetOp() const { return m_op; }
 
   // Draw an outline using the current operation. By default, return FALSE (not drawn)
-  virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
-    double oldW, double oldH) { return FALSE; }
+  virtual bool OnDrawOutline(wxDC& WXUNUSED(dc), double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h),
+    double WXUNUSED(oldW), double WXUNUSED(oldH)) { return FALSE; }
 
   // Get the perimeter point using this data
-  virtual bool GetPerimeterPoint(double x1, double y1,
-                                     double x2, double y2,
-                                     double *x3, double *y3,
-                                     double xOffset, double yOffset,
-                                     int attachmentMode)
+  virtual bool GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
+                                     double WXUNUSED(x2), double WXUNUSED(y2),
+                                     double *WXUNUSED(x3), double *WXUNUSED(y3),
+                                     double WXUNUSED(xOffset), double WXUNUSED(yOffset),
+                                     int WXUNUSED(attachmentMode))
   { return FALSE; }
 
 protected:
@@ -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);
+#if wxUSE_PROLOGIO
   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+#endif
 
 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);
@@ -123,8 +125,10 @@ public:
   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);
+#endif
 
 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,
@@ -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);
+#if wxUSE_PROLOGIO
   wxExpr *WriteExpr(wxPseudoMetaFile *image);
   void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+#endif
 
 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);
@@ -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);
+#if wxUSE_PROLOGIO
   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,