// 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_
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "basicp.h"
-#endif
-
-
#define CONTROL_POINT_SIZE 6
class WXDLLIMPEXP_OGL wxShapeTextLine: public wxObject
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
// 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);
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; }
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;