diff --git a/generic/tkEntry.h b/generic/tkEntry.h index 2f2ba348b..8864fe5bb 100644 --- a/generic/tkEntry.h +++ b/generic/tkEntry.h @@ -128,19 +128,6 @@ typedef struct { * characters in entry. Malloc'ed. This is * only used by the Entry widget. */ - /* - * Fields used in displaying help text if entry value is empty - */ - - Tk_TextLayout placeholderLayout;/* Cached placeholder text layout information. */ - char *placeholderString; /* String value of placeholder. */ - Tcl_Size placeholderChars; /* Number of chars in placeholder. */ - XColor *placeholderColorPtr;/* Color value of placeholder foreground. */ - GC placeholderGC; /* For drawing placeholder text. */ - int placeholderX; /* Origin for layout. */ - int placeholderLeftIndex; /* Character index of left-most character - * visible in window. */ - /* * Fields whose values are derived from the current values of the * configuration settings above. @@ -186,6 +173,19 @@ typedef struct { * commands. Malloc'ed. */ char *invalidCmd; /* Command called when a validation returns 0 * (successfully fails), defaults to {}. */ + /* + * Fields used in displaying help text if entry value is empty + */ + + Tk_TextLayout placeholderLayout;/* Cached placeholder text layout information. */ + char *placeholderString; /* String value of placeholder. */ + Tcl_Size placeholderChars; /* Number of chars in placeholder. */ + XColor *placeholderColorPtr;/* Color value of placeholder foreground. */ + GC placeholderGC; /* For drawing placeholder text. */ + int placeholderX; /* Origin for layout. */ + int placeholderLeftIndex; /* Character index of left-most character + * visible in window. */ + Tcl_Obj *borderWidthObj; Tcl_Obj *highlightWidthObj; Tcl_Obj *insertWidthObj;