added descriptions

[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 913275a603178589a624f13b3a53c5a889ee1c4d..ffe35762a3ee53b766125a295b63b924f90b36de 100644 (file)
--- a/contrib/include/wx/ogl/drawn.h
+++ b/contrib/include/wx/ogl/drawn.h
@@ -12,17 +12,16 @@
 #ifndef _OGL_DRAWN_H_
 #define _OGL_DRAWN_H_
 
 #ifndef _OGL_DRAWN_H_
 #define _OGL_DRAWN_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #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:


@@ -32,7 +31,7 @@ class wxPseudoMetaFile: public wxObject
 
   void Draw(wxDC& dc, double xoffset, double yoffset);
 
 
   void Draw(wxDC& dc, double xoffset, double yoffset);
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

   void WriteAttributes(wxExpr *clause, int whichAngle);
   void ReadAttributes(wxExpr *clause, int whichAngle);
 #endif
   void WriteAttributes(wxExpr *clause, int whichAngle);
   void ReadAttributes(wxExpr *clause, int whichAngle);
 #endif


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


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


@@ -139,7 +138,7 @@ class wxDrawnShape: public wxRectangleShape
 
   void OnDraw(wxDC& dc);
 
 
   void OnDraw(wxDC& dc);
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

   // I/O
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
   // I/O
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);


@@ -157,7 +156,7 @@ class wxDrawnShape: public wxRectangleShape
   inline double GetRotation() const { return m_rotation; }
 
   void SetSize(double w, double h, bool recursive = TRUE);
   inline double GetRotation() const { return m_rotation; }
 
   void SetSize(double w, double h, bool recursive = TRUE);

-  bool LoadFromMetaFile(char *filename);
+  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]; }