summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXScrlbr.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-02-12 13:45:52 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-02-12 13:45:52 (GMT)
commit186fd507fce8e72ceb25fa41cfe1c65429dd3398 (patch)
tree76d87a1336cc0ae03ff1717e7404dbbed46f098f /macosx/tkMacOSXScrlbr.c
parentdf8fe8d77386421fadafe0b14472529c573a3f8b (diff)
parentf0588ea6f1632841dfe7ed350ea5c0e78331882d (diff)
downloadtk-186fd507fce8e72ceb25fa41cfe1c65429dd3398.zip
tk-186fd507fce8e72ceb25fa41cfe1c65429dd3398.tar.gz
tk-186fd507fce8e72ceb25fa41cfe1c65429dd3398.tar.bz2
Silence some compiler warnings.
Diffstat (limited to 'macosx/tkMacOSXScrlbr.c')
-rw-r--r--macosx/tkMacOSXScrlbr.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index fbf268b..1fd931a 100644
--- a/macosx/tkMacOSXScrlbr.c
+++ b/macosx/tkMacOSXScrlbr.c
@@ -102,12 +102,10 @@ TkpCreateScrollbar(
Tk_Window tkwin)
{
- static int initialized = 0;
- MacScrollbar *scrollPtr = ckalloc(sizeof(MacScrollbar));
+ MacScrollbar *scrollPtr = (MacScrollbar *)ckalloc(sizeof(MacScrollbar));
scrollPtr->troughGC = None;
scrollPtr->copyGC = None;
- TkWindow *winPtr = (TkWindow *)tkwin;
Tk_CreateEventHandler(tkwin,ExposureMask|StructureNotifyMask|FocusChangeMask|ButtonPressMask|VisibilityChangeMask, ScrollbarEventProc, scrollPtr);
@@ -144,7 +142,6 @@ TkpDisplayScrollbar(
return;
}
- MacScrollbar *macScrollPtr = clientData;
TkWindow *winPtr = (TkWindow *) tkwin;
MacDrawable *macWin = (MacDrawable *) winPtr->window;
TkMacOSXDrawingContext dc;
@@ -220,7 +217,7 @@ TkpComputeScrollbarGeometry(
* changed. */
{
- int width, height, variant, fieldLength;
+ int variant, fieldLength;
if (scrollPtr->highlightWidth < 0) {
scrollPtr->highlightWidth = 0;
@@ -432,7 +429,7 @@ UpdateControlValues(
MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
double dViewSize;
HIRect contrlRect;
- int variant, active;
+ int variant;
short width, height;
NSView *view = TkMacOSXDrawableView(macWin);
@@ -511,8 +508,8 @@ ScrollbarPress(TkScrollbar *scrollPtr, XEvent *eventPtr)
if (eventPtr->type == ButtonPress) {
UpdateControlValues(scrollPtr);
- return TCL_OK;
}
+ return TCL_OK;
}