tk.git - Tk is a free and open-source, cross-platform widget toolkit that provides a library of basic elements of GUI widgets for building a graphical user interface (GUI) in many programming languages.

Tk is a free and open-source, cross-platform widget toolkit that provides a library of basic elements of GUI widgets for building a graphical user interface (GUI) in many programming languages.

summary refs log tree commit diff stats

path: root/xlib

	Commit message (Expand)	Author	Age	Files	Lines
*	* macosx-8-4-branch merged into the mainline [tcl patch #602770] *macosx_8_4_merge_2002_08_31_trunk	das	2002-08-31	5	-764/+778

*	minor cast fixes to prevent 64bit warnings	hobbs	2001-09-21	1	-2/+2

*	made XID __int64 type for Win64	hobbs	2001-09-21	1	-0/+4

*	* generic/tkFileFilter.c (AddClause): Cast to match function prototype.	mo	2000-07-06	1	-2/+2

*	* tests/color.test:	hobbs	2000-03-02	1	-7/+10

*	* xlib/xgc.c: #def'd out XDrawSegments for the Mac, and added	hobbs	2000-02-10	1	-1/+6

*	added recognition of tiling in GC	hobbs	1999-12-14	1	-3/+190

*	* xlib/X11/Xlib.h: Remove XFillRectangle since it is now in the	redman	1999-07-31	1	-13/+0

*	modified files to work with new windows Makefiles	surles	1999-06-16	1	-13/+0

*	* generic/tkIntXlibDecls.h:	stanton	1999-06-02	1	-0/+4

*	merge with 8.1.0 branch	redman	1999-04-21	1	-1/+1

*	* Merged 8.1 branch into the main trunk	stanton	1999-04-16	5	-100/+10

*	Merge changes in 8.1 into 8.0.6, specifically we should be exporting	redman	1999-03-10	1	-11/+0

*	integrated stubs into 8.0 main branch	stanton	1999-03-10	2	-3013/+11

*	Replaced SCCS strings, fixed binary files	stanton	1998-09-14	6	-6/+6

*	Eliminated XReadBitmapFile emulation	welch	1998-08-04	1	-49/+5

*	New Windows keysymdef.h	welch	1998-07-06	1	-0/+5

*	Initial revision	rjohnson	1998-04-01	14	-0/+8915

ialog.c

@@ -8,7 +8,7 @@

* See the file "license.terms" for information on usage and redistribution

* of this file, and for a DISCLAIMER OF ALL WARRANTIES.

*

- * RCS: @(#) $Id: tkMacDialog.c,v 1.5 2000/04/17 02:16:50 jingham Exp $

+ * RCS: @(#) $Id: tkMacDialog.c,v 1.6 2000/04/23 03:47:24 jingham Exp $

*/

#include <Gestalt.h>

@@ -305,11 +305,15 @@ Tk_GetOpenFileObjCmd(

AEDesc initialDesc = {typeNull, NULL};

FSSpec dirSpec;

static char *openOptionStrings[] = {

- "-filetypes", "-initialdir", "-message", "-multiple",

+ "-defaultextension", "-filetypes",

+ "-initialdir", "-initialfile",

+ "-message", "-multiple",

"-parent", "-title", NULL

};

enum openOptions {

- OPEN_TYPES, OPEN_INITDIR, OPEN_MESSAGE, OPEN_MULTIPLE,

+ OPEN_DEFAULT, OPEN_TYPES,

+ OPEN_INITDIR, OPEN_INITFILE,

+ OPEN_MESSAGE, OPEN_MULTIPLE,

OPEN_PARENT, OPEN_TITLE

};

@@ -349,6 +353,8 @@ Tk_GetOpenFileObjCmd(

}

switch (index) {

+ case OPEN_DEFAULT:

+ break;

case OPEN_TYPES:

choice = Tcl_GetStringFromObj(objv[i + 1], NULL);

if (TkGetFileFilters(interp, &ofd.fl, choice, 0)

@@ -365,6 +371,8 @@ Tk_GetOpenFileObjCmd(

goto end;

}

break;

+ case OPEN_INITFILE:

+ break;

case OPEN_MESSAGE:

choice = Tcl_GetStringFromObj(objv[i + 1], &choiceLen);

Tcl_UtfToExternal(NULL, NULL, choice, choiceLen,

@@ -898,7 +906,17 @@ NavServicesGetFile(

openFileEventUPP, NULL, NULL);

}

- theResult = Tcl_NewListObj(0, NULL);

+

+ /*

+ * Most commands assume that the file dialogs return a single

+ * item, not a list. So only build a list if multiple is true...

+ */

+

+ if (multiple) {

+ theResult = Tcl_NewListObj(0, NULL);

+ } else {

+ theResult = Tcl_NewObj();

+ }

if ( theReply.validRecord && err == noErr ) {

AEDesc resultDesc;

@@ -921,9 +939,15 @@ NavServicesGetFile(

&length, &pathHandle);

HLock(pathHandle);

Tcl_ExternalToUtfDString(NULL, (char *) *pathHandle, -1, &fileName);

- Tcl_ListObjAppendElement(interp, theResult,

- Tcl_NewStringObj(Tcl_DStringValue(&fileName),

- Tcl_DStringLength(&fileName)));

+ if (multiple) {

+ Tcl_ListObjAppendElement(interp, theResult,

+ Tcl_NewStringObj(Tcl_DStringValue(&fileName),

+ Tcl_DStringLength(&fileName)));

+ } else {

+ Tcl_SetStringObj(theResult, Tcl_DStringValue(&fileName),

+ Tcl_DStringLength(&fileName));

+ }

+

Tcl_DStringFree(&fileName);

HUnlock(pathHandle);

DisposeHandle(pathHandle);

diff --git a/mac/tkMacMenus.c b/mac/tkMacMenus.c