wxPalette unified. Source cleaning.

[wxWidgets.git] / contrib / include / wx / ogl / basicp.h

diff --git a/contrib/include/wx/ogl/basicp.h b/contrib/include/wx/ogl/basicp.h
index 5c5b40317a52e6e7e8694bfd499d59c9ce7e4134..a0c9b821d7425251708daea5c956b1fafbe79245 100644 (file)
--- a/contrib/include/wx/ogl/basicp.h
+++ b/contrib/include/wx/ogl/basicp.h
@@ -6,17 +6,12 @@
 // 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_BASICP_H_
 #define _OGL_BASICP_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_BASICP_H_
 #define _OGL_BASICP_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "basicp.h"
-#endif
-
-

 #define CONTROL_POINT_SIZE       6
 
 class WXDLLIMPEXP_OGL wxShapeTextLine: public wxObject
 #define CONTROL_POINT_SIZE       6
 
 class WXDLLIMPEXP_OGL wxShapeTextLine: public wxObject


@@ -73,7 +68,7 @@ public:
   double         m_yoffset;
   wxShape*      m_shape;
   wxCursor*     m_oldCursor;
   double         m_yoffset;
   wxShape*      m_shape;
   wxCursor*     m_oldCursor;

-  bool          m_eraseObject; // If TRUE, erases object before dragging handle.
+  bool          m_eraseObject; // If true, erases object before dragging handle.

 
 /*
  * Store original top-left, bottom-right coordinates
 
 /*
  * Store original top-left, bottom-right coordinates


@@ -138,7 +133,7 @@ class WXDLLIMPEXP_OGL wxShapeRegion: public wxObject
 
   // Accessors
   inline void SetText(const wxString& s)
 
   // Accessors
   inline void SetText(const wxString& s)

-    { m_regionText = s; m_formattedText.Append(new wxShapeTextLine(0,0,s));}
+    { m_regionText = s; }

   void SetFont(wxFont *f);
   void SetMinSize(double w, double h);
   void SetSize(double w, double h);
   void SetFont(wxFont *f);
   void SetMinSize(double w, double h);
   void SetSize(double w, double h);


@@ -157,7 +152,7 @@ class WXDLLIMPEXP_OGL wxShapeRegion: public wxObject
   inline int GetFormatMode() const { return m_formatMode; }
   inline wxString GetName() const { return m_regionName; }
   inline wxString GetColour() const { return m_textColour; }
   inline int GetFormatMode() const { return m_formatMode; }
   inline wxString GetName() const { return m_regionName; }
   inline wxString GetColour() const { return m_textColour; }

-  wxColour *GetActualColourObject();
+  wxColour GetActualColourObject();

   inline wxList& GetFormattedText() { return m_formattedText; }
   inline wxString GetPenColour() const { return m_penColour; }
   inline int GetPenStyle() const { return m_penStyle; }
   inline wxList& GetFormattedText() { return m_formattedText; }
   inline wxString GetPenColour() const { return m_penColour; }
   inline int GetPenStyle() const { return m_penStyle; }


@@ -188,7 +183,7 @@ public:
   int                   m_formatMode;        // FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT | FORMAT_NONE
   wxString              m_regionName;
   wxString              m_textColour;
   int                   m_formatMode;        // FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT | FORMAT_NONE
   wxString              m_regionName;
   wxString              m_textColour;

-  wxColour*             m_actualColourObject; // For speed purposes
+  wxColour              m_actualColourObject; // For speed purposes

 
   // New members for specifying divided rectangle division colour/style 30/6/94
   wxString              m_penColour;
 
   // New members for specifying divided rectangle division colour/style 30/6/94
   wxString              m_penColour;