Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied [ 714756 ] Clean warnings on build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-04-04 13:13:46 +00:00
parent a967f0480b
commit 0a2c03984a
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/include/wx/ogl/basic.h
View File

@@ -177,7 +177,7 @@ class wxShapeEvtHandler: public wxObject, public wxClientDataContainer
// Does the copy - override for new event handlers which might store // Does the copy - override for new event handlers which might store
// app-specific data. // app-specific data.
virtual void CopyData(wxShapeEvtHandler& copy) {}; virtual void CopyData(wxShapeEvtHandler& WXUNUSED(copy)) {};
private: private:
wxShapeEvtHandler* m_previousHandler; wxShapeEvtHandler* m_previousHandler;
@@ -223,7 +223,7 @@ class wxShape: public wxShapeEvtHandler
virtual void OnEraseContents(wxDC& dc); virtual void OnEraseContents(wxDC& dc);
virtual void OnHighlight(wxDC& dc); virtual void OnHighlight(wxDC& dc);
virtual void OnLeftClick(double x, double y, int keys = 0, int attachment = 0); 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 OnRightClick(double x, double y, int keys = 0, int attachment = 0);
virtual void OnSize(double x, double y); 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 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; int GetNumberOfAttachments() const;
bool GetAttachmentPosition(int attachment, double *x, double *y, bool GetAttachmentPosition(int attachment, double *x, double *y,
int nth = 0, int no_arcs = 1, wxLineShape *line = NULL); 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 // Does the copying for this object
void Copy(wxShape& copy); void Copy(wxShape& copy);

2
contrib/include/wx/ogl/canvas.h
View File

@@ -23,7 +23,7 @@
#define StartDraggingRight 3 #define StartDraggingRight 3
#define ContinueDraggingRight 4 #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

2
contrib/include/wx/ogl/divided.h
View File

@@ -63,7 +63,7 @@ class wxDividedShape: public wxRectangleShape
// Attachment points correspond to regions in the divided box // Attachment points correspond to regions in the divided box
bool GetAttachmentPosition(int attachment, double *x, double *y, bool GetAttachmentPosition(int attachment, double *x, double *y,
int nth = 0, int no_arcs = 1, wxLineShape *line = NULL); int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
bool AttachmentIsValid(int attachment); bool AttachmentIsValid(int attachment) const;
int GetNumberOfAttachments() const; int GetNumberOfAttachments() const;
// Invoke editor on CTRL-right click // Invoke editor on CTRL-right click

2
contrib/src/ogl/basic2.cpp
View File

@@ -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) if (!m_points)
return FALSE; return FALSE;

2
contrib/src/ogl/canvas.cpp
View File

@@ -62,7 +62,7 @@ BEGIN_EVENT_TABLE(wxShapeCanvas, wxScrolledWindow)
EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent) EVT_MOUSE_EVENTS(wxShapeCanvas::OnMouseEvent)
END_EVENT_TABLE() END_EVENT_TABLE()
wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas"); const wxChar* wxShapeCanvasNameStr = wxT("shapeCanvas");
// Object canvas // Object canvas
wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id, wxShapeCanvas::wxShapeCanvas(wxWindow *parent, wxWindowID id,

2
contrib/src/ogl/divided.cpp
View File

@@ -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; int totalNumberAttachments = (GetRegions().GetCount() * 2) + 2;
if (attachment >= totalNumberAttachments) if (attachment >= totalNumberAttachments)