Import Tk 8.6.10
This commit is contained in:
@@ -65,8 +65,8 @@ TkpCreateScrollbar(
|
||||
{
|
||||
UnixScrollbar *scrollPtr = ckalloc(sizeof(UnixScrollbar));
|
||||
|
||||
scrollPtr->troughGC = None;
|
||||
scrollPtr->copyGC = None;
|
||||
scrollPtr->troughGC = NULL;
|
||||
scrollPtr->copyGC = NULL;
|
||||
|
||||
Tk_CreateEventHandler(tkwin,
|
||||
ExposureMask|StructureNotifyMask|FocusChangeMask,
|
||||
@@ -366,10 +366,10 @@ TkpDestroyScrollbar(
|
||||
{
|
||||
UnixScrollbar *unixScrollPtr = (UnixScrollbar *)scrollPtr;
|
||||
|
||||
if (unixScrollPtr->troughGC != None) {
|
||||
if (unixScrollPtr->troughGC != NULL) {
|
||||
Tk_FreeGC(scrollPtr->display, unixScrollPtr->troughGC);
|
||||
}
|
||||
if (unixScrollPtr->copyGC != None) {
|
||||
if (unixScrollPtr->copyGC != NULL) {
|
||||
Tk_FreeGC(scrollPtr->display, unixScrollPtr->copyGC);
|
||||
}
|
||||
}
|
||||
@@ -406,11 +406,11 @@ TkpConfigureScrollbar(
|
||||
|
||||
gcValues.foreground = scrollPtr->troughColorPtr->pixel;
|
||||
new = Tk_GetGC(scrollPtr->tkwin, GCForeground, &gcValues);
|
||||
if (unixScrollPtr->troughGC != None) {
|
||||
if (unixScrollPtr->troughGC != NULL) {
|
||||
Tk_FreeGC(scrollPtr->display, unixScrollPtr->troughGC);
|
||||
}
|
||||
unixScrollPtr->troughGC = new;
|
||||
if (unixScrollPtr->copyGC == None) {
|
||||
if (unixScrollPtr->copyGC == NULL) {
|
||||
gcValues.graphics_exposures = False;
|
||||
unixScrollPtr->copyGC = Tk_GetGC(scrollPtr->tkwin,
|
||||
GCGraphicsExposures, &gcValues);
|
||||
|
||||
Reference in New Issue
Block a user