[ 1176516 ] argv datatype has changed (char in docs but really wxChar)

[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 c0927c0c170fbc15ab36170c8f52d4aef666c7bb..c4dd09b985df3f951ac8c5ff8827048cf3027b11 100644 (file)
--- a/contrib/include/wx/ogl/basicp.h
+++ b/contrib/include/wx/ogl/basicp.h
@@ -6,7 +6,7 @@
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_BASICP_H_


@@ -16,9 +16,10 @@
 #pragma interface "basicp.h"
 #endif
 
 #pragma interface "basicp.h"
 #endif
 

+

 #define CONTROL_POINT_SIZE       6
 
 #define CONTROL_POINT_SIZE       6
 

-class wxShapeTextLine: public wxObject
+class WXDLLIMPEXP_OGL wxShapeTextLine: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
 public:
 {
  DECLARE_DYNAMIC_CLASS(wxShapeTextLine)
 public:


@@ -40,13 +41,13 @@ protected:
    double        m_y;
 };
 
    double        m_y;
 };
 

-class wxShape;
-class wxControlPoint: public wxRectangleShape
+class WXDLLIMPEXP_OGL wxShape;
+class WXDLLIMPEXP_OGL wxControlPoint: public wxRectangleShape

 {
  DECLARE_DYNAMIC_CLASS(wxControlPoint)
 
 {
  DECLARE_DYNAMIC_CLASS(wxControlPoint)
 

- friend class wxShapeEvtHandler;
- friend class wxShape;
+ friend class WXDLLIMPEXP_OGL wxShapeEvtHandler;
+ friend class WXDLLIMPEXP_OGL wxShape;

 
  public:
   wxControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, double the_xoffset = 0.0,
 
  public:
   wxControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, double the_xoffset = 0.0,


@@ -72,7 +73,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


@@ -88,11 +89,11 @@ public:
   static double sm_controlPointDragPosY;
 };
 
   static double sm_controlPointDragPosY;
 };
 

-class wxPolygonShape;
-class wxPolygonControlPoint: public wxControlPoint
+class WXDLLIMPEXP_OGL wxPolygonShape;
+class WXDLLIMPEXP_OGL wxPolygonControlPoint: public wxControlPoint

 {
  DECLARE_DYNAMIC_CLASS(wxPolygonControlPoint)
 {
  DECLARE_DYNAMIC_CLASS(wxPolygonControlPoint)

-  friend class wxPolygonShape;
+  friend class WXDLLIMPEXP_OGL wxPolygonShape;

  public:
   wxPolygonControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, wxRealPoint *vertex = NULL,
     double the_xoffset = 0.0, double the_yoffset = 0.0);
  public:
   wxPolygonControlPoint(wxShapeCanvas *the_canvas = NULL, wxShape *object = NULL, double size = 0.0, wxRealPoint *vertex = NULL,
     double the_xoffset = 0.0, double the_yoffset = 0.0);


@@ -123,7 +124,7 @@ public:
  *
  */
 
  *
  */
 

-class wxShapeRegion: public wxObject
+class WXDLLIMPEXP_OGL wxShapeRegion: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxShapeRegion)
 
 {
  DECLARE_DYNAMIC_CLASS(wxShapeRegion)
 


@@ -137,7 +138,7 @@ class 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);


@@ -156,7 +157,7 @@ class 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; }


@@ -187,7 +188,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;


@@ -200,7 +201,7 @@ public:
  * User-defined attachment point
  */
 
  * User-defined attachment point
  */
 

-class wxAttachmentPoint: public wxObject
+class WXDLLIMPEXP_OGL wxAttachmentPoint: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxAttachmentPoint)
 
 {
  DECLARE_DYNAMIC_CLASS(wxAttachmentPoint)