Applied [ 714756 ] Clean warnings on build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index f14ce67de61a2d1d8dede40214ce3dab91d6dbc9..588258afd7b257c30838531115b30f066a76c1ad 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -177,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;


@@ -223,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);


@@ -616,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);
 

diff --git a/contrib/include/wx/ogl/canvas.h b/contrib/include/wx/ogl/canvas.h
index fb52e3f253a051febf513634b7deb0fc200d7c94..7511de9a73386908a6aa74286a01d7d222d8eec2 100644 (file)
--- a/contrib/include/wx/ogl/canvas.h
+++ b/contrib/include/wx/ogl/canvas.h
@@ -23,7 +23,7 @@
 #define StartDraggingRight     3
 #define ContinueDraggingRight  4
 
 #define StartDraggingRight     3
 #define ContinueDraggingRight  4
 

-extern wxChar* wxShapeCanvasNameStr;
+extern const wxChar* wxShapeCanvasNameStr;

 
 // When drag_count reaches 0, process drag message
 
 
 // When drag_count reaches 0, process drag message
 

diff --git a/contrib/include/wx/ogl/divided.h b/contrib/include/wx/ogl/divided.h
index 6fc733eee32ca61acc655652a496c2af7d85c6c8..e307e7dc7e0c5c845c185466d97bb64a87c8e30b 100644 (file)
--- a/contrib/include/wx/ogl/divided.h
+++ b/contrib/include/wx/ogl/divided.h
@@ -63,7 +63,7 @@ class wxDividedShape: public wxRectangleShape
   // Attachment points correspond to regions in the divided box
   bool GetAttachmentPosition(int attachment, double *x, double *y,
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
   // Attachment points correspond to regions in the divided box
   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;

   int GetNumberOfAttachments() const;
 
   // Invoke editor on CTRL-right click
   int GetNumberOfAttachments() const;
 
   // Invoke editor on CTRL-right click

diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
index c24bf7c1c4c7aa0c0147ac9b91ba96968f4a0c63..d5eba292482397d6623927145661fcf69065f4c6 100644 (file)
--- a/contrib/src/ogl/basic2.cpp
+++ b/contrib/src/ogl/basic2.cpp
@@ -793,7 +793,7 @@ bool wxPolygonShape::GetAttachmentPosition(int attachment, double *x, double *y,
   { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
 }
 
   { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
 }
 

-bool wxPolygonShape::AttachmentIsValid(int attachment)
+bool wxPolygonShape::AttachmentIsValid(int attachment) const

 {
   if (!m_points)
     return FALSE;
 {
   if (!m_points)
     return FALSE;

diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp
index 30640a68bdd48d65ac86b086eaf7f92ed7c54298..ee49fdb4f5815dbbc9b103014faaca1c74fa3941 100644 (file)
--- a/contrib/src/ogl/canvas.cpp
+++ b/contrib/src/ogl/canvas.cpp
@@ -62,7 +62,7 @@ BEGIN_EVENT_TABLE(wxShapeCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 
     EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 

-wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas");
+const wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas");

 
 // Object canvas
 wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id,
 
 // Object canvas
 wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id,

diff --git a/contrib/src/ogl/divided.cpp b/contrib/src/ogl/divided.cpp
index 8c40db047ee8301dd0d10c7c3749109e9cc1a055..afb71ece6a9f0ba680543978154a607715c214ac 100644 (file)
--- a/contrib/src/ogl/divided.cpp
+++ b/contrib/src/ogl/divided.cpp
@@ -321,7 +321,7 @@ int wxDividedShape::GetNumberOfAttachments() const
   return maxN + 1;
 }
 
   return maxN + 1;
 }
 

-bool wxDividedShape::AttachmentIsValid(int attachment)
+bool wxDividedShape::AttachmentIsValid(int attachment) const

 {
   int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2;
   if (attachment >= totalNumberAttachments)
 {
   int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2;
   if (attachment >= totalNumberAttachments)