Committing in .

[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 e819600e0addcf62aed56ee202b495a73e611c4a..dd083219b8ff5c21b849f9db47ae95e0708b679e 100644 (file)
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/contrib/include/wx/ogl/drawnp.h
@@ -12,7 +12,7 @@
 #ifndef _OGL_DRAWNP_H_
 #define _OGL_DRAWNP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "drawnp.h"
 #endif
 
@@ -22,7 +22,7 @@
  * Drawing operations
  *
  */
- 
+
 #define  DRAWOP_SET_PEN             1
 #define  DRAWOP_SET_BRUSH           2
 #define  DRAWOP_SET_FONT            3
@@ -54,7 +54,7 @@
  * Base, virtual class
  *
  */
- 
+
 class wxDrawOp: public wxObject
 {
 public:
@@ -65,9 +65,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;
+#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)
@@ -91,15 +92,17 @@ protected:
  * Set font, brush, text colour
  *
  */
- 
+
 class 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;
@@ -114,7 +117,7 @@ public:
  * Set/destroy clipping
  *
  */
- 
+
 class wxOpSetClipping: public wxDrawOp
 {
 public:
@@ -123,8 +126,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;
@@ -137,20 +142,22 @@ public:
  * Draw line, rectangle, rounded rectangle, ellipse, point, arc, text
  *
  */
- 
+
 class wxOpDraw: public wxDrawOp
 {
  public:
   wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
-         double radius = 0.0, char *s = NULL);
+         double radius = 0.0, wxChar *s = NULL);
   ~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);
+#endif
 
 public:
   double     m_x1;
@@ -160,7 +167,7 @@ public:
   double     m_x3;
   double     m_y3;
   double     m_radius;
-  char*     m_textString;
+  wxChar*    m_textString;
 
 };
 
@@ -179,8 +186,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,
@@ -196,7 +205,7 @@ public:
 public:
   wxRealPoint*  m_points;
   int           m_noPoints;
-  
+
 };
 
 #endif