diff --git a/uppsrc/CtrlCore/GtkEvent.cpp b/uppsrc/CtrlCore/GtkEvent.cpp index 4f75cb101..746da2610 100644 --- a/uppsrc/CtrlCore/GtkEvent.cpp +++ b/uppsrc/CtrlCore/GtkEvent.cpp @@ -342,7 +342,6 @@ void Ctrl::IMCommit(GtkIMContext *context, gchar *str, gpointer user_data) void Ctrl::IMLocation(Ctrl *w) { if(w && w->HasFocusDeep() && focusCtrl && !IsNull(focusCtrl->GetPreedit())) { - GdkRectangle r; Rect e = w->GetPreeditScreenRect(); Rect q = w->GetScreenRect(); GdkRectangle gr; diff --git a/uppsrc/CtrlLib/PopUpList.cpp b/uppsrc/CtrlLib/PopUpList.cpp index 77c0eab33..06c983ef1 100644 --- a/uppsrc/CtrlLib/PopUpList.cpp +++ b/uppsrc/CtrlLib/PopUpList.cpp @@ -68,7 +68,7 @@ void PopUpList::SetLineCy(int ii, int cy) { ASSERT(cy >= 0 && cy < 32000); word& x = lineinfo.At(ii, 0x7fff); - x = x & 0x8000 | cy; + x = (x & 0x8000) | cy; if(popup) popup->ac.SetLineCy(ii, cy); } diff --git a/uppsrc/CtrlLib/ScrollBar.cpp b/uppsrc/CtrlLib/ScrollBar.cpp index 85ff9c439..963a553f8 100644 --- a/uppsrc/CtrlLib/ScrollBar.cpp +++ b/uppsrc/CtrlLib/ScrollBar.cpp @@ -64,7 +64,6 @@ int ScrollBar::ButtonCount() const } void ScrollBar::Layout() { - Size sz = GetSize(); Set(pagepos); Refresh(); } diff --git a/uppsrc/RichText/TxtPaint.cpp b/uppsrc/RichText/TxtPaint.cpp index 5df633ebd..cf824a244 100644 --- a/uppsrc/RichText/TxtPaint.cpp +++ b/uppsrc/RichText/TxtPaint.cpp @@ -257,7 +257,6 @@ int RichTxt::GetPos(int x, PageY y, RichContext rc) const RichHotPos RichTxt::GetHotPos(int x, PageY y, int tolerance, RichContext rc) const { int parti = 0; - int pos = 0; int ti = 0; if(part.GetCount()) { while(parti < part.GetCount()) { @@ -274,7 +273,6 @@ RichHotPos RichTxt::GetHotPos(int x, PageY y, int tolerance, RichContext rc) con } if(IsTable(parti)) ti += 1 + GetTable(parti).GetTableCount(); - pos += GetPartLength(parti) + 1; parti++; rc = next; } diff --git a/uppsrc/ide/About.cpp b/uppsrc/ide/About.cpp index ac83f0552..83e31ca6e 100644 --- a/uppsrc/ide/About.cpp +++ b/uppsrc/ide/About.cpp @@ -74,7 +74,6 @@ Size SplashCtrl::MakeLogo(Ctrl& parent, Array& ctrl) Label& v1 = ctrl.Create