2004-06-11  Joe English  <jenglish@users.sourceforge.net>
	* generic/tkTheme.h, generic/tkstate.c, generic/tile.c,
	demos/demo.tcl, tests/tile.test: Added 'readonly' state

2004-06-10  Joe English  <jenglish@users.sourceforge.net>
	* tkTheme.c, tkElements.c: TTK_GetTheme(interp, NULL) no longer 
	returns default theme.  Use TTK_GetDefaultTheme() instead.
	* tkTheme.c: Factored BuildResourceMap() out of NewElementInstance()
	* tkTheme.c(BuildResourceMap): Ignore accidental mismatches caused 
	by prefix-matching in TkGetOptionSpec (e.g. "-textvariable" matching
	"-text").

#
# $Id: demo.tcl,v 1.62 2004/05/30 03:06:13 jenglish Exp $
#
# Demo for 'tile' package.
#

variable demodir [file dirname [info script]]
lappend auto_path . $demodir
package require tile

# Widget state demo:
#

variable Widget .tbar_styled.tb1

bind all <Control-Shift-ButtonPress-1> { set ::Widget %W ; UpdateStates; break }
variable states [list \
    active disabled focus pressed selected readonly \
    background indeterminate invalid default]

proc trackStates {} {
    variable states
    set t .states
    destroy $t; toplevel $t ; wm title $t "Widget states"

/* $Id: tile.c,v 1.44 2004/04/23 21:10:14 jenglish Exp $
 * Copyright (c) 2003, Joe English
 *
 * Tile package: initialization routine and miscellaneous utilities.
 */

#include <tk.h>
#include "tkTheme.h"

    *resultPtr = TTK_ORIENT_HORIZONTAL;
    return Tcl_GetIndexFromObj(interp, objPtr,
	    TTKOrientStrings, "orientation", 0, resultPtr);
}

/*
 * Recognized values for the -state compatibility option.

 * Other options are accepted and interpreted as synonyms for "normal".
 */
static const char *TTKStateStrings[] = {
    "normal", "readonly", "disabled", "active", NULL
};
enum { 
    TTK_COMPAT_STATE_NORMAL,
    TTK_COMPAT_STATE_READONLY,
    TTK_COMPAT_STATE_DISABLED,
    TTK_COMPAT_STATE_ACTIVE
};

/* CheckStateOption -- 
 * 	Handle -state compatibility option.
 *
 *	NOTE: setting -state disabled / -state enabled affects the 
 *	widget state, but the internal widget state does *not* affect 
 *	the value of the -state option.
 *	This option is present for compatibility only.
 */
void CheckStateOption(WidgetCore *corePtr, Tcl_Obj *objPtr)
{
    int stateOption = TTK_COMPAT_STATE_NORMAL;
    unsigned all = TTK_STATE_DISABLED|TTK_STATE_READONLY|TTK_STATE_ACTIVE;
#   define SETFLAGS(f) WidgetChangeState(corePtr, f, all^f)

    (void)Tcl_GetIndexFromObj(NULL,objPtr,TTKStateStrings,"",0,&stateOption);
    switch (stateOption) {
	case TTK_COMPAT_STATE_NORMAL:
	default:
	    SETFLAGS(0);
	    break;
	case TTK_COMPAT_STATE_READONLY:
	    SETFLAGS(TTK_STATE_READONLY);
	    break;
	case TTK_COMPAT_STATE_DISABLED:
	    SETFLAGS(TTK_STATE_DISABLED);
	    break;
	case TTK_COMPAT_STATE_ACTIVE:
	    SETFLAGS(TTK_STATE_ACTIVE);
	    break;
    }

/*
 * tkTheme.h --
 *      Declarations for Tk style engine.
 *
 * Copyright (c) 2003 Joe English.  Freely redistributable.
 *
 * $Id: tkTheme.h,v 1.64 2004/06/08 03:35:47 jenglish Exp $
 */

#ifndef TKTHEME_H
#define TKTHEME_H 1

#define TILE_VERSION_MAJOR "0"
#define TILE_VERSION_MINOR "4"

#define TTK_STATE_FOCUS		(1<<2)
#define TTK_STATE_PRESSED	(1<<3)
#define TTK_STATE_SELECTED	(1<<4)
#define TTK_STATE_BACKGROUND	(1<<5)
#define TTK_STATE_INDETERMINATE	(1<<6)
#define TTK_STATE_INVALID	(1<<7)
#define TTK_STATE_DEFAULT	(1<<8)
#define TTK_STATE_READONLY	(1<<9)
#define TTK_STATE_USER6		(1<<10)
#define TTK_STATE_USER5		(1<<11)
#define TTK_STATE_USER4		(1<<12)
#define TTK_STATE_USER3		(1<<13)
#define TTK_STATE_USER2		(1<<14)
#define TTK_STATE_USER1		(1<<15)

/*
 * $Id: tkstate.c,v 1.5 2004/03/28 16:56:21 jenglish Exp $
 *
 * Tk widget state utilities.
 *
 * Copyright (c) 2003 Joe English.  Freely redistributable.
 *
 */

    "focus",		/* Widget has keyboard focus */
    "pressed",		/* Pressed or "armed" */
    "selected",		/* "on", "true", "current", etc. */
    "background",	/* Top-level window lost focus (Mac,Win "inactive") */
    "indeterminate",	/* "tri-state" or "mixed" for check/radiobuttons */
    "invalid",		/* Bad value */
    "default",		/* Default buttons */
    "readonly",		/* Editing/modification disabled */
    NULL
};

/*------------------------------------------------------------------------
 * +++ WidgetStateSpec object type:
 *
 * The string representation consists of a list of state names,

} -result 1

test tile-11.3 "-state test, reenable" -body {
    .b configure -state normal
    .b instate disabled
} -result 0

test tile-11.4 "-state test, unrecognized -state value" -body {
    .b configure -state bogus
    .b state
} -result [list]

test tile-11.5 "-state test, 'active'" -body {
    .b configure -state active
    .b state
} -result [list active] -cleanup  { .b state !active }

test tile-11.6 "-state test, 'readonly'" -body {
    .b configure -state readonly
    .b state
} -result [list readonly] -cleanup { .b state !readonly }

test tile-11.7 "-state test, cleanup" -body {
    destroy .b
}

test tile-12.1 "-cursor option" -body {
    tbutton .b
    .b cget -cursor
} -result {}