summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tkBitmap.c2
-rw-r--r--generic/tkInt.decls3
-rw-r--r--generic/tkIntDecls.h14
-rw-r--r--generic/tkStubInit.c2
-rw-r--r--generic/tkTextDisp.c2
-rw-r--r--generic/ttk/ttkLabel.c2
-rw-r--r--macosx/tkMacOSXButton.c3
-rw-r--r--macosx/tkMacOSXDraw.c1
-rw-r--r--macosx/tkMacOSXEmbed.c2
-rw-r--r--macosx/tkMacOSXKeyEvent.c8
-rw-r--r--macosx/tkMacOSXMenubutton.c4
-rw-r--r--macosx/tkMacOSXScrlbr.c11
-rw-r--r--macosx/tkMacOSXWm.c5
-rw-r--r--unix/tkUnixButton.c2
14 files changed, 32 insertions, 29 deletions
diff --git a/generic/tkBitmap.c b/generic/tkBitmap.c
index 09545d6..f7df546 100644
--- a/generic/tkBitmap.c
+++ b/generic/tkBitmap.c
@@ -304,7 +304,7 @@ GetBitmap(
TkBitmap *bitmapPtr, *existingBitmapPtr;
TkPredefBitmap *predefPtr;
Pixmap bitmap;
- int isNew, width, height, dummy2;
+ int isNew, width = 0, height = 0, dummy2;
TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
diff --git a/generic/tkInt.decls b/generic/tkInt.decls
index 17f39ba..4cbdb60 100644
--- a/generic/tkInt.decls
+++ b/generic/tkInt.decls
@@ -568,6 +568,9 @@ declare 180 {
char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
}
+declare 181 {
+ int TkpScanWindowId(Tcl_Interp *interp, const char *string, Window *idPtr)
+}
declare 184 {
void TkUnusedStubEntry(void)
}
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 9dea8d4..b31bbd4 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -966,7 +966,12 @@ EXTERN char * TkSmoothPrintProc(ClientData clientData,
Tk_Window tkwin, char *widgRec, int offset,
Tcl_FreeProc **freeProcPtr);
#endif
-/* Slot 181 is reserved */
+#ifndef TkpScanWindowId_TCL_DECLARED
+#define TkpScanWindowId_TCL_DECLARED
+/* 181 */
+EXTERN int TkpScanWindowId(Tcl_Interp *interp,
+ CONST char *string, Window *idPtr);
+#endif
/* Slot 182 is reserved */
/* Slot 183 is reserved */
#ifndef TkUnusedStubEntry_TCL_DECLARED
@@ -1187,7 +1192,7 @@ typedef struct TkIntStubs {
char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 178 */
int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset); /* 179 */
char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 180 */
- VOID *reserved181;
+ int (*tkpScanWindowId) (Tcl_Interp *interp, CONST char *string, Window *idPtr); /* 181 */
VOID *reserved182;
VOID *reserved183;
void (*tkUnusedStubEntry) (void); /* 184 */
@@ -1860,7 +1865,10 @@ extern TkIntStubs *tkIntStubsPtr;
#define TkSmoothPrintProc \
(tkIntStubsPtr->tkSmoothPrintProc) /* 180 */
#endif
-/* Slot 181 is reserved */
+#ifndef TkpScanWindowId
+#define TkpScanWindowId \
+ (tkIntStubsPtr->tkpScanWindowId) /* 181 */
+#endif
/* Slot 182 is reserved */
/* Slot 183 is reserved */
#ifndef TkUnusedStubEntry
diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c
index 79edc4d..b2e6314 100644
--- a/generic/tkStubInit.c
+++ b/generic/tkStubInit.c
@@ -478,7 +478,7 @@ TkIntStubs tkIntStubs = {
TkOrientPrintProc, /* 178 */
TkSmoothParseProc, /* 179 */
TkSmoothPrintProc, /* 180 */
- NULL, /* 181 */
+ TkpScanWindowId, /* 181 */
NULL, /* 182 */
NULL, /* 183 */
TkUnusedStubEntry, /* 184 */
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 8cd5a9a..3edd5dc 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6968,7 +6968,7 @@ DlineXOfIndex(
* coordinate. */
{
register TkTextDispChunk *chunkPtr = dlPtr->chunkPtr;
- int x;
+ int x = 0;
if (byteIndex == 0 || chunkPtr == NULL) {
return 0;
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index d51388b..1037840 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -293,6 +293,7 @@ static void ImageCleanup(ImageElement *image)
TtkFreeImageSpec(image->imageSpec);
}
+#ifndef MAC_OSX_TK
/*
* StippleOver --
* Draw a stipple over the image area, to make it look "grayed-out"
@@ -317,6 +318,7 @@ static void StippleOver(
Tk_FreeBitmapFromObj(tkwin, image->stippleObj);
}
}
+#endif
static void ImageDraw(
ImageElement *image, Tk_Window tkwin,Drawable d,Ttk_Box b,Ttk_State state)
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 5cdfb3c..763f544 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -471,7 +471,6 @@ TkpComputeButtonGeometry(
}
/*
-/*
*----------------------------------------------------------------------
*
* DrawButtonImageAndText --
@@ -966,12 +965,10 @@ ButtonContentDrawCB (
{
TkButton *butPtr = (TkButton *)ptr;
Tk_Window tkwin = butPtr->tkwin;
- HIRect * bounds;
if (tkwin == NULL || !Tk_IsMapped(tkwin)) {
return;
}
- MacDrawable *macWin = (MacDrawable *) Tk_WindowId(tkwin);
/*Overlay Tk elements over button native region: drawing elements within button boundaries/native region causes unpredictable metrics.*/
DrawButtonImageAndText( butPtr);
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 8fe9a95..0b39cb4 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -1477,7 +1477,6 @@ TkScrollWindow(
CGRect srcRect, dstRect;
HIShapeRef dmgRgn = NULL, extraRgn;
NSRect bounds, visRect, scrollSrc, scrollDst;
- NSPoint delta = NSMakePoint(dx, dy);
int result;
if ( view ) {
diff --git a/macosx/tkMacOSXEmbed.c b/macosx/tkMacOSXEmbed.c
index ef83276..bd7e0a8 100644
--- a/macosx/tkMacOSXEmbed.c
+++ b/macosx/tkMacOSXEmbed.c
@@ -200,7 +200,7 @@ TkpScanWindowId(
Tcl_Obj obj;
obj.refCount = 1;
- obj.bytes = string;
+ obj.bytes = (char *) string; /* DANGER?! */
obj.length = strlen(string);
obj.typePtr = NULL;
diff --git a/macosx/tkMacOSXKeyEvent.c b/macosx/tkMacOSXKeyEvent.c
index 0cfb663..c9ad9f1 100644
--- a/macosx/tkMacOSXKeyEvent.c
+++ b/macosx/tkMacOSXKeyEvent.c
@@ -272,8 +272,9 @@ static unsigned isFunctionKey(unsigned int code);
NSString *str = [aString respondsToSelector: @selector (string)] ?
[aString string] : aString;
if (NS_KEYLOG)
- NSLog (@"setMarkedText '%@' len =%d range %d from %d", str, [str length],
- selRange.length, selRange.location);
+ NSLog (@"setMarkedText '%@' len =%lu range %lu from %lu", str,
+ (unsigned long) [str length], (unsigned long) selRange.length,
+ (unsigned long) selRange.location);
if (privateWorkingText != nil)
[self deleteWorkingText];
@@ -293,7 +294,8 @@ static unsigned isFunctionKey(unsigned int code);
if (privateWorkingText == nil)
return;
if (NS_KEYLOG)
- NSLog(@"deleteWorkingText len = %d\n", [privateWorkingText length]);
+ NSLog(@"deleteWorkingText len = %lu\n",
+ (unsigned long)[privateWorkingText length]);
[privateWorkingText release];
privateWorkingText = nil;
processingCompose = NO;
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c
index a1c3138..05b553e 100644
--- a/macosx/tkMacOSXMenubutton.c
+++ b/macosx/tkMacOSXMenubutton.c
@@ -597,10 +597,8 @@ TkMacOSXDrawMenuButton(
if (useNewerHITools == 1) {
- HIRect hirec;
HIRect contHIRec;
static HIThemeButtonDrawInfo hiinfo;
- Rect contRect;
MenuButtonBackgroundDrawCB((MacMenuButton*) mbPtr, 32, true);
@@ -694,12 +692,10 @@ MenuButtonContentDrawCB (
{
TkMenuButton *butPtr = (TkMenuButton *)ptr;
Tk_Window tkwin = butPtr->tkwin;
- Rect bounds;
if (tkwin == NULL || !Tk_IsMapped(tkwin)) {
return;
}
- MacDrawable *macWin = (MacDrawable *) Tk_WindowId(tkwin);
DrawMenuButtonImageAndText( butPtr);
}
diff --git a/macosx/tkMacOSXScrlbr.c b/macosx/tkMacOSXScrlbr.c
index a9d8469..efa0f38 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;
}
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index b834766..210fd6f 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -1652,8 +1652,8 @@ WmForgetCmd(
MacDrawable *macWin;
- Tk_MakeWindowExist(winPtr);
- Tk_MakeWindowExist(winPtr->parentPtr);
+ Tk_MakeWindowExist(frameWin);
+ Tk_MakeWindowExist((Tk_Window)winPtr->parentPtr);
macWin = (MacDrawable *) winPtr->window;
@@ -2403,7 +2403,6 @@ WmManageCmd(
register Tk_Window frameWin = (Tk_Window)winPtr;
register WmInfo *wmPtr = winPtr->wmInfoPtr;
- char *oldClass = (char*)Tk_Class(frameWin);
if (!Tk_IsTopLevel(frameWin)) {
MacDrawable *macWin = (MacDrawable *) winPtr->window;
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index 373f2e3..2101fda 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -360,7 +360,7 @@ TkpDisplayButton(
* warning. */
int y, relief;
Tk_Window tkwin = butPtr->tkwin;
- int width, height, fullWidth, fullHeight;
+ int width = 0, height = 0, fullWidth, fullHeight;
int textXOffset, textYOffset;
int haveImage = 0, haveText = 0;
int offset; /* 1 means this is a button widget, so we