From 0a2c03984a3c4d2b9e432db24eb4338ed797b933 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 4 Apr 2003 13:13:46 +0000 Subject: [PATCH] Applied [ 714756 ] Clean warnings on build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/ogl/basic.h | 6 +++--- contrib/include/wx/ogl/canvas.h | 2 +- contrib/include/wx/ogl/divided.h | 2 +- contrib/src/ogl/basic2.cpp | 2 +- contrib/src/ogl/canvas.cpp | 2 +- contrib/src/ogl/divided.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h index f14ce67de6..588258afd7 100644 --- 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. - virtual void CopyData(wxShapeEvtHandler& copy) {}; + virtual void CopyData(wxShapeEvtHandler& WXUNUSED(copy)) {}; 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 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); @@ -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); - bool AttachmentIsValid(int attachment); + bool AttachmentIsValid(int attachment) const; // 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 fb52e3f253..7511de9a73 100644 --- a/contrib/include/wx/ogl/canvas.h +++ b/contrib/include/wx/ogl/canvas.h @@ -23,7 +23,7 @@ #define StartDraggingRight 3 #define ContinueDraggingRight 4 -extern wxChar* wxShapeCanvasNameStr; +extern const wxChar* wxShapeCanvasNameStr; // 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 6fc733eee3..e307e7dc7e 100644 --- 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); - bool AttachmentIsValid(int attachment); + bool AttachmentIsValid(int attachment) const; int GetNumberOfAttachments() const; // Invoke editor on CTRL-right click diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp index c24bf7c1c4..d5eba29248 100644 --- 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); } } -bool wxPolygonShape::AttachmentIsValid(int attachment) +bool wxPolygonShape::AttachmentIsValid(int attachment) const { if (!m_points) return FALSE; diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp index 30640a68bd..ee49fdb4f5 100644 --- 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() -wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas"); +const wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas"); // Object canvas wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id, diff --git a/contrib/src/ogl/divided.cpp b/contrib/src/ogl/divided.cpp index 8c40db047e..afb71ece6a 100644 --- a/contrib/src/ogl/divided.cpp +++ b/contrib/src/ogl/divided.cpp @@ -321,7 +321,7 @@ int wxDividedShape::GetNumberOfAttachments() const return maxN + 1; } -bool wxDividedShape::AttachmentIsValid(int attachment) +bool wxDividedShape::AttachmentIsValid(int attachment) const { int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2; if (attachment >= totalNumberAttachments) -- 2.45.2