Applied [ 714756 ] Clean warnings on build

[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 1127a23ef2a82c85b90f3381ecfd4a4e6526fa8c..588258afd7b257c30838531115b30f066a76c1ad 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -12,7 +12,7 @@
 #ifndef _OGL_BASIC_H_
 #define _OGL_BASIC_H_
 
 #ifndef _OGL_BASIC_H_
 #define _OGL_BASIC_H_
 

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

 #pragma interface "basic.h"
 #endif
 
 #pragma interface "basic.h"
 #endif
 


@@ -22,11 +22,6 @@
 #define DEFAULT_MOUSE_TOLERANCE 3
 #endif
 
 #define DEFAULT_MOUSE_TOLERANCE 3
 #endif
 

-// Edit these lines if you positively don't want PROLOGIO support
-#ifndef PROLOGIO
-#define PROLOGIO
-#endif
-

 // Key identifiers
 #define KEY_SHIFT 1
 #define KEY_CTRL  2
 // Key identifiers
 #define KEY_SHIFT 1
 #define KEY_CTRL  2


@@ -110,7 +105,7 @@ class wxControlPoint;
 class wxShapeRegion;
 class wxShape;
 
 class wxShapeRegion;
 class wxShape;
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

 class WXDLLEXPORT wxExpr;
 class WXDLLEXPORT wxExprDatabase;
 #endif
 class WXDLLEXPORT wxExpr;
 class WXDLLEXPORT wxExprDatabase;
 #endif


@@ -182,7 +177,7 @@ class wxShapeEvtHandler: public wxObject, public wxClientDataContainer
 
   // Does the copy - override for new event handlers which might store
   // app-specific data.
 
   // Does the copy - override for new event handlers which might store
   // app-specific data.

-  virtual void CopyData(wxShapeEvtHandler& copy) {};
+  virtual void CopyData(wxShapeEvtHandler& WXUNUSED(copy)) {};

 
  private:
   wxShapeEvtHandler*    m_previousHandler;
 
  private:
   wxShapeEvtHandler*    m_previousHandler;


@@ -228,7 +223,7 @@ class wxShape: public wxShapeEvtHandler
   virtual void OnEraseContents(wxDC& dc);
   virtual void OnHighlight(wxDC& dc);
   virtual void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
   virtual void OnEraseContents(wxDC& dc);
   virtual void OnHighlight(wxDC& dc);
   virtual void OnLeftClick(double x, double y, int keys = 0, int attachment = 0);

-  virtual void OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0) {}
+  virtual void OnLeftDoubleClick(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys) = 0, int WXUNUSED(attachment) = 0) {}

   virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
   virtual void OnSize(double x, double y);
   virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
   virtual void OnRightClick(double x, double y, int keys = 0, int attachment = 0);
   virtual void OnSize(double x, double y);
   virtual bool OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);


@@ -299,8 +294,6 @@ class wxShape: public wxShapeEvtHandler
 
   void SetPen(wxPen *pen);
   void SetBrush(wxBrush *brush);
 
   void SetPen(wxPen *pen);
   void SetBrush(wxBrush *brush);

-  inline void SetClientData(wxObject *client_data) { m_clientData = client_data; };
-  inline wxObject *GetClientData() const { return m_clientData; };

 
   virtual void Show(bool show);
   virtual bool IsShown() const { return m_visible; }
 
   virtual void Show(bool show);
   virtual bool IsShown() const { return m_visible; }


@@ -346,7 +339,7 @@ class wxShape: public wxShapeEvtHandler
   virtual wxFont *GetFont(int regionId = 0) const;
   virtual void SetTextColour(const wxString& colour, int regionId = 0);
   virtual wxString GetTextColour(int regionId = 0) const;
   virtual wxFont *GetFont(int regionId = 0) const;
   virtual void SetTextColour(const wxString& colour, int regionId = 0);
   virtual wxString GetTextColour(int regionId = 0) const;

-  virtual inline int GetNumberOfTextRegions() const { return m_regions.Number(); }
+  virtual inline int GetNumberOfTextRegions() const { return m_regions.GetCount(); }

   virtual void SetRegionName(const wxString& name, int regionId = 0);
 
   // Get the name representing the region for this image alone.
   virtual void SetRegionName(const wxString& name, int regionId = 0);
 
   // Get the name representing the region for this image alone.


@@ -360,7 +353,7 @@ class wxShape: public wxShapeEvtHandler
   virtual int GetRegionId(const wxString& name);
 
   // Construct names for regions, unique even for children of a composite.
   virtual int GetRegionId(const wxString& name);
 
   // Construct names for regions, unique even for children of a composite.

-  virtual void NameRegions(const wxString& parentName = "");
+  virtual void NameRegions(const wxString& parentName = wxEmptyString);

 
   // Get list of regions
   inline wxList& GetRegions() const { return (wxList&) m_regions; }
 
   // Get list of regions
   inline wxList& GetRegions() const { return (wxList&) m_regions; }


@@ -383,7 +376,7 @@ class wxShape: public wxShapeEvtHandler
   virtual void ClearText(int regionId = 0);
   void RemoveLine(wxLineShape *line);
 
   virtual void ClearText(int regionId = 0);
   void RemoveLine(wxLineShape *line);
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

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


@@ -520,9 +513,6 @@ class wxShape: public wxShapeEvtHandler
   wxBrush GetBackgroundBrush();
 
 
   wxBrush GetBackgroundBrush();
 
 

- private:
-  wxObject*             m_clientData;
-

  protected:
   wxShapeEvtHandler*    m_eventHandler;
   bool                  m_formatted;
  protected:
   wxShapeEvtHandler*    m_eventHandler;
   bool                  m_formatted;


@@ -618,7 +608,7 @@ class wxPolygonShape: public wxShape
   // Recalculates the centre of the polygon
   virtual void CalculatePolygonCentre();
 
   // Recalculates the centre of the polygon
   virtual void CalculatePolygonCentre();
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif


@@ -626,7 +616,7 @@ class wxPolygonShape: public wxShape
   int GetNumberOfAttachments() const;
   bool GetAttachmentPosition(int attachment, double *x, double *y,
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
   int GetNumberOfAttachments() const;
   bool GetAttachmentPosition(int attachment, double *x, double *y,
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);

-  bool AttachmentIsValid(int attachment);
+  bool AttachmentIsValid(int attachment) const;

   // Does the copying for this object
   void Copy(wxShape& copy);
 
   // Does the copying for this object
   void Copy(wxShape& copy);
 


@@ -657,7 +647,7 @@ class wxRectangleShape: public wxShape
   void SetSize(double x, double y, bool recursive = TRUE);
   void SetCornerRadius(double rad); // If > 0, rounded corners
 
   void SetSize(double x, double y, bool recursive = TRUE);
   void SetCornerRadius(double rad); // If > 0, rounded corners
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif


@@ -687,8 +677,8 @@ class wxTextShape: public wxRectangleShape
 
   void OnDraw(wxDC& dc);
 
 
   void OnDraw(wxDC& dc);
 

-#ifdef PROLOGIO
-  void WriteAttributes(wxExpr *clause);
+#if wxUSE_PROLOGIO
+    void WriteAttributes(wxExpr *clause);

 #endif
 
   // Does the copying for this object
 #endif
 
   // Does the copying for this object


@@ -709,7 +699,7 @@ class wxEllipseShape: public wxShape
   void OnDraw(wxDC& dc);
   void SetSize(double x, double y, bool recursive = TRUE);
 
   void OnDraw(wxDC& dc);
   void SetSize(double x, double y, bool recursive = TRUE);
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif