summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/ttk/ttkClamTheme.c59
-rw-r--r--generic/ttk/ttkDefaultTheme.c11
-rw-r--r--generic/ttk/ttkElements.c7
-rw-r--r--generic/ttk/ttkEntry.c25
-rw-r--r--generic/ttk/ttkLabel.c8
-rw-r--r--generic/ttk/ttkLayout.c4
-rw-r--r--generic/ttk/ttkManager.c18
-rw-r--r--generic/ttk/ttkNotebook.c13
-rw-r--r--generic/ttk/ttkTagSet.c6
-rw-r--r--generic/ttk/ttkTheme.c4
-rw-r--r--generic/ttk/ttkTreeview.c6
-rw-r--r--win/ttkWinMonitor.c12
-rw-r--r--win/ttkWinTheme.c22
-rw-r--r--win/ttkWinXPTheme.c4
14 files changed, 93 insertions, 106 deletions
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c
index 0638e52..f64b138 100644
--- a/generic/ttk/ttkClamTheme.c
+++ b/generic/ttk/ttkClamTheme.c
@@ -1,5 +1,5 @@
/*
- * $Id: ttkClamTheme.c,v 1.4 2007/01/11 15:35:39 dkf Exp $
+ * $Id: ttkClamTheme.c,v 1.5 2007/01/11 19:59:26 jenglish Exp $
*
* Copyright (C) 2004 Joe English
*
@@ -324,22 +324,16 @@ RadioIndicatorElementDraw(
Ttk_GetPaddingFromObj(NULL, tkwin, indicator->marginObj, &padding);
b = Ttk_PadBox(b, padding);
- XFillArc(Tk_Display(tkwin),d,gcb,
- b.x,b.y,(unsigned)b.width,(unsigned)b.height, 0,360*64);
- XDrawArc(Tk_Display(tkwin),d,gcl,
- b.x,b.y,(unsigned)b.width,(unsigned)b.height, 225*64,180*64);
- XDrawArc(Tk_Display(tkwin),d,gcu,
- b.x,b.y,(unsigned)b.width,(unsigned)b.height, 45*64,180*64);
+ XFillArc(Tk_Display(tkwin),d,gcb, b.x,b.y,b.width,b.height, 0,360*64);
+ XDrawArc(Tk_Display(tkwin),d,gcl, b.x,b.y,b.width,b.height, 225*64,180*64);
+ XDrawArc(Tk_Display(tkwin),d,gcu, b.x,b.y,b.width,b.height, 45*64,180*64);
if (state & TTK_STATE_SELECTED) {
b = Ttk_PadBox(b,Ttk_UniformPadding(3));
- XFillArc(Tk_Display(tkwin),d,gcf,
- b.x,b.y,(unsigned)b.width,(unsigned)b.height, 0,360*64);
- XDrawArc(Tk_Display(tkwin),d,gcf,
- b.x,b.y,(unsigned)b.width,(unsigned)b.height, 0,360*64);
+ XFillArc(Tk_Display(tkwin),d,gcf, b.x,b.y,b.width,b.height, 0,360*64);
+ XDrawArc(Tk_Display(tkwin),d,gcf, b.x,b.y,b.width,b.height, 0,360*64);
#if WIN32_XDRAWLINE_HACK
- XDrawArc(Tk_Display(tkwin),d,gcf,
- b.x,b.y,(unsigned)b.width,(unsigned)b.height, 300*64,360*64);
+ XDrawArc(Tk_Display(tkwin),d,gcf, b.x,b.y,b.width,b.height, 300*64,360*64);
#endif
}
}
@@ -361,10 +355,9 @@ CheckIndicatorElementDraw(
Ttk_GetPaddingFromObj(NULL, tkwin, indicator->marginObj, &padding);
b = Ttk_PadBox(b, padding);
- XFillRectangle(display,d,gcb, b.x,b.y,
- (unsigned)b.width,(unsigned)b.height);
- XDrawLine(display,d,gcl, b.x,b.y+b.height,b.x+b.width+w,b.y+b.height);/*S*/
- XDrawLine(display,d,gcl, b.x+b.width,b.y,b.x+b.width,b.y+b.height+w); /*E*/
+ XFillRectangle(display,d,gcb, b.x,b.y,b.width,b.height);
+ XDrawLine(display,d,gcl,b.x,b.y+b.height,b.x+b.width+w,b.y+b.height);/*S*/
+ XDrawLine(display,d,gcl,b.x+b.width,b.y,b.x+b.width,b.y+b.height+w); /*E*/
XDrawLine(display,d,gcu,b.x,b.y, b.x,b.y+b.height+w); /*W*/
XDrawLine(display,d,gcu,b.x,b.y, b.x+b.width+w,b.y); /*N*/
@@ -593,10 +586,8 @@ static void TroughElementDraw(
ScrollbarElement *sb = elementRecord;
GC gcb = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
GC gct = Ttk_GCForColor(tkwin,sb->troughColorObj,d);
- XFillRectangle(Tk_Display(tkwin), d, gct, b.x, b.y,
- (unsigned)b.width-1, (unsigned)b.height-1);
- XDrawRectangle(Tk_Display(tkwin), d, gcb, b.x, b.y,
- (unsigned)b.width-1, (unsigned)b.height-1);
+ XFillRectangle(Tk_Display(tkwin), d, gct, b.x, b.y, b.width-1, b.height-1);
+ XDrawRectangle(Tk_Display(tkwin), d, gcb, b.x, b.y, b.width-1, b.height-1);
}
static Ttk_ElementSpec TroughElementSpec = {
@@ -628,10 +619,10 @@ static void ThumbElementDraw(
const int w = WIN32_XDRAWLINE_HACK;
DrawSmoothBorder(tkwin, d, b,
- sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
- XFillRectangle(Tk_Display(tkwin), d,
- BackgroundGC(tkwin, sb->backgroundObj), b.x+2, b.y+2,
- (unsigned)b.width-4, (unsigned)b.height-4);
+ sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
+ XFillRectangle(
+ Tk_Display(tkwin), d, BackgroundGC(tkwin, sb->backgroundObj),
+ b.x+2, b.y+2, b.width-4, b.height-4);
/*
* Draw grip:
@@ -640,7 +631,7 @@ static void ThumbElementDraw(
Tcl_GetIntFromObj(NULL, sb->gripCountObj, &gripCount);
lightGC = Ttk_GCForColor(tkwin,sb->lightColorObj,d);
darkGC = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
-
+
if (orient == TTK_ORIENT_HORIZONTAL) {
dx = 1; dy = 0;
x1 = x2 = b.x + b.width / 2 - gripCount;
@@ -718,14 +709,14 @@ static void PbarElementDraw(
Drawable d, Ttk_Box b, unsigned state)
{
ScrollbarElement *sb = elementRecord;
-
+
b = Ttk_PadBox(b, Ttk_UniformPadding(2));
if (b.width > 4 && b.height > 4) {
DrawSmoothBorder(tkwin, d, b,
- sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
- XFillRectangle(Tk_Display(tkwin), d,
- BackgroundGC(tkwin, sb->backgroundObj),
- b.x+2, b.y+2, (unsigned)b.width-4, (unsigned)b.height-4);
+ sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
+ XFillRectangle(Tk_Display(tkwin), d,
+ BackgroundGC(tkwin, sb->backgroundObj),
+ b.x+2, b.y+2, b.width-4, b.height-4);
}
}
@@ -763,11 +754,11 @@ static void ArrowElementDraw(
int h, cx, cy;
DrawSmoothBorder(tkwin, d, b,
- sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
+ sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
XFillRectangle(
- Tk_Display(tkwin), d, BackgroundGC(tkwin, sb->backgroundObj),
- b.x+2, b.y+2, (unsigned)b.width-4, (unsigned)b.height-4);
+ Tk_Display(tkwin), d, BackgroundGC(tkwin, sb->backgroundObj),
+ b.x+2, b.y+2, b.width-4, b.height-4);
b = Ttk_PadBox(b, Ttk_UniformPadding(3));
h = b.width < b.height ? b.width : b.height;
diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c
index c27591c..ec3ad93 100644
--- a/generic/ttk/ttkDefaultTheme.c
+++ b/generic/ttk/ttkDefaultTheme.c
@@ -1,4 +1,4 @@
-/* $Id: ttkDefaultTheme.c,v 1.6 2007/01/11 15:35:40 dkf Exp $
+/* $Id: ttkDefaultTheme.c,v 1.7 2007/01/11 19:59:26 jenglish Exp $
*
* Copyright (c) 2003, Joe English
*
@@ -297,8 +297,8 @@ BorderElementDraw(
if (defaultState == TTK_BUTTON_DEFAULT_ACTIVE) {
GC gc = Tk_GCForColor(borderColor, d);
- XDrawRectangle(Tk_Display(tkwin), d, gc,
- b.x, b.y, (unsigned)b.width-1, (unsigned)b.height-1);
+ XDrawRectangle(Tk_Display(tkwin), d, gc,
+ b.x, b.y, b.width-1, b.height-1);
}
if (defaultState != TTK_BUTTON_DEFAULT_DISABLED) {
/* Space for default ring: */
@@ -578,12 +578,11 @@ static void IndicatorElementDraw(
/*
* Copy onto our target drawable surface.
*/
-
memset(&gcValues, 0, sizeof(gcValues));
copyGC = Tk_GetGC(tkwin, 0, &gcValues);
TkPutImage(NULL, 0, display, d, copyGC, img, 0, 0, b.x, b.y,
- (unsigned)spec->width, (unsigned)spec->height);
+ spec->width, spec->height);
/*
* Tidy up.
@@ -1085,7 +1084,7 @@ static void TreeitemIndicatorDraw(
b = Ttk_PadBox(b, padding);
XDrawRectangle(Tk_Display(tkwin), d, gc,
- b.x, b.y, (unsigned)b.width - 1, (unsigned)b.height - 1);
+ b.x, b.y, b.width - 1, b.height - 1);
cx = b.x + (b.width - 1) / 2;
cy = b.y + (b.height - 1) / 2;
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c
index cb2c5b5..3c5c4c8 100644
--- a/generic/ttk/ttkElements.c
+++ b/generic/ttk/ttkElements.c
@@ -1,4 +1,4 @@
-/* $Id: ttkElements.c,v 1.5 2007/01/11 15:35:40 dkf Exp $
+/* $Id: ttkElements.c,v 1.6 2007/01/11 19:59:26 jenglish Exp $
*
* Copyright (c) 2003, Joe English
*
@@ -84,7 +84,7 @@ BackgroundElementDraw(
XFillRectangle(Tk_Display(tkwin), d,
Tk_3DBorderGC(tkwin, backgroundPtr, TK_3D_FLAT_GC),
- 0,0, (unsigned)Tk_Width(tkwin), (unsigned)Tk_Height(tkwin));
+ 0,0, Tk_Width(tkwin), Tk_Height(tkwin));
}
static Ttk_ElementSpec BackgroundElementSpec =
@@ -297,8 +297,7 @@ static void DrawFocusRing(
mask = GCForeground | GCLineStyle | GCDashList | GCDashOffset | GCLineWidth;
gc = Tk_GetGC(tkwin, mask, &gcvalues);
- XDrawRectangle(Tk_Display(tkwin), d, gc, b.x, b.y,
- (unsigned)b.width-1, (unsigned)b.height-1);
+ XDrawRectangle(Tk_Display(tkwin), d, gc, b.x, b.y, b.width-1, b.height-1);
Tk_FreeGC(Tk_Display(tkwin), gc);
}
diff --git a/generic/ttk/ttkEntry.c b/generic/ttk/ttkEntry.c
index 6ac910a..f09e5cf 100644
--- a/generic/ttk/ttkEntry.c
+++ b/generic/ttk/ttkEntry.c
@@ -1,5 +1,5 @@
/*
- * $Id: ttkEntry.c,v 1.7 2007/01/11 15:35:40 dkf Exp $
+ * $Id: ttkEntry.c,v 1.8 2007/01/11 19:59:26 jenglish Exp $
*
* DERIVED FROM: tk/generic/tkEntry.c r1.35.
*
@@ -293,7 +293,7 @@ static char *EntryDisplayString(const char *showChar, int numChars)
Tcl_UtfToUniChar(showChar, &ch);
size = Tcl_UniCharToUtf(ch, buf);
- p = displayString = ckalloc((unsigned)numChars * size + 1);
+ p = displayString = ckalloc(numChars * size + 1);
while (numChars--) {
p += Tcl_UniCharToUtf(ch, p);
@@ -710,7 +710,7 @@ static void
EntryStoreValue(Entry *entryPtr, const char *value)
{
size_t numBytes = strlen(value);
- int numChars = Tcl_NumUtfChars(value, (int)numBytes);
+ int numChars = Tcl_NumUtfChars(value, numBytes);
if (entryPtr->core.flags & VALIDATING)
entryPtr->core.flags |= VALIDATION_SET_VALUE;
@@ -811,7 +811,7 @@ InsertChars(
char *string = entryPtr->entry.string;
size_t byteIndex = Tcl_UtfAtIndex(string, index) - string;
size_t byteCount = strlen(value);
- int charsAdded = Tcl_NumUtfChars(value, (int)byteCount);
+ int charsAdded = Tcl_NumUtfChars(value, byteCount);
size_t newByteCount = entryPtr->entry.numBytes + byteCount + 1;
char *new;
int code;
@@ -1245,9 +1245,8 @@ static void EntryDisplay(void *clientData, Drawable d)
Tk_SetCaretPos(tkwin, cursorX, cursorY, cursorHeight);
gc = EntryGetGC(entryPtr, es.insertColorObj);
- XFillRectangle(Tk_Display(tkwin), d, gc,
- cursorX-cursorWidth/2, cursorY,
- (unsigned)cursorWidth, (unsigned)cursorHeight);
+ XFillRectangle(Tk_Display(tkwin), d, gc,
+ cursorX-cursorWidth/2, cursorY, cursorWidth, cursorHeight);
Tk_FreeGC(Tk_Display(tkwin), gc);
}
@@ -1298,13 +1297,13 @@ EntryIndex(
int length;
const char *string = Tcl_GetStringFromObj(indexObj, &length);
- if (strncmp(string, "end", (unsigned) length) == 0) {
+ if (strncmp(string, "end", length) == 0) {
*indexPtr = entryPtr->entry.numChars;
- } else if (strncmp(string, "insert", (unsigned) length) == 0) {
+ } else if (strncmp(string, "insert", length) == 0) {
*indexPtr = entryPtr->entry.insertPos;
- } else if (strncmp(string, "left", (unsigned) length) == 0) { /* for debugging */
+ } else if (strncmp(string, "left", length) == 0) { /* for debugging */
*indexPtr = entryPtr->entry.xscroll.first;
- } else if (strncmp(string, "right", (unsigned) length) == 0) { /* for debugging */
+ } else if (strncmp(string, "right", length) == 0) { /* for debugging */
*indexPtr = entryPtr->entry.xscroll.last;
} else if (strncmp(string, "sel.", 4) == 0) {
if (entryPtr->entry.selectFirst < 0) {
@@ -1313,9 +1312,9 @@ EntryIndex(
Tk_PathName(entryPtr->core.tkwin), NULL);
return TCL_ERROR;
}
- if (strncmp(string, "sel.first", (unsigned) length) == 0) {
+ if (strncmp(string, "sel.first", length) == 0) {
*indexPtr = entryPtr->entry.selectFirst;
- } else if (strncmp(string, "sel.last", (unsigned) length) == 0) {
+ } else if (strncmp(string, "sel.last", length) == 0) {
*indexPtr = entryPtr->entry.selectLast;
} else {
goto badIndex;
diff --git a/generic/ttk/ttkLabel.c b/generic/ttk/ttkLabel.c
index debe10c..8dd1c63 100644
--- a/generic/ttk/ttkLabel.c
+++ b/generic/ttk/ttkLabel.c
@@ -1,4 +1,4 @@
-/* $Id: ttkLabel.c,v 1.6 2007/01/11 15:35:40 dkf Exp $
+/* $Id: ttkLabel.c,v 1.7 2007/01/11 19:59:26 jenglish Exp $
*
* text, image, and label elements.
*
@@ -233,8 +233,7 @@ static void ImageTextElementDraw(
return;
XFillRectangle(Tk_Display(tkwin), d,
- Tk_3DBorderGC(tkwin, bd, TK_3D_FLAT_GC), b.x, b.y,
- (unsigned)b.width, (unsigned)b.height);
+ Tk_3DBorderGC(tkwin, bd, TK_3D_FLAT_GC), b.x, b.y, b.width, b.height);
TextDraw(text, tkwin, d, b);
TextCleanup(text);
@@ -335,8 +334,7 @@ static void StippleOver(
gcvalues.fill_style = FillStippled;
gcvalues.stipple = stipple;
gc = Tk_GetGC(tkwin, mask, &gcvalues);
- XFillRectangle(Tk_Display(tkwin),d,gc,x,y,
- (unsigned)image->width,(unsigned)image->height);
+ XFillRectangle(Tk_Display(tkwin),d,gc,x,y,image->width,image->height);
Tk_FreeGC(Tk_Display(tkwin), gc);
Tk_FreeBitmapFromObj(tkwin, image->stippleObj);
}
diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c
index 55e29f2..2dbdfdf 100644
--- a/generic/ttk/ttkLayout.c
+++ b/generic/ttk/ttkLayout.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 2003 Joe English. Freely redistributable.
*
- * $Id: ttkLayout.c,v 1.6 2007/01/11 15:35:40 dkf Exp $
+ * $Id: ttkLayout.c,v 1.7 2007/01/11 19:59:26 jenglish Exp $
*/
#include <string.h>
@@ -1073,7 +1073,7 @@ static void Ttk_DrawNodeList(
for (; node; node = node->next)
{
int border = node->flags & TTK_BORDER;
- Ttk_State substate = state;
+ int substate = state;
if (node->flags & TTK_UNIT)
substate |= node->state;
diff --git a/generic/ttk/ttkManager.c b/generic/ttk/ttkManager.c
index 378e3cc..319e465 100644
--- a/generic/ttk/ttkManager.c
+++ b/generic/ttk/ttkManager.c
@@ -1,4 +1,4 @@
-/* $Id: ttkManager.c,v 1.2 2007/01/11 15:35:40 dkf Exp $
+/* $Id: ttkManager.c,v 1.3 2007/01/11 19:59:26 jenglish Exp $
*
* Copyright 2005, Joe English. Freely redistributable.
*
@@ -121,7 +121,7 @@ static void ManagerIdleProc(ClientData clientData)
* Recompute slave layout when master widget is resized.
* Keep the slave's map state in sync with the master's.
*/
-static const unsigned ManagerEventMask = StructureNotifyMask;
+static const int ManagerEventMask = StructureNotifyMask;
static void ManagerEventHandler(ClientData clientData, XEvent *eventPtr)
{
Ttk_Manager *mgr = clientData;
@@ -221,16 +221,16 @@ Ttk_Manager *Ttk_CreateManager(
mgr->slaves = NULL;
mgr->flags = 0;
- Tk_CreateEventHandler(mgr->masterWindow, ManagerEventMask,
- ManagerEventHandler, mgr);
+ Tk_CreateEventHandler(
+ mgr->masterWindow, ManagerEventMask, ManagerEventHandler, mgr);
return mgr;
}
void Ttk_DeleteManager(Ttk_Manager *mgr)
{
- Tk_DeleteEventHandler(mgr->masterWindow, ManagerEventMask,
- ManagerEventHandler, mgr);
+ Tk_DeleteEventHandler(
+ mgr->masterWindow, ManagerEventMask, ManagerEventHandler, mgr);
while (mgr->nSlaves > 0) {
Ttk_ForgetSlave(mgr, mgr->nSlaves - 1);
@@ -386,12 +386,12 @@ int Ttk_ConfigureSlave(
/* ASSERT: mgr->slaveOptionTable != NULL */
if (Tk_SetOptions(interp, slave->slaveData, mgr->slaveOptionTable,
- objc, objv, slave->slaveWindow, &savedOptions, &mask) != TCL_OK) {
+ objc, objv, slave->slaveWindow, &savedOptions, &mask) != TCL_OK)
+ {
return TCL_ERROR;
}
- if (mgr->managerSpec->SlaveConfigured(interp, mgr, slave,
- (unsigned)mask) != TCL_OK) {
+ if (mgr->managerSpec->SlaveConfigured(interp,mgr,slave,mask) != TCL_OK) {
Tk_RestoreSavedOptions(&savedOptions);
return TCL_ERROR;
}
diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 43aa541..a9596b9 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -1,4 +1,4 @@
-/* $Id: ttkNotebook.c,v 1.7 2007/01/11 15:35:40 dkf Exp $
+/* $Id: ttkNotebook.c,v 1.8 2007/01/11 19:59:26 jenglish Exp $
* Copyright (c) 2004, Joe English
*
* NOTE-ACTIVE: activeTabIndex is not always correct (it's
@@ -672,15 +672,18 @@ static Ttk_ManagerSpec NotebookManagerSpec =
/* NotebookEventHandler --
* Tracks the active tab.
*/
-static const unsigned NotebookEventMask =
- StructureNotifyMask | PointerMotionMask | LeaveWindowMask;
+static const int NotebookEventMask
+ = StructureNotifyMask
+ | PointerMotionMask
+ | LeaveWindowMask
+ ;
static void NotebookEventHandler(ClientData clientData, XEvent *eventPtr)
{
Notebook *nb = clientData;
if (eventPtr->type == DestroyNotify) { /* Remove self */
- Tk_DeleteEventHandler(nb->core.tkwin, NotebookEventMask,
- NotebookEventHandler, clientData);
+ Tk_DeleteEventHandler(nb->core.tkwin,
+ NotebookEventMask, NotebookEventHandler, clientData);
} else if (eventPtr->type == MotionNotify) {
int index = IdentifyTab(nb, eventPtr->xmotion.x, eventPtr->xmotion.y);
ActivateTab(nb, index);
diff --git a/generic/ttk/ttkTagSet.c b/generic/ttk/ttkTagSet.c
index ce776b6..85624a2 100644
--- a/generic/ttk/ttkTagSet.c
+++ b/generic/ttk/ttkTagSet.c
@@ -1,4 +1,4 @@
-/* $Id: ttkTagSet.c,v 1.2 2007/01/11 15:35:40 dkf Exp $
+/* $Id: ttkTagSet.c,v 1.3 2007/01/11 19:59:26 jenglish Exp $
*
* Ttk widget set: tag tables. Half-baked, work in progress.
*
@@ -31,8 +31,8 @@ struct TtkTagTable {
static Ttk_Tag NewTag(Ttk_TagTable tagTable)
{
Ttk_Tag tag = (Ttk_Tag)ckalloc(sizeof(*tag));
- tag->tagRecord = (Tcl_Obj **)ckalloc((unsigned) tagTable->tagRecordSize);
- memset(tag->tagRecord, 0, (unsigned) tagTable->tagRecordSize);
+ tag->tagRecord = (Tcl_Obj **)ckalloc(tagTable->tagRecordSize);
+ memset(tag->tagRecord, 0, tagTable->tagRecordSize);
return tag;
}
diff --git a/generic/ttk/ttkTheme.c b/generic/ttk/ttkTheme.c
index f1c4e9f..a16ba00 100644
--- a/generic/ttk/ttkTheme.c
+++ b/generic/ttk/ttkTheme.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * $Id: ttkTheme.c,v 1.5 2007/01/11 15:35:40 dkf Exp $
+ * $Id: ttkTheme.c,v 1.6 2007/01/11 19:59:26 jenglish Exp $
*/
#include <stdlib.h>
@@ -1015,7 +1015,7 @@ int InitializeElementRecord(
*dest = styleDefault ? styleDefault : elementDefault;
}
- if (!AllocateResource(cache, tkwin, dest, (int) elementOption->type)) {
+ if (!AllocateResource(cache, tkwin, dest, elementOption->type)) {
return 0;
}
}
diff --git a/generic/ttk/ttkTreeview.c b/generic/ttk/ttkTreeview.c
index a7a9b18..c19a21a 100644
--- a/generic/ttk/ttkTreeview.c
+++ b/generic/ttk/ttkTreeview.c
@@ -1,4 +1,4 @@
-/* $Id: ttkTreeview.c,v 1.13 2007/01/11 15:35:40 dkf Exp $
+/* $Id: ttkTreeview.c,v 1.14 2007/01/11 19:59:26 jenglish Exp $
* Copyright (c) 2004, Joe English
*
* ttk::treeview widget implementation.
@@ -1012,7 +1012,7 @@ static int TreeviewInitialize(Tcl_Interp *interp, void *recordPtr)
tv->tree.nColumns = tv->tree.nDisplayColumns = 0;
tv->tree.columns = NULL;
tv->tree.displayColumns = NULL;
- tv->tree.showFlags = ~(unsigned)0;
+ tv->tree.showFlags = ~0;
InitColumn(&tv->tree.column0);
Tk_InitOptions(
@@ -3180,7 +3180,7 @@ static void RowElementDraw(
XColor *color = Tk_GetColorFromObj(tkwin, row->backgroundObj);
GC gc = Tk_GCForColor(color, d);
XFillRectangle(Tk_Display(tkwin), d, gc,
- b.x, b.y, (unsigned)b.width, (unsigned)b.height);
+ b.x, b.y, b.width, b.height);
}
static Ttk_ElementSpec RowElementSpec =
diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c
index 2fa63b0..bf23e39 100644
--- a/win/ttkWinMonitor.c
+++ b/win/ttkWinMonitor.c
@@ -1,4 +1,4 @@
-/* $Id: ttkWinMonitor.c,v 1.5 2007/01/11 15:35:41 dkf Exp $
+/* $Id: ttkWinMonitor.c,v 1.6 2007/01/11 19:59:26 jenglish Exp $
*/
#ifdef _MSC_VER
@@ -80,7 +80,7 @@ CreateThemeMonitorWindow(HINSTANCE hinst, Tcl_Interp *interp)
HWND hwnd = NULL;
CHAR title[32] = "TtkMonitorWindow";
CHAR name[32] = "TtkMonitorClass";
-
+
wc.cbSize = sizeof(WNDCLASSEX);
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = (WNDPROC)WndProc;
@@ -93,11 +93,11 @@ CreateThemeMonitorWindow(HINSTANCE hinst, Tcl_Interp *interp)
wc.hbrBackground = (HBRUSH)COLOR_WINDOW;
wc.lpszMenuName = name;
wc.lpszClassName = name;
-
+
if (RegisterClassEx(&wc)) {
- hwnd = CreateWindow(name, title, WS_OVERLAPPEDWINDOW,
- (int) CW_USEDEFAULT, (int) CW_USEDEFAULT, (int) CW_USEDEFAULT,
- (int) CW_USEDEFAULT, NULL, NULL, hinst, NULL);
+ hwnd = CreateWindow( name, title, WS_OVERLAPPEDWINDOW,
+ CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+ NULL, NULL, hinst, NULL );
SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG)interp);
ShowWindow(hwnd, SW_HIDE);
UpdateWindow(hwnd);
diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c
index b2f8c0b..f080c8c 100644
--- a/win/ttkWinTheme.c
+++ b/win/ttkWinTheme.c
@@ -1,6 +1,6 @@
/* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net>
*
- * $Id: ttkWinTheme.c,v 1.3 2007/01/11 15:35:41 dkf Exp $
+ * $Id: ttkWinTheme.c,v 1.4 2007/01/11 19:59:26 jenglish Exp $
*/
#ifdef _MSC_VER
@@ -146,8 +146,8 @@ static void FrameControlElementDraw(
HDC hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
DrawFrameControl(hdc, &rc,
- (DWORD) elementData->classId, (DWORD) elementData->partId
- | Ttk_StateTableLookup(elementData->stateMap, state));
+ elementData->classId,
+ elementData->partId|Ttk_StateTableLookup(elementData->stateMap, state));
TkWinReleaseDrawableDC(d, hdc, &dcState);
}
@@ -292,7 +292,7 @@ static void ButtonBorderElementGeometry(
ButtonBorderElement *bd = elementRecord;
int relief = TK_RELIEF_RAISED;
int defaultState = TTK_BUTTON_DEFAULT_DISABLED;
- int cx, cy;
+ short int cx, cy;
Tk_GetReliefFromObj(NULL, bd->reliefObj, &relief);
Ttk_GetButtonDefaultStateFromObj(NULL, bd->defaultStateObj, &defaultState);
@@ -329,10 +329,9 @@ static void ButtonBorderElementDraw(
if (defaultState == TTK_BUTTON_DEFAULT_ACTIVE) {
XColor *highlightColor =
- Tk_GetColorFromObj(tkwin, bd->highlightColorObj);
+ Tk_GetColorFromObj(tkwin, bd->highlightColorObj);
GC gc = Tk_GCForColor(highlightColor, d);
- XDrawRectangle(Tk_Display(tkwin), d, gc, b.x, b.y,
- (unsigned)b.width-1, (unsigned)b.height-1);
+ XDrawRectangle(Tk_Display(tkwin), d, gc, b.x,b.y,b.width-1,b.height-1);
}
if (defaultState != TTK_BUTTON_DEFAULT_DISABLED) {
++b.x; ++b.y; b.width -= 2; b.height -= 2;
@@ -342,13 +341,13 @@ static void ButtonBorderElementDraw(
rc = BoxToRect(b);
DrawFrameControl(hdc, &rc,
- (DWORD) DFC_BUTTON, /* classId */ (DWORD) DFCS_BUTTONPUSH
- | Ttk_StateTableLookup(pushbutton_statemap, state));
+ DFC_BUTTON, /* classId */
+ DFCS_BUTTONPUSH | Ttk_StateTableLookup(pushbutton_statemap, state));
/* Draw focus ring:
*/
if (state & TTK_STATE_FOCUS) {
- int borderWidth = 3; /* @@@ Use GetSystemMetrics?*/
+ short int borderWidth = 3; /* @@@ Use GetSystemMetrics?*/
rc = BoxToRect(Ttk_PadBox(b, Ttk_UniformPadding(borderWidth)));
DrawFocusRect(hdc, &rc);
}
@@ -425,8 +424,7 @@ static void FillFocusElementDraw(
GC gc = Tk_GCForColor(fillColor, d);
HDC hdc;
- XFillRectangle(Tk_Display(tkwin),d,gc,
- b.x,b.y,(unsigned)b.width,(unsigned)b.height);
+ XFillRectangle(Tk_Display(tkwin),d,gc, b.x,b.y,b.width,b.height);
hdc = TkWinGetDrawableDC(Tk_Display(tkwin), d, &dcState);
DrawFocusRect(hdc, &rc);
TkWinReleaseDrawableDC(d, hdc, &dcState);
diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c
index 0d249dd..9df6d2f 100644
--- a/win/ttkWinXPTheme.c
+++ b/win/ttkWinXPTheme.c
@@ -1,5 +1,5 @@
/*
- * $Id: ttkWinXPTheme.c,v 1.5 2007/01/11 15:35:41 dkf Exp $
+ * $Id: ttkWinXPTheme.c,v 1.6 2007/01/11 19:59:26 jenglish Exp $
*
* Tk theme engine which uses the Windows XP "Visual Styles" API
* Adapted from Georgios Petasis' XP theme patch.
@@ -565,7 +565,7 @@ ThumbElementDraw(
return;
elementData->procs->DrawThemeBackground(elementData->hTheme,
- elementData->hDC, elementData->info->partId, (int) stateId,
+ elementData->hDC, elementData->info->partId, stateId,
&rc, NULL);
FreeElementData(elementData);
generated by cgit v0.12 at 2024-11-30 05:49:42 (GMT)