added support for colour cursors in wxGTK (patch 1655576)

[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 6c0e1e8368d65fbd7862424b502d2c905c0088ce..43fd2fb825ac5b0d9e045e3faf03a28009d87074 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


@@ -68,12 +63,12 @@ class WXDLLIMPEXP_OGL wxControlPoint: public wxRectangleShape
   inline void SetEraseObject(bool er) { m_eraseObject = er; }
 
 public:
   inline void SetEraseObject(bool er) { m_eraseObject = er; }
 
 public:

-  int           m_type;
-  double         m_xoffset;
-  double         m_yoffset;
-  wxShape*      m_shape;
-  wxCursor*     m_oldCursor;
-  bool          m_eraseObject; // If TRUE, erases object before dragging handle.
+  int             m_type;
+  double          m_xoffset;
+  double          m_yoffset;
+  wxShape*        m_shape;
+  const wxCursor* m_oldCursor;
+  bool            m_eraseObject; // If true, erases object before dragging handle.

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


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