Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Use internalRep.twoPtrValue.ptr1 in stead of internalRep.otherValuePtr everywhere. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-5-branch |
Files: | files | file ages | folders |
SHA1: |
094afa492019f34b4607c65d5911aa7d |
User & Date: | jan.nijtmans 2013-02-01 13:41:04 |
Context
2013-02-04
| ||
19:46 | ttk::treeview: schedule redisplay when adding or removing tags [Bug 3603077]. check-in: 070944a1 user: jenglish tags: core-8-5-branch | |
2013-02-01
| ||
14:30 | Use internalRep.twoPtrValue.ptr1 in stead of internalRep.otherValuePtr everywhere. Change some internal "length" variables from type int to type size_t, so it could handle bigger string sizes (for "novem") check-in: dc4fe358 user: jan.nijtmans tags: trunk | |
13:41 | Use internalRep.twoPtrValue.ptr1 in stead of internalRep.otherValuePtr everywhere. check-in: 094afa49 user: jan.nijtmans tags: core-8-5-branch | |
2013-01-31
| ||
11:49 | Bug [3599928]: Use XkbKeycodeToKeysym if available. check-in: fe704e14 user: stwo tags: core-8-5-branch | |
Changes
Changes to generic/tkObj.c.
︙ | ︙ | |||
185 186 187 188 189 190 191 | GetPixelsFromObjEx( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, Tcl_Obj *objPtr, /* The object from which to get pixels. */ int *intPtr, double *dblPtr) /* Places to store resulting pixels. */ { | | | | | | > < < < | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 | GetPixelsFromObjEx( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, Tcl_Obj *objPtr, /* The object from which to get pixels. */ int *intPtr, double *dblPtr) /* Places to store resulting pixels. */ { int result, fresh; double d; PixelRep *pixelPtr; static double bias[] = { 1.0, 10.0, 25.4, 0.35278 /*25.4 / 72.0*/ }; /* * Special hacks where the type of the object is known to be something * that is just numeric and cannot require distance conversion. This pokes * holes in Tcl's abstractions, but they are just for optimization, not * semantics. */ if (objPtr->typePtr != &pixelObjType) { ThreadSpecificData *typeCache = GetTypeCache(); if (objPtr->typePtr == typeCache->doubleTypePtr) { (void) Tcl_GetDoubleFromObj(interp, objPtr, &d); if (dblPtr != NULL) { *dblPtr = d; } *intPtr = (int) (d<0 ? d-0.5 : d+0.5); return TCL_OK; } else if (objPtr->typePtr == typeCache->intTypePtr) { (void) Tcl_GetIntFromObj(interp, objPtr, intPtr); if (dblPtr) { *dblPtr = (double) (*intPtr); } return TCL_OK; } } retry: fresh = (objPtr->typePtr != &pixelObjType); if (fresh) { result = SetPixelFromAny(interp, objPtr); if (result != TCL_OK) { return result; } } if (SIMPLE_PIXELREP(objPtr)) { *intPtr = GET_SIMPLEPIXEL(objPtr); if (dblPtr) { *dblPtr = (double) (*intPtr); } } else { pixelPtr = GET_COMPLEXPIXEL(objPtr); if ((!fresh) && (pixelPtr->tkwin != tkwin)) { /* * In the case of exo-screen conversions of non-pixels, we force a * recomputation from the string. */ FreePixelInternalRep(objPtr); goto retry; } if ((pixelPtr->tkwin != tkwin) || dblPtr) { d = pixelPtr->value; if (pixelPtr->units >= 0) { d *= bias[pixelPtr->units] * WidthOfScreen(Tk_Screen(tkwin)); d /= WidthMMOfScreen(Tk_Screen(tkwin)); } pixelPtr->returnValue = (int) (d<0 ? d-0.5 : d+0.5); pixelPtr->tkwin = tkwin; |
︙ | ︙ | |||
290 291 292 293 294 295 296 | int Tk_GetPixelsFromObj( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, Tcl_Obj *objPtr, /* The object from which to get pixels. */ int *intPtr) /* Place to store resulting pixels. */ { | | | 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | int Tk_GetPixelsFromObj( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, Tcl_Obj *objPtr, /* The object from which to get pixels. */ int *intPtr) /* Place to store resulting pixels. */ { return GetPixelsFromObjEx(interp, tkwin, objPtr, intPtr, NULL); } /* *---------------------------------------------------------------------- * * Tk_GetDoublePixelsFromObj -- * |
︙ | ︙ | |||
322 323 324 325 326 327 328 | Tk_GetDoublePixelsFromObj( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, Tcl_Obj *objPtr, /* The object from which to get pixels. */ double *doublePtr) /* Place to store resulting pixels. */ { double d; | | | 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 | Tk_GetDoublePixelsFromObj( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, Tcl_Obj *objPtr, /* The object from which to get pixels. */ double *doublePtr) /* Place to store resulting pixels. */ { double d; int result, val; result = GetPixelsFromObjEx(interp, tkwin, objPtr, &val, &d); if (result != TCL_OK) { return result; } if (objPtr->typePtr == &pixelObjType && !SIMPLE_PIXELREP(objPtr)) { PixelRep *pixelPtr = GET_COMPLEXPIXEL(objPtr); |
︙ | ︙ | |||
444 445 446 447 448 449 450 | Tcl_Obj *objPtr) /* The object to convert. */ { const Tcl_ObjType *typePtr; char *string, *rest; double d; int i, units; | | | 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 | Tcl_Obj *objPtr) /* The object to convert. */ { const Tcl_ObjType *typePtr; char *string, *rest; double d; int i, units; string = Tcl_GetString(objPtr); d = strtod(string, &rest); if (rest == string) { goto error; } while ((*rest != '\0') && isspace(UCHAR(*rest))) { rest++; |
︙ | ︙ | |||
557 558 559 560 561 562 563 | if (objPtr->typePtr != &mmObjType) { result = SetMMFromAny(interp, objPtr); if (result != TCL_OK) { return result; } } | | | 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 | if (objPtr->typePtr != &mmObjType) { result = SetMMFromAny(interp, objPtr); if (result != TCL_OK) { return result; } } mmPtr = (MMRep *) objPtr->internalRep.twoPtrValue.ptr1; if (mmPtr->tkwin != tkwin) { d = mmPtr->value; if (mmPtr->units == -1) { d /= WidthOfScreen(Tk_Screen(tkwin)); d *= WidthMMOfScreen(Tk_Screen(tkwin)); } else { d *= bias[mmPtr->units]; |
︙ | ︙ | |||
596 597 598 599 600 601 602 | *---------------------------------------------------------------------- */ static void FreeMMInternalRep( Tcl_Obj *objPtr) /* MM object with internal rep to free. */ { | | | | 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 | *---------------------------------------------------------------------- */ static void FreeMMInternalRep( Tcl_Obj *objPtr) /* MM object with internal rep to free. */ { ckfree((char *) objPtr->internalRep.twoPtrValue.ptr1); objPtr->internalRep.twoPtrValue.ptr1 = NULL; objPtr->typePtr = NULL; } /* *---------------------------------------------------------------------- * * DupMMInternalRep -- |
︙ | ︙ | |||
627 628 629 630 631 632 633 | DupMMInternalRep( register Tcl_Obj *srcPtr, /* Object with internal rep to copy. */ register Tcl_Obj *copyPtr) /* Object with internal rep to set. */ { MMRep *oldPtr, *newPtr; copyPtr->typePtr = srcPtr->typePtr; | | | | 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 | DupMMInternalRep( register Tcl_Obj *srcPtr, /* Object with internal rep to copy. */ register Tcl_Obj *copyPtr) /* Object with internal rep to set. */ { MMRep *oldPtr, *newPtr; copyPtr->typePtr = srcPtr->typePtr; oldPtr = (MMRep *) srcPtr->internalRep.twoPtrValue.ptr1; newPtr = (MMRep *) ckalloc(sizeof(MMRep)); newPtr->value = oldPtr->value; newPtr->units = oldPtr->units; newPtr->tkwin = oldPtr->tkwin; newPtr->returnValue = oldPtr->returnValue; copyPtr->internalRep.twoPtrValue.ptr1 = (VOID *) newPtr; } /* *---------------------------------------------------------------------- * * UpdateStringOfMM -- * |
︙ | ︙ | |||
663 664 665 666 667 668 669 | UpdateStringOfMM( register Tcl_Obj *objPtr) /* pixel obj with string rep to update. */ { MMRep *mmPtr; char buffer[TCL_DOUBLE_SPACE]; register int len; | | | 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 | UpdateStringOfMM( register Tcl_Obj *objPtr) /* pixel obj with string rep to update. */ { MMRep *mmPtr; char buffer[TCL_DOUBLE_SPACE]; register int len; mmPtr = (MMRep *) objPtr->internalRep.twoPtrValue.ptr1; /* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */ if ((mmPtr->units != -1) || (objPtr->bytes != NULL)) { Tcl_Panic("UpdateStringOfMM: false precondition"); } Tcl_PrintDouble(NULL, mmPtr->value, buffer); len = (int)strlen(buffer); |
︙ | ︙ | |||
701 702 703 704 705 706 707 | */ static int SetMMFromAny( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tcl_Obj *objPtr) /* The object to convert. */ { | | | | | | | 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 | */ static int SetMMFromAny( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tcl_Obj *objPtr) /* The object to convert. */ { ThreadSpecificData *typeCache = GetTypeCache(); const Tcl_ObjType *typePtr; char *string, *rest; double d; int units; MMRep *mmPtr; if (objPtr->typePtr == typeCache->doubleTypePtr) { Tcl_GetDoubleFromObj(interp, objPtr, &d); units = -1; } else if (objPtr->typePtr == typeCache->intTypePtr) { Tcl_GetIntFromObj(interp, objPtr, &units); d = (double) units; units = -1; /* * In the case of ints, we need to ensure that a valid string exists * in order for int-but-not-string objects to be converted back to * ints again from mm obj types. */ (void) Tcl_GetString(objPtr); } else { /* * It wasn't a known int or double, so parse it. */ string = Tcl_GetString(objPtr); d = strtod(string, &rest); if (rest == string) { /* * Must copy string before resetting the result in case a caller * is trying to convert the interpreter's result to mms. */ |
︙ | ︙ | |||
776 777 778 779 780 781 782 | */ typePtr = objPtr->typePtr; if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) { (*typePtr->freeIntRepProc)(objPtr); } | | | | | | | | 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 | */ typePtr = objPtr->typePtr; if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) { (*typePtr->freeIntRepProc)(objPtr); } objPtr->typePtr = &mmObjType; mmPtr = (MMRep *) ckalloc(sizeof(MMRep)); mmPtr->value = d; mmPtr->units = units; mmPtr->tkwin = NULL; mmPtr->returnValue = d; objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) mmPtr; return TCL_OK; } /* *---------------------------------------------------------------------- * |
︙ | ︙ | |||
817 818 819 820 821 822 823 | int TkGetWindowFromObj( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, /* A token to get the main window from. */ Tcl_Obj *objPtr, /* The object from which to get window. */ Tk_Window *windowPtr) /* Place to store resulting window. */ { | | | | | | | | > > > > > < < < < < | 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 | int TkGetWindowFromObj( Tcl_Interp *interp, /* Used for error reporting if not NULL. */ Tk_Window tkwin, /* A token to get the main window from. */ Tcl_Obj *objPtr, /* The object from which to get window. */ Tk_Window *windowPtr) /* Place to store resulting window. */ { TkMainInfo *mainPtr = ((TkWindow *) tkwin)->mainPtr; register WindowRep *winPtr; int result; result = Tcl_ConvertToType(interp, objPtr, &windowObjType); if (result != TCL_OK) { return result; } winPtr = (WindowRep *) objPtr->internalRep.twoPtrValue.ptr1; if (winPtr->tkwin == NULL || winPtr->mainPtr == NULL || winPtr->mainPtr != mainPtr || winPtr->epoch != mainPtr->deletionEpoch) { /* * Cache is invalid. */ winPtr->tkwin = Tk_NameToWindow(interp, Tcl_GetString(objPtr), tkwin); if (winPtr->tkwin == NULL) { /* ASSERT: Tk_NameToWindow has left error message in interp */ return TCL_ERROR; } winPtr->mainPtr = mainPtr; winPtr->epoch = mainPtr ? mainPtr->deletionEpoch : 0; } *windowPtr = winPtr->tkwin; return TCL_OK; } /* *---------------------------------------------------------------------- * * SetWindowFromAny -- |
︙ | ︙ | |||
883 884 885 886 887 888 889 | const Tcl_ObjType *typePtr; WindowRep *winPtr; /* * Free the old internalRep before setting the new one. */ | | | | 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 | const Tcl_ObjType *typePtr; WindowRep *winPtr; /* * Free the old internalRep before setting the new one. */ (void)Tcl_GetString(objPtr); typePtr = objPtr->typePtr; if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) { (*typePtr->freeIntRepProc)(objPtr); } winPtr = (WindowRep *) ckalloc(sizeof(WindowRep)); winPtr->tkwin = NULL; winPtr->mainPtr = NULL; winPtr->epoch = 0; objPtr->internalRep.twoPtrValue.ptr1 = (VOID*)winPtr; objPtr->typePtr = &windowObjType; return TCL_OK; } /* *---------------------------------------------------------------------- |
︙ | ︙ | |||
925 926 927 928 929 930 931 | static void DupWindowInternalRep( register Tcl_Obj *srcPtr, register Tcl_Obj *copyPtr) { register WindowRep *oldPtr, *newPtr; | | | | 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 | static void DupWindowInternalRep( register Tcl_Obj *srcPtr, register Tcl_Obj *copyPtr) { register WindowRep *oldPtr, *newPtr; oldPtr = srcPtr->internalRep.twoPtrValue.ptr1; newPtr = (WindowRep *) ckalloc(sizeof(WindowRep)); newPtr->tkwin = oldPtr->tkwin; newPtr->mainPtr = oldPtr->mainPtr; newPtr->epoch = oldPtr->epoch; copyPtr->internalRep.twoPtrValue.ptr1 = (VOID *)newPtr; copyPtr->typePtr = srcPtr->typePtr; } /* *---------------------------------------------------------------------- * * FreeWindowInternalRep -- |
︙ | ︙ | |||
956 957 958 959 960 961 962 | *---------------------------------------------------------------------- */ static void FreeWindowInternalRep( Tcl_Obj *objPtr) /* Window object with internal rep to free. */ { | | | | | | 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 | *---------------------------------------------------------------------- */ static void FreeWindowInternalRep( Tcl_Obj *objPtr) /* Window object with internal rep to free. */ { ckfree((char *) objPtr->internalRep.twoPtrValue.ptr1); objPtr->internalRep.twoPtrValue.ptr1 = NULL; objPtr->typePtr = NULL; } /* *---------------------------------------------------------------------- * * TkParsePadAmount -- * * This function parses a padding specification and returns the * appropriate padding values. A padding specification can be either a * single pixel width, or a list of two pixel widths. If a single pixel * width, the amount specified is used for padding on both sides. If two * amounts are specified, then they specify the left/right or top/bottom * padding. * * Results: * A standard Tcl return value. * * Side effects: * An error message is written to the interpreter if something is not * right. * *---------------------------------------------------------------------- */ int TkParsePadAmount( Tcl_Interp *interp, /* Interpreter for error reporting. */ Tk_Window tkwin, /* A window. Needed by Tk_GetPixels() */ Tcl_Obj *specObj, /* The argument to "-padx", "-pady", "-ipadx", |
︙ | ︙ |
Changes to generic/tkStyle.c.
︙ | ︙ | |||
58 59 60 61 62 63 64 | */ typedef struct StyleEngine { const char *name; /* Name of engine. Points to a hash key. */ StyledElement *elements; /* Table of widget element descriptors. Each * element is indexed by a unique system-wide * ID. Table grows dynamically as new elements | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | */ typedef struct StyleEngine { const char *name; /* Name of engine. Points to a hash key. */ StyledElement *elements; /* Table of widget element descriptors. Each * element is indexed by a unique system-wide * ID. Table grows dynamically as new elements * are registered. Malloc'd. */ struct StyleEngine *parentPtr; /* Parent engine. Engines may be layered to * form a fallback chain, terminated by the * default system engine. */ } StyleEngine; /* |
︙ | ︙ | |||
142 143 144 145 146 147 148 | static void InitWidgetSpec(StyledWidgetSpec *widgetSpecPtr, StyledElement *elementPtr, Tk_OptionTable optionTable); static int SetStyleFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr); /* * The following structure defines the implementation of the "style" Tcl | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | static void InitWidgetSpec(StyledWidgetSpec *widgetSpecPtr, StyledElement *elementPtr, Tk_OptionTable optionTable); static int SetStyleFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr); /* * The following structure defines the implementation of the "style" Tcl * object, used for drawing. The internalRep.twoPtrValue.ptr1 field of each style * object points to the Style structure for the stylefont, or NULL. */ static Tcl_ObjType styleObjType = { "style", /* name */ FreeStyleObjProc, /* freeIntRepProc */ DupStyleObjProc, /* dupIntRepProc */ |
︙ | ︙ | |||
371 372 373 374 375 376 377 | if (name == NULL || *name == '\0') { /* * This is the default style engine. */ enginePtr->parentPtr = NULL; | < < | 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | if (name == NULL || *name == '\0') { /* * This is the default style engine. */ enginePtr->parentPtr = NULL; } else if (parentPtr == NULL) { /* * The default style engine is the parent. */ enginePtr->parentPtr = tsdPtr->defaultEnginePtr; } else { enginePtr->parentPtr = parentPtr; } /* * Allocate and initialize elements array. */ |
︙ | ︙ | |||
598 599 600 601 602 603 604 | * Memory allocated. * *--------------------------------------------------------------------------- */ static int CreateElement( | | | | | < | | 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | * Memory allocated. * *--------------------------------------------------------------------------- */ static int CreateElement( const char *name, /* Name of the element. */ int create) /* Boolean, whether the element is being * created explicitly (being registered) or * implicitly (by a derived element). */ { ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); Tcl_HashEntry *entryPtr, *engineEntryPtr; Tcl_HashSearch search; int newEntry, elementId, genericId = -1; char *dot; StyleEngine *enginePtr; /* * Find or create the element. */ |
︙ | ︙ | |||
1257 1258 1259 1260 1261 1262 1263 | /* * Allocate and intitialize a new style. */ stylePtr = (Style *) ckalloc(sizeof(Style)); InitStyle(stylePtr, Tcl_GetHashKey(&tsdPtr->styleTable, entryPtr), | | < | 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 | /* * Allocate and intitialize a new style. */ stylePtr = (Style *) ckalloc(sizeof(Style)); InitStyle(stylePtr, Tcl_GetHashKey(&tsdPtr->styleTable, entryPtr), (engine!=NULL ? (StyleEngine *) engine : tsdPtr->defaultEnginePtr), clientData); Tcl_SetHashValue(entryPtr, (ClientData) stylePtr); return (Tk_Style) stylePtr; } /* |
︙ | ︙ | |||
1411 1412 1413 1414 1415 1416 1417 | Tcl_Obj *objPtr) /* Object containing name of the style to * retrieve. */ { Style *stylePtr; if (objPtr->typePtr != &styleObjType) { SetStyleFromAny(interp, objPtr); | < < < > | 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 | Tcl_Obj *objPtr) /* Object containing name of the style to * retrieve. */ { Style *stylePtr; if (objPtr->typePtr != &styleObjType) { SetStyleFromAny(interp, objPtr); } stylePtr = (Style *) objPtr->internalRep.twoPtrValue.ptr1; return (Tk_Style) stylePtr; } /* *---------------------------------------------------------------------- * |
︙ | ︙ | |||
1446 1447 1448 1449 1450 1451 1452 | Tk_GetStyleFromObj( Tcl_Obj *objPtr) /* The object from which to get the style. */ { if (objPtr->typePtr != &styleObjType) { SetStyleFromAny(NULL, objPtr); } | | | 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 | Tk_GetStyleFromObj( Tcl_Obj *objPtr) /* The object from which to get the style. */ { if (objPtr->typePtr != &styleObjType) { SetStyleFromAny(NULL, objPtr); } return (Tk_Style) objPtr->internalRep.twoPtrValue.ptr1; } /* *--------------------------------------------------------------------------- * * Tk_FreeStyleFromObj -- * |
︙ | ︙ | |||
1501 1502 1503 1504 1505 1506 1507 | name = Tcl_GetString(objPtr); typePtr = objPtr->typePtr; if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) { (*typePtr->freeIntRepProc)(objPtr); } objPtr->typePtr = &styleObjType; | | | 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 | name = Tcl_GetString(objPtr); typePtr = objPtr->typePtr; if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) { (*typePtr->freeIntRepProc)(objPtr); } objPtr->typePtr = &styleObjType; objPtr->internalRep.twoPtrValue.ptr1 = (VOID *) Tk_GetStyle(interp, name); return TCL_OK; } /* *--------------------------------------------------------------------------- * |
︙ | ︙ | |||
1524 1525 1526 1527 1528 1529 1530 | *--------------------------------------------------------------------------- */ static void FreeStyleObjProc( Tcl_Obj *objPtr) /* The object we are releasing. */ { | | | > | 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 | *--------------------------------------------------------------------------- */ static void FreeStyleObjProc( Tcl_Obj *objPtr) /* The object we are releasing. */ { objPtr->internalRep.twoPtrValue.ptr1 = NULL; objPtr->typePtr = NULL; } /* *--------------------------------------------------------------------------- * * DupStyleObjProc -- * * When a cached style object is duplicated, this is called to update the * internal reps. * *--------------------------------------------------------------------------- */ static void DupStyleObjProc( Tcl_Obj *srcObjPtr, /* The object we are copying from. */ Tcl_Obj *dupObjPtr) /* The object we are copying to. */ { dupObjPtr->typePtr = srcObjPtr->typePtr; dupObjPtr->internalRep.twoPtrValue.ptr1 = srcObjPtr->internalRep.twoPtrValue.ptr1; } /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: */ |