X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93210c68cb8ad36a5b2d7f07e93735041657c534..a19918eb353f1f266f92891eee07834d7cf09cd7:/contrib/include/wx/ogl/drawnp.h

diff --git a/contrib/include/wx/ogl/drawnp.h b/contrib/include/wx/ogl/drawnp.h
index d837811f7c..9d6c3552a8 100644
--- a/contrib/include/wx/ogl/drawnp.h
+++ b/contrib/include/wx/ogl/drawnp.h
@@ -6,16 +6,12 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_DRAWNP_H_
 #define _OGL_DRAWNP_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "drawnp.h"
-#endif
-
 
 /*
  * Drawing operations
@@ -70,9 +66,9 @@ public:
 #endif
   inline int GetOp() const { return m_op; }
 
-  // Draw an outline using the current operation. By default, return FALSE (not drawn)
+  // 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; }
+    double WXUNUSED(oldW), double WXUNUSED(oldH)) { return false; }
 
   // Get the perimeter point using this data
   virtual bool GetPerimeterPoint(double WXUNUSED(x1), double WXUNUSED(y1),
@@ -80,7 +76,7 @@ public:
                                      double *WXUNUSED(x3), double *WXUNUSED(y3),
                                      double WXUNUSED(xOffset), double WXUNUSED(yOffset),
                                      int WXUNUSED(attachmentMode))
-  { return FALSE; }
+  { return false; }
 
 protected:
   int           m_op;
@@ -146,7 +142,7 @@ class WXDLLIMPEXP_OGL wxOpDraw: public wxDrawOp
 {
  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);
@@ -166,7 +162,7 @@ public:
   double     m_x3;
   double     m_y3;
   double     m_radius;
-  wxChar*    m_textString;
+  wxString   m_textString;
 
 };