diff options
| -rwxr-xr-x | Makefile.in | 3 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rwxr-xr-x | configure.in | 4 | ||||
| -rw-r--r-- | src/bltConfig.h | 125 |
4 files changed, 7 insertions, 129 deletions
diff --git a/Makefile.in b/Makefile.in index eb7e5ab..4c6c774 100755 --- a/Makefile.in +++ b/Makefile.in @@ -299,6 +299,9 @@ VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macos .c.@OBJEXT@: $(COMPILE) -c `@CYGPATH@ $<` -o $@ +.C.@OBJEXT@: + $(COMPILE) -c `@CYGPATH@ $<` -o $@ + #======================================================================== # Distribution creation # You may need to tweak this target to make it work correctly. @@ -5536,9 +5536,9 @@ done bltGrHairs.c bltGrLegd.c bltGrLine.c - bltGrMarker.c + bltGrMarker.C bltGrMarkerBitmap.c - bltGrMarkerLine.c + bltGrMarkerLine.C bltGrMarkerPolygon.c bltGrMarkerText.c bltGrMarkerWindow.c diff --git a/configure.in b/configure.in index 793d63e..02ec7c8 100755 --- a/configure.in +++ b/configure.in @@ -81,9 +81,9 @@ TEA_ADD_SOURCES([ bltGrHairs.c bltGrLegd.c bltGrLine.c - bltGrMarker.c + bltGrMarker.C bltGrMarkerBitmap.c - bltGrMarkerLine.c + bltGrMarkerLine.C bltGrMarkerPolygon.c bltGrMarkerText.c bltGrMarkerWindow.c diff --git a/src/bltConfig.h b/src/bltConfig.h index ea477fe..c03c5ef 100644 --- a/src/bltConfig.h +++ b/src/bltConfig.h @@ -33,128 +33,6 @@ #ifndef BLT_CONFIG_H #define BLT_CONFIG_H -typedef int (Blt_OptionParseProc)(ClientData clientData, Tcl_Interp *interp, - Tk_Window tkwin, Tcl_Obj *objPtr, char *widgRec, int offset, int flags); -typedef Tcl_Obj *(Blt_OptionPrintProc)(ClientData clientData, - Tcl_Interp *interp, Tk_Window tkwin, char *widgRec, int offset, - int flags); -typedef void (Blt_OptionFreeProc)(ClientData clientData, Display *display, - char *widgRec, int offset); - -typedef struct Blt_CustomOption { - Blt_OptionParseProc *parseProc; /* Procedure to call to parse - * an option and store it in - * converted form. */ - - Blt_OptionPrintProc *printProc; /* Procedure to return a - * Tcl_Obj representing an - * existing option value. */ - - Blt_OptionFreeProc *freeProc; /* Procedure used to free the - * value. */ - - ClientData clientData; /* Arbitrary one-word value - * used by option parser: - * passed to parseProc and - * printProc. */ -} Blt_CustomOption; - -/* - * Structure used to specify information for Tk_ConfigureWidget. Each - * structure gives complete information for one option, including - * how the option is specified on the command line, where it appears - * in the option database, etc. - */ - -typedef struct { - int type; /* Type of option, such as - * BLT_CONFIG_COLOR; see definitions - * below. Last option in table must - * have type BLT_CONFIG_END. */ - - const char *switchName; /* Switch used to specify option in - * argv. NULL means this spec is part - * of a group. */ - - Tk_Uid dbName; /* Name for option in option - * database. */ - - Tk_Uid dbClass; /* Class for option in database. */ - - Tk_Uid defValue; /* Default value for option if not - * specified in command line or - * database. */ - - int offset; /* Where in widget record to store - * value; use Blt_Offset macro to - * generate values for this. */ - - int specFlags; /* Any combination of the values - * defined below; other bits are used - * internally by tkConfig.c. */ - - Blt_CustomOption *customPtr; /* If type is BLT_CONFIG_CUSTOM then - * this is a pointer to info about how - * to parse and print the option. - * Otherwise it is irrelevant. */ -} Blt_ConfigSpec; - -/* - * Type values for Blt_ConfigSpec structures. See the user - * documentation for details. - */ -typedef enum { - BLT_CONFIG_BOOLEAN, - BLT_CONFIG_INT, - BLT_CONFIG_DOUBLE, - BLT_CONFIG_STRING, - BLT_CONFIG_UID, - BLT_CONFIG_COLOR, - BLT_CONFIG_FONT, - BLT_CONFIG_BITMAP, - BLT_CONFIG_BORDER, - BLT_CONFIG_RELIEF, - BLT_CONFIG_CURSOR, - BLT_CONFIG_ACTIVE_CURSOR, - BLT_CONFIG_JUSTIFY, - BLT_CONFIG_ANCHOR, - BLT_CONFIG_SYNONYM, - BLT_CONFIG_CAP_STYLE, - BLT_CONFIG_JOIN_STYLE, - BLT_CONFIG_PIXELS, - BLT_CONFIG_MM, - BLT_CONFIG_WINDOW, - BLT_CONFIG_CUSTOM, - BLT_CONFIG_END, -} Blt_ConfigTypes; - -/* - * Possible values for flags argument to Tk_ConfigureWidget: - */ -#define BLT_CONFIG_OBJV_ONLY 1 - -/* - * Possible flag values for Blt_ConfigSpec structures. Any bits at or - * above BLT_CONFIG_USER_BIT may be used by clients for selecting - * certain entries. Before changing any values here, coordinate with - * tkOldConfig.c (internal-use-only flags are defined there). - */ -/* - * Values for "flags" field of Blt_ConfigSpec structures. Be sure to - * coordinate these values with those defined in tk.h - * (BLT_CONFIG_COLOR_ONLY, etc.). There must not be overlap! - * - * INIT - Non-zero means (char *) things have been - * converted to Tk_Uid's. - */ -#define INIT (1<<0) -#define BLT_CONFIG_NULL_OK (1<<1) -#define BLT_CONFIG_COLOR_ONLY (1<<2) -#define BLT_CONFIG_MONO_ONLY (1<<3) -#define BLT_CONFIG_DONT_SET_DEFAULT (1<<4) -#define BLT_CONFIG_OPTION_SPECIFIED (1<<5) -#define BLT_CONFIG_USER_BIT (1<<8) - #define BLT_STATE_NORMAL (0) #define BLT_STATE_ACTIVE (1<<0) #define BLT_STATE_DISABLED (1<<1) @@ -172,9 +50,6 @@ extern Tk_ObjCustomOption pointObjOption; extern Tk_ObjCustomOption dashesObjOption; extern Tk_ObjCustomOption listObjOption; -extern Blt_OptionParseProc ObjToBitmaskProc; -extern Blt_OptionPrintProc BitmaskToObjProc; - extern void Blt_SetDashes (Display *display, GC gc, Blt_Dashes *dashesPtr); #endif /* BLT_CONFIG_H */ |