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

Eliminate -Wcast-qual warnings with GCC and Clang

Browse Source 
Use const_cast, mutable, and various other changes to avoid -Wcast-qual
This commit is contained in:
Paul Cornett
2020-02-02 22:50:32 -08:00
parent 6724f8c052
commit 948ddc6e0f
115 changed files with 273 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/richtext/richtextctrl.cpp
View File

@@ -3239,8 +3239,8 @@ wxTextCtrlHitTestResult
wxRichTextCtrl::HitTest(const wxPoint& pt,
long * pos) const
{
wxClientDC dc((wxRichTextCtrl*) this);
((wxRichTextCtrl*)this)->PrepareDC(dc);
wxClientDC dc(const_cast<wxRichTextCtrl*>(this));
const_cast<wxRichTextCtrl*>(this)->PrepareDC(dc);
// Buffer uses logical position (relative to start of buffer)
// so convert
@@ -3248,8 +3248,8 @@ wxRichTextCtrl::HitTest(const wxPoint& pt,
wxRichTextObject* hitObj = NULL;
wxRichTextObject* contextObj = NULL;
wxRichTextDrawingContext context((wxRichTextBuffer*) & GetBuffer());
int hit = ((wxRichTextCtrl*)this)->GetFocusObject()->HitTest(dc, context, pt2, *pos, & hitObj, & contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS);
wxRichTextDrawingContext context(const_cast<wxRichTextBuffer*>(&GetBuffer()));
int hit = const_cast<wxRichTextCtrl*>(this)->GetFocusObject()->HitTest(dc, context, pt2, *pos, &hitObj, &contextObj, wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS);
if ((hit & wxRICHTEXT_HITTEST_BEFORE) && (hit & wxRICHTEXT_HITTEST_OUTSIDE))
return wxTE_HT_BEFORE;