Tweaks to install guide

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

diff --git a/contrib/include/wx/ogl/drawn.h b/contrib/include/wx/ogl/drawn.h
index dafde44d2199ab3ab1804e6542078305fd0acca9..26527799c913b76d810c3a0da8cce27acf497e88 100644 (file)
--- a/contrib/include/wx/ogl/drawn.h
+++ b/contrib/include/wx/ogl/drawn.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_DRAWN_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_DRAWN_H_


@@ -16,13 +16,12 @@
 #pragma interface "drawn.h"
 #endif
 
 #pragma interface "drawn.h"
 #endif
 

-#include <wx/ogl/basic.h>

 
 #define oglMETAFLAGS_OUTLINE         1
 #define oglMETAFLAGS_ATTACHMENTS     2
 
 
 #define oglMETAFLAGS_OUTLINE         1
 #define oglMETAFLAGS_ATTACHMENTS     2
 

-class wxDrawnShape;
-class wxPseudoMetaFile: public wxObject
+class WXDLLIMPEXP_OGL wxDrawnShape;
+class WXDLLIMPEXP_OGL wxPseudoMetaFile: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxPseudoMetaFile)
  public:
 {
  DECLARE_DYNAMIC_CLASS(wxPseudoMetaFile)
  public:


@@ -48,7 +47,7 @@ class wxPseudoMetaFile: public wxObject
   // Rotate about the given axis by theta radians from the x axis.
   void Rotate(double x, double y, double theta);
 
   // Rotate about the given axis by theta radians from the x axis.
   void Rotate(double x, double y, double theta);
 

-  bool LoadFromMetaFile(char *filename, double *width, double *height);
+  bool LoadFromMetaFile(const wxString& filename, double *width, double *height);

 
   void GetBounds(double *minX, double *minY, double *maxX, double *maxY);
 
 
   void GetBounds(double *minX, double *minY, double *maxX, double *maxY);
 


@@ -74,7 +73,7 @@ class wxPseudoMetaFile: public wxObject
   inline wxList& GetOps() const { return (wxList&) m_ops; }
 
   // Is this a valid (non-empty) metafile?
   inline wxList& GetOps() const { return (wxList&) m_ops; }
 
   // Is this a valid (non-empty) metafile?

-  inline bool IsValid() const { return (m_ops.Number() > 0); }
+  inline bool IsValid() const { return (m_ops.GetCount() > 0); }

 
 public:
   /// Set of functions for drawing into a pseudo metafile.
 
 public:
   /// Set of functions for drawing into a pseudo metafile.


@@ -101,8 +100,8 @@ public:
   virtual void SetClippingRect(const wxRect& rect);
   virtual void DestroyClippingRect();
 
   virtual void SetClippingRect(const wxRect& rect);
   virtual void DestroyClippingRect();
 

-  virtual void SetPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetPen(wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetBrush(wxBrush* brush, bool isFill = false);  // pens/brushes etc.

   virtual void SetFont(wxFont* font);
   virtual void SetTextColour(const wxColour& colour);
   virtual void SetBackgroundColour(const wxColour& colour);
   virtual void SetFont(wxFont* font);
   virtual void SetTextColour(const wxColour& colour);
   virtual void SetBackgroundColour(const wxColour& colour);


@@ -130,7 +129,7 @@ public:
 #define oglDRAWN_ANGLE_180      2
 #define oglDRAWN_ANGLE_270      3
 
 #define oglDRAWN_ANGLE_180      2
 #define oglDRAWN_ANGLE_270      3
 

-class wxDrawnShape: public wxRectangleShape
+class WXDLLIMPEXP_OGL wxDrawnShape: public wxRectangleShape

 {
  DECLARE_DYNAMIC_CLASS(wxDrawnShape)
  public:
 {
  DECLARE_DYNAMIC_CLASS(wxDrawnShape)
  public:


@@ -156,8 +155,8 @@ class wxDrawnShape: public wxRectangleShape
   // Get current rotation
   inline double GetRotation() const { return m_rotation; }
 
   // Get current rotation
   inline double GetRotation() const { return m_rotation; }
 

-  void SetSize(double w, double h, bool recursive = TRUE);
-  bool LoadFromMetaFile(char *filename);
+  void SetSize(double w, double h, bool recursive = true);
+  bool LoadFromMetaFile(const wxString& filename);

 
   inline void SetSaveToFile(bool save) { m_saveToFile = save; }
   inline wxPseudoMetaFile& GetMetaFile(int which = 0) const { return (wxPseudoMetaFile&) m_metafiles[which]; }
 
   inline void SetSaveToFile(bool save) { m_saveToFile = save; }
   inline wxPseudoMetaFile& GetMetaFile(int which = 0) const { return (wxPseudoMetaFile&) m_metafiles[which]; }


@@ -189,8 +188,8 @@ class wxDrawnShape: public wxRectangleShape
   virtual void SetClippingRect(const wxRect& rect);
   virtual void DestroyClippingRect();
 
   virtual void SetClippingRect(const wxRect& rect);
   virtual void DestroyClippingRect();
 

-  virtual void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
-  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetDrawnPen(wxPen* pen, bool isOutline = false);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetDrawnBrush(wxBrush* brush, bool isFill = false);  // pens/brushes etc.

   virtual void SetDrawnFont(wxFont* font);
   virtual void SetDrawnTextColour(const wxColour& colour);
   virtual void SetDrawnBackgroundColour(const wxColour& colour);
   virtual void SetDrawnFont(wxFont* font);
   virtual void SetDrawnTextColour(const wxColour& colour);
   virtual void SetDrawnBackgroundColour(const wxColour& colour);