Updates to MIME-types and wxFileDialog code for better

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

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index 47b68d3de12abb53058797c77346ee058adce2f6..8a2debc068ead22757fb2c886c7bb87a1a955903 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -16,6 +16,13 @@
 #pragma interface "basic.h"
 #endif
 
 #pragma interface "basic.h"
 #endif
 

+#ifndef wxUSE_DEPRECATED
+#define wxUSE_DEPRECATED 1
+#endif
+
+#if wxUSE_DEPRECATED
+#include <wx/deprecated/setup.h>
+#endif

 
 #define OGL_VERSION     2.0
 
 
 #define OGL_VERSION     2.0
 


@@ -393,6 +400,7 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
   virtual int GetNumberOfAttachments() const;
   virtual bool AttachmentIsValid(int attachment) const;
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
   virtual int GetNumberOfAttachments() const;
   virtual bool AttachmentIsValid(int attachment) const;

+  virtual wxList& GetAttachments() { return m_attachmentPoints; }

 
   // Only get the attachment position at the _edge_ of the shape, ignoring
   // branching mode. This is used e.g. to indicate the edge of interest, not the point
 
   // Only get the attachment position at the _edge_ of the shape, ignoring
   // branching mode. This is used e.g. to indicate the edge of interest, not the point


@@ -499,7 +507,8 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
 
   // Rotate about the given axis by the given amount in radians.
   virtual void Rotate(double x, double y, double theta);
 
   // Rotate about the given axis by the given amount in radians.
   virtual void Rotate(double x, double y, double theta);

-  virtual inline double GetRotation() const { return m_rotation; }
+  virtual double GetRotation() const { return m_rotation; }
+  virtual void SetRotation(double rotation) { m_rotation = rotation; }

 
   void ClearAttachments();
 
 
   void ClearAttachments();
 


@@ -521,7 +530,7 @@ class WXDLLIMPEXP_OGL wxShape: public wxShapeEvtHandler
   wxPen*                m_pen;
   wxBrush*              m_brush;
   wxFont*               m_font;
   wxPen*                m_pen;
   wxBrush*              m_brush;
   wxFont*               m_font;

-  wxColour*             m_textColour;
+  wxColour              m_textColour;

   wxString              m_textColourName;
   wxShapeCanvas*        m_canvas;
   wxList                m_lines;
   wxString              m_textColourName;
   wxShapeCanvas*        m_canvas;
   wxList                m_lines;


@@ -622,10 +631,17 @@ class WXDLLIMPEXP_OGL wxPolygonShape: public wxShape
   void Copy(wxShape& copy);
 
   inline wxList *GetPoints() { return m_points; }
   void Copy(wxShape& copy);
 
   inline wxList *GetPoints() { return m_points; }

+  inline wxList *GetOriginalPoints() { return m_originalPoints; }

 
   // Rotate about the given axis by the given amount in radians
   virtual void Rotate(double x, double y, double theta);
 
 
   // Rotate about the given axis by the given amount in radians
   virtual void Rotate(double x, double y, double theta);
 

+  double GetOriginalWidth() const { return m_originalWidth; }
+  double GetOriginalHeight() const { return m_originalHeight; }
+
+  void SetOriginalWidth(double w) { m_originalWidth = w; }
+  void SetOriginalHeight(double h) { m_originalHeight = h; }
+

  private:
   wxList*       m_points;
   wxList*       m_originalPoints;
  private:
   wxList*       m_points;
   wxList*       m_originalPoints;


@@ -647,6 +663,7 @@ class WXDLLIMPEXP_OGL wxRectangleShape: public wxShape
   void OnDraw(wxDC& dc);
   void SetSize(double x, double y, bool recursive = TRUE);
   void SetCornerRadius(double rad); // If > 0, rounded corners
   void OnDraw(wxDC& dc);
   void SetSize(double x, double y, bool recursive = TRUE);
   void SetCornerRadius(double rad); // If > 0, rounded corners

+  double GetCornerRadius() const { return m_cornerRadius; }

 
 #if wxUSE_PROLOGIO
   void WriteAttributes(wxExpr *clause);
 
 #if wxUSE_PROLOGIO
   void WriteAttributes(wxExpr *clause);