summaryrefslogtreecommitdiffstats
path: root/generic/tkWindow.c
diff options
context:
space:
mode:
Diffstat (limited to 'generic/tkWindow.c')
-rw-r--r--generic/tkWindow.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 9906289..839e860 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.c
@@ -67,7 +67,7 @@ static const XWindowChanges defChanges = {
EnterWindowMask|LeaveWindowMask|PointerMotionMask|ExposureMask| \
VisibilityChangeMask|PropertyChangeMask|ColormapChangeMask
static const XSetWindowAttributes defAtts= {
- 0, /* background_pixmap */
+ None, /* background_pixmap */
0, /* background_pixel */
CopyFromParent, /* border_pixmap */
0, /* border_pixel */
@@ -81,7 +81,7 @@ static const XSetWindowAttributes defAtts= {
0, /* do_not_propagate_mask */
False, /* override_redirect */
CopyFromParent, /* colormap */
- 0 /* cursor */
+ None /* cursor */
};
/*
@@ -633,7 +633,7 @@ TkAllocWindow(
winPtr->visual = DefaultVisual(dispPtr->display, screenNum);
winPtr->depth = DefaultDepth(dispPtr->display, screenNum);
}
- winPtr->window = 0;
+ winPtr->window = None;
winPtr->childList = NULL;
winPtr->lastChildPtr = NULL;
winPtr->parentPtr = NULL;
@@ -1379,7 +1379,7 @@ Tk_DestroyWindow(
winPtr->pathName != NULL &&
!(winPtr->flags & TK_ANONYMOUS_WINDOW)) {
halfdeadPtr->flags |= HD_DESTROY_EVENT;
- if (!winPtr->window) {
+ if (winPtr->window == None) {
Tk_MakeWindowExist(tkwin);
}
event.type = DestroyNotify;
@@ -1425,7 +1425,7 @@ Tk_DestroyWindow(
} else if (winPtr->flags & TK_WM_COLORMAP_WINDOW) {
TkWmRemoveFromColormapWindows(winPtr);
}
- if (winPtr->window) {
+ if (winPtr->window != None) {
#if defined(MAC_OSX_TK) || defined(_WIN32)
XDestroyWindow(winPtr->display, winPtr->window);
#else
@@ -1443,7 +1443,7 @@ Tk_DestroyWindow(
#endif
Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->winTable,
(char *) winPtr->window));
- winPtr->window = 0;
+ winPtr->window = None;
}
UnlinkWindow(winPtr);
TkEventDeadWindow(winPtr);
@@ -1619,7 +1619,7 @@ Tk_MapWindow(
if (winPtr->flags & TK_MAPPED) {
return;
}
- if (!winPtr->window) {
+ if (winPtr->window == None) {
Tk_MakeWindowExist(tkwin);
}
/*
@@ -1681,21 +1681,21 @@ Tk_MakeWindowExist(
Tk_ClassCreateProc *createProc;
int isNew;
- if (winPtr->window) {
+ if (winPtr->window != None) {
return;
}
if ((winPtr->parentPtr == NULL) || (winPtr->flags & TK_TOP_HIERARCHY)) {
parent = XRootWindow(winPtr->display, winPtr->screenNum);
} else {
- if (!winPtr->parentPtr->window) {
+ if (winPtr->parentPtr->window == None) {
Tk_MakeWindowExist((Tk_Window) winPtr->parentPtr);
}
parent = winPtr->parentPtr->window;
}
createProc = Tk_GetClassProc(winPtr->classProcsPtr, createProc);
- if (createProc != NULL && parent) {
+ if (createProc != NULL && parent != None) {
winPtr->window = createProc(tkwin, parent, winPtr->instanceData);
} else {
winPtr->window = TkpMakeWindow(winPtr, parent);
@@ -1721,7 +1721,7 @@ Tk_MakeWindowExist(
for (winPtr2 = winPtr->nextPtr; winPtr2 != NULL;
winPtr2 = winPtr2->nextPtr) {
- if (winPtr2->window
+ if ((winPtr2->window != None)
&& !(winPtr2->flags & (TK_TOP_HIERARCHY|TK_REPARENTED))) {
XWindowChanges changes;
@@ -1841,7 +1841,7 @@ Tk_ConfigureWindow(
Tcl_Panic("Can't set sibling or stack mode from Tk_ConfigureWindow");
}
- if (winPtr->window) {
+ if (winPtr->window != None) {
XConfigureWindow(winPtr->display, winPtr->window,
valueMask, valuePtr);
TkDoConfigureNotify(winPtr);
@@ -1860,7 +1860,7 @@ Tk_MoveWindow(
winPtr->changes.x = x;
winPtr->changes.y = y;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XMoveWindow(winPtr->display, winPtr->window, x, y);
TkDoConfigureNotify(winPtr);
} else {
@@ -1878,7 +1878,7 @@ Tk_ResizeWindow(
winPtr->changes.width = (unsigned) width;
winPtr->changes.height = (unsigned) height;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XResizeWindow(winPtr->display, winPtr->window, (unsigned) width,
(unsigned) height);
TkDoConfigureNotify(winPtr);
@@ -1900,7 +1900,7 @@ Tk_MoveResizeWindow(
winPtr->changes.y = y;
winPtr->changes.width = (unsigned) width;
winPtr->changes.height = (unsigned) height;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XMoveResizeWindow(winPtr->display, winPtr->window, x, y,
(unsigned) width, (unsigned) height);
TkDoConfigureNotify(winPtr);
@@ -1918,7 +1918,7 @@ Tk_SetWindowBorderWidth(
register TkWindow *winPtr = (TkWindow *) tkwin;
winPtr->changes.border_width = width;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XSetWindowBorderWidth(winPtr->display, winPtr->window,
(unsigned) width);
TkDoConfigureNotify(winPtr);
@@ -1985,7 +1985,7 @@ Tk_ChangeWindowAttributes(
winPtr->atts.cursor = attsPtr->cursor;
}
- if (winPtr->window) {
+ if (winPtr->window != None) {
XChangeWindowAttributes(winPtr->display, winPtr->window,
valueMask, attsPtr);
} else {
@@ -2003,7 +2003,7 @@ Tk_SetWindowBackground(
winPtr->atts.background_pixel = pixel;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XSetWindowBackground(winPtr->display, winPtr->window, pixel);
} else {
winPtr->dirtyAtts = (winPtr->dirtyAtts & (unsigned) ~CWBackPixmap)
@@ -2020,7 +2020,7 @@ Tk_SetWindowBackgroundPixmap(
winPtr->atts.background_pixmap = pixmap;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XSetWindowBackgroundPixmap(winPtr->display,
winPtr->window, pixmap);
} else {
@@ -2038,7 +2038,7 @@ Tk_SetWindowBorder(
winPtr->atts.border_pixel = pixel;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XSetWindowBorder(winPtr->display, winPtr->window, pixel);
} else {
winPtr->dirtyAtts = (winPtr->dirtyAtts & (unsigned) ~CWBorderPixmap)
@@ -2055,7 +2055,7 @@ Tk_SetWindowBorderPixmap(
winPtr->atts.border_pixmap = pixmap;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XSetWindowBorderPixmap(winPtr->display,
winPtr->window, pixmap);
} else {
@@ -2077,7 +2077,7 @@ Tk_DefineCursor(
winPtr->atts.cursor = (Cursor) cursor;
#endif
- if (winPtr->window) {
+ if (winPtr->window != None) {
XDefineCursor(winPtr->display, winPtr->window, winPtr->atts.cursor);
} else {
winPtr->dirtyAtts = winPtr->dirtyAtts | CWCursor;
@@ -2088,7 +2088,7 @@ void
Tk_UndefineCursor(
Tk_Window tkwin) /* Window to manipulate. */
{
- Tk_DefineCursor(tkwin, 0);
+ Tk_DefineCursor(tkwin, NULL);
}
void
@@ -2100,7 +2100,7 @@ Tk_SetWindowColormap(
winPtr->atts.colormap = colormap;
- if (winPtr->window) {
+ if (winPtr->window != None) {
XSetWindowColormap(winPtr->display, winPtr->window, colormap);
if (!(winPtr->flags & TK_WIN_MANAGED)) {
TkWmAddToColormapWindows(winPtr);
@@ -2140,7 +2140,7 @@ Tk_SetWindowVisual(
{
register TkWindow *winPtr = (TkWindow *) tkwin;
- if (winPtr->window) {
+ if (winPtr->window != None) {
/* Too late! */
return 0;
}
@@ -2200,7 +2200,7 @@ TkDoConfigureNotify(
if (winPtr->changes.stack_mode == Above) {
event.xconfigure.above = winPtr->changes.sibling;
} else {
- event.xconfigure.above = 0;
+ event.xconfigure.above = None;
}
event.xconfigure.override_redirect = winPtr->atts.override_redirect;
Tk_HandleEvent(&event);
@@ -2569,14 +2569,14 @@ Tk_RestackWindow(
* will be handled properly when the window is finally created.
*/
- if (winPtr->window) {
+ if (winPtr->window != None) {
XWindowChanges changes;
unsigned int mask = CWStackMode;
changes.stack_mode = Above;
for (otherPtr = winPtr->nextPtr; otherPtr != NULL;
otherPtr = otherPtr->nextPtr) {
- if (otherPtr->window
+ if ((otherPtr->window != None)
&& !(otherPtr->flags & (TK_TOP_HIERARCHY|TK_REPARENTED))){
changes.sibling = otherPtr->window;
changes.stack_mode = Below;
generated by cgit v0.12 at 2025-02-17 01:19:36 (GMT)