Fixing some warnings on Linux
There were only a few warnings left, so I fixed them and enabled the unused variable warning by removing the "-Wno-unused" flag. Only the -Wno-unused-parameter remains for now (could be removed later).
Review URL: https://codereview.chromium.org/12480002
git-svn-id: http://skia.googlecode.com/svn/trunk@8030 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/views/SkWidgets.cpp b/src/views/SkWidgets.cpp
index 202bf52..e4547ec 100644
--- a/src/views/SkWidgets.cpp
+++ b/src/views/SkWidgets.cpp
@@ -309,7 +309,7 @@
}
}
-SkView::Click* SkPushButtonWidget::onFindClickHandler(SkScalar x, SkScalar y)
+SkView::Click* SkPushButtonWidget::onFindClickHandler(SkScalar x, SkScalar y, unsigned modi)
{
this->acceptFocus();
return new Click(this);
diff --git a/src/views/animated/SkScrollBarView.cpp b/src/views/animated/SkScrollBarView.cpp
index 80ee49f..d78cafa 100644
--- a/src/views/animated/SkScrollBarView.cpp
+++ b/src/views/animated/SkScrollBarView.cpp
@@ -122,12 +122,12 @@
int total = fTotalLength;
int start = fStartPoint;
int shown = fShownLength;
- int hideBar = 0;
+// int hideBar = 0;
if (total <= 0 || shown <= 0 || shown >= total) // no bar to show
{
total = 1; // avoid divide-by-zero. should be done by skin/script
- hideBar = 1; // signal we don't want a thumb
+// hideBar = 1; // signal we don't want a thumb
}
else
{
diff --git a/src/views/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp
index f6e32e4..5b6f101 100644
--- a/src/views/unix/SkOSWindow_Unix.cpp
+++ b/src/views/unix/SkOSWindow_Unix.cpp
@@ -155,7 +155,6 @@
if (NULL == fUnixWindow.fDisplay) {
return;
}
- long event_mask = NoEventMask;
XClientMessageEvent event;
event.type = ClientMessage;
Atom myAtom(0);