include iostream headers before using iostream classes (might fix HP-UX native compil...

[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 d80643301b3bfb4f5244cd83aea7e4a2356f93e1..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_


@@ -59,9 +59,9 @@ 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;
 #if wxUSE_PROLOGIO
   virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;
   virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
 #if wxUSE_PROLOGIO


@@ -70,17 +70,17 @@ public:
 #endif
   inline int GetOp() const { return m_op; }
 
 #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; }
+  // 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;


@@ -146,7 +146,7 @@ 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);
   ~wxOpDraw();
   void Do(wxDC& dc, double xoffset, double yoffset);
   void Scale(double scaleX, double scaleY);


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

 
 };
 
 
 };