[ 1176516 ] argv datatype has changed (char in docs but really wxChar)

[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..d3489d25131fa531954e1ee976766f8419dd582e 100644 (file)
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/contrib/include/wx/ogl/drawnp.h
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_DRAWNP_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _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,32 +54,33 @@
  *
  */
 
  *
  */
 

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

 {
 public:
   inline wxDrawOp(int theOp) { m_op = theOp; }
   inline ~wxDrawOp() {}
 {
 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;
   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; }
 
   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; }
+  // Draw an outline using the current operation. By default, return false (not drawn)
+  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
 
   // 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)
-  { return FALSE; }
+  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:
   int           m_op;
 
 protected:
   int           m_op;


@@ -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,19 +142,21 @@ 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,

-         double radius = 0.0, wxChar *s = NULL);
+         double radius = 0.0, const wxString& s = wxEmptyString);

   ~wxOpDraw();
   void Do(wxDC& dc, double xoffset, double yoffset);
   void Scale(double scaleX, double scaleY);
   void Translate(double x, double y);
   void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   ~wxOpDraw();
   void Do(wxDC& dc, double xoffset, double yoffset);
   void Scale(double scaleX, double scaleY);
   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;


@@ -160,7 +166,7 @@ public:
   double     m_x3;
   double     m_y3;
   double     m_radius;
   double     m_x3;
   double     m_y3;
   double     m_radius;

-  wxChar*    m_textString;
+  wxString   m_textString;

 
 };
 
 
 };
 


@@ -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,