Modifiche AGA alla versione 4.0e
git-svn-id: svn://10.65.10.50/trunk@5767 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex
parent
bc00988010
commit
053fc81929
@ -64,7 +64,7 @@ TKLDLIBS = -L$(XVTLIBP) -l$(LIBUI) -l$(LIBHLP) -l$(LIBTK) -lMrm -lXm -lXt -lX11
|
||||
# Imakefile for 'xpoxm' archive.
|
||||
#
|
||||
# $RCSfile: makefile.sgi,v $
|
||||
# $Revision: 1.2 $ $Date: 1997-12-17 10:49:40 $
|
||||
# $Revision: 1.3 $ $Date: 1997-12-18 12:11:04 $
|
||||
#
|
||||
|
||||
# Relative paths to build area root directory, source and objects files.
|
||||
@ -76,7 +76,7 @@ OBJP = ./sgi
|
||||
# Macros for compiling C source.
|
||||
|
||||
IDIRS = -I$(XPOIDIR) -I$(XVTIDIR)
|
||||
CFLAGS = -c -g -O -Wf,-XNd8400,-XNp12000 $(IDIRS)
|
||||
CFLAGS = -c -g -O -DXI_USE_XVT -DXI_R4_API -Wf,-XNd8400,-XNp12000 $(IDIRS)
|
||||
|
||||
# Library root names.
|
||||
|
||||
@ -92,7 +92,7 @@ ERRSCAN = $(XVTDIR)/errscan -h $(ROOTP)/include/xvt_perr.h -o $(ROOTP)/doc/ERRC
|
||||
|
||||
default: libtarget
|
||||
|
||||
# Spreadsheat (gasp!) Custom Control
|
||||
# XI
|
||||
|
||||
XISRC = \
|
||||
$(SRCP)/xi.c \
|
||||
@ -101,10 +101,15 @@ XISRC = \
|
||||
$(SRCP)/xidbg.c \
|
||||
$(SRCP)/xiheap.c \
|
||||
$(SRCP)/xilm.c \
|
||||
$(SRCP)/xilm2.c \
|
||||
$(SRCP)/xilm2.c \
|
||||
$(SRCP)/xilm3.c \
|
||||
$(SRCP)/xistx.c \
|
||||
$(SRCP)/xitext.c \
|
||||
$(SRCP)/xitree.c \
|
||||
$(SRCP)/xierr.c \
|
||||
$(SRCP)/xilmst.c \
|
||||
$(SRCP)/xiport.c \
|
||||
$(SRCP)/xibitmap.c \
|
||||
$(SRCP)/xiutils.c
|
||||
|
||||
XIOBJ = \
|
||||
@ -115,9 +120,14 @@ XIOBJ = \
|
||||
$(OBJP)/xiheap.o \
|
||||
$(OBJP)/xilm.o \
|
||||
$(OBJP)/xilm2.o \
|
||||
$(OBJP)/xilm3.o \
|
||||
$(OBJP)/xistx.o \
|
||||
$(OBJP)/xitext.o \
|
||||
$(OBJP)/xitree.o \
|
||||
$(OBJP)/xierr.o \
|
||||
$(OBJP)/xilmst.o \
|
||||
$(OBJP)/xiport.o \
|
||||
$(OBJP)/xibitmap.o \
|
||||
$(OBJP)/xiutils.o
|
||||
|
||||
$(OBJP)/xi.o: $(SRCP)/xi.c
|
||||
@ -141,6 +151,9 @@ $(OBJP)/xilm.o: $(SRCP)/xilm.c
|
||||
$(OBJP)/xilm2.o: $(SRCP)/xilm2.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xilm2.o $(SRCP)/xilm2.c
|
||||
|
||||
$(OBJP)/xilm3.o: $(SRCP)/xilm3.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xilm3.o $(SRCP)/xilm3.c
|
||||
|
||||
$(OBJP)/xistx.o: $(SRCP)/xistx.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xistx.o $(SRCP)/xistx.c
|
||||
|
||||
@ -150,6 +163,18 @@ $(OBJP)/xitext.o: $(SRCP)/xitext.c
|
||||
$(OBJP)/xitree.o: $(SRCP)/xitree.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xitree.o $(SRCP)/xitree.c
|
||||
|
||||
$(OBJP)/xierr.o: $(SRCP)/xierr.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xierr.o $(SRCP)/xierr.c
|
||||
|
||||
$(OBJP)/xilmst.o: $(SRCP)/xilmst.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xilmst.o $(SRCP)/xilmst.c
|
||||
|
||||
$(OBJP)/xiport.o: $(SRCP)/xiport.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xiport.o $(SRCP)/xiport.c
|
||||
|
||||
$(OBJP)/xibitmap.o: $(SRCP)/xibitmap.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xibitmap.o $(SRCP)/xibitmap.c
|
||||
|
||||
$(OBJP)/xiutils.o: $(SRCP)/xiutils.c
|
||||
$(CC) $(CFLAGS) -o $(OBJP)/xiutils.o $(SRCP)/xiutils.c
|
||||
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
/*******************************************************************************
|
||||
* Copyright 1991-1995 by ORCA Software, Inc. *
|
||||
* *
|
||||
* All rights reserved. May not be reproduced or distributed, in printed or *
|
||||
* electronic form, without permission of ORCA Software, Inc. *
|
||||
*******************************************************************************/
|
||||
|
||||
#ifdef WSWIN
|
||||
#define NOCOMM
|
||||
#define NOMINMAX
|
||||
#define NOGDICAPMASKS
|
||||
#define NOVIRTUALKEYCODES
|
||||
#define NOWINMESSAGES
|
||||
#define NOWINSTYLES
|
||||
#define NOSYSMETRICS
|
||||
#define NOMENUS
|
||||
#define NOICONS
|
||||
#define NOKEYSTATES
|
||||
#define NOSYSCOMMANDS
|
||||
#define NORASTEROPS
|
||||
#define NOSHOWWINDOW
|
||||
#define OEMRESOURCE
|
||||
#define NOATOM
|
||||
#define NOCLIPBOARD
|
||||
#define NOCOLOR
|
||||
#define NOCTLMGR
|
||||
#define NODRAWTEXT
|
||||
#define NOGDI
|
||||
#define NOKERNEL
|
||||
/* #define NOUSER */
|
||||
#define NOMB
|
||||
#define NOMEMMGR
|
||||
#define NOMETAFILE
|
||||
#define NOMINMAX
|
||||
#define NOMSG
|
||||
#define NOOPENFILE
|
||||
#define NOSCROLL
|
||||
#define NOSOUND
|
||||
#define NOTEXTMETRIC
|
||||
#define NOWH
|
||||
#define NOWINOFFSETS
|
||||
#define NOCOMM
|
||||
#define NOKANJI
|
||||
#define NOHELP
|
||||
#define NOPROFILER
|
||||
#define NODEFERWINDOWPOS
|
||||
#include <windows.h>
|
||||
#define INTERNAL
|
||||
#endif
|
||||
|
||||
#ifdef OSOS2
|
||||
#define INCL_DOS
|
||||
#define INCL_WIN
|
||||
#define INCL_GPI
|
||||
#define COLOR pm_COLOR
|
||||
#define UINT pm_UINT
|
||||
#define ULONG pm_ULONG
|
||||
#include <os2.h>
|
||||
#undef COLOR
|
||||
#undef UINT
|
||||
#undef ULONG
|
||||
#define INTERNAL
|
||||
#endif
|
||||
|
||||
|
||||
15
xi/xilm3.c
15
xi/xilm3.c
@ -174,6 +174,9 @@ lm_draw_3d_rect( LM_DATA * lmp, XinRect * rctp, BOOLEAN well, int depth, BOOLEAN
|
||||
XinRect r;
|
||||
BOOLEAN left,
|
||||
right;
|
||||
const XinColor color_light = aga_get_pref(AGA_PREF_BTN_COLOR_LIGHT);
|
||||
const XinColor color_ctrl = aga_get_pref(AGA_PREF_BTN_COLOR_CTRL);
|
||||
const XinColor color_dark = aga_get_pref(AGA_PREF_BTN_COLOR_DARK);
|
||||
|
||||
r = *rctp;
|
||||
|
||||
@ -190,7 +193,7 @@ lm_draw_3d_rect( LM_DATA * lmp, XinRect * rctp, BOOLEAN well, int depth, BOOLEAN
|
||||
right = lm_adj_h( lmp, &r.right );
|
||||
if ( !left && !right )
|
||||
return;
|
||||
xi_draw_3d_rect( lmp->win, &r, well, depth, 0L, 0L, 0L );
|
||||
xi_draw_3d_rect( lmp->win, &r, well, depth, color_light, color_ctrl, color_dark);
|
||||
}
|
||||
|
||||
/*********** draw column headings ***********/
|
||||
@ -289,7 +292,7 @@ draw_column_headings( LM_DATA * lmp, XinRect * actual_rct )
|
||||
back_color = lmp->disabled_back_color;
|
||||
}
|
||||
if ( col_data->heading_well || col_data->heading_platform )
|
||||
back_color = xi_get_pref( XI_PREF_COLOR_CTRL );
|
||||
back_color = aga_get_pref(AGA_PREF_BTN_COLOR_CTRL);
|
||||
XinWindowColorTextForeSet( win, fore_color );
|
||||
XinWindowColorTextBackSet( win, back_color );
|
||||
}
|
||||
@ -360,7 +363,7 @@ draw_column_headings( LM_DATA * lmp, XinRect * actual_rct )
|
||||
back_color = lmp->disabled_back_color;
|
||||
}
|
||||
if ( col_data->heading_well || col_data->heading_platform )
|
||||
back_color = xi_get_pref( XI_PREF_COLOR_CTRL );
|
||||
back_color = aga_get_pref(AGA_PREF_BTN_COLOR_CTRL);
|
||||
{
|
||||
XinRect temp_rct = cell_rct;
|
||||
|
||||
@ -1061,7 +1064,7 @@ redraw_cell_button( LM_DATA * lmp, int row, int col, XinRect * clip_rct,
|
||||
r.right = min( r.right, col_rct.right );
|
||||
XinWindowDrawToolsGet( lmp->win, &ct );
|
||||
ct.text_fore_color = lmp->enabled_color;
|
||||
ct.text_back_color = xi_get_pref( XI_PREF_COLOR_CTRL );
|
||||
ct.text_back_color = aga_get_pref( AGA_PREF_BTN_COLOR_CTRL );
|
||||
ct.opaque_text = FALSE;
|
||||
if ( lmp->row_colors[row] )
|
||||
ct.text_fore_color = lmp->row_colors[row];
|
||||
@ -1073,12 +1076,12 @@ redraw_cell_button( LM_DATA * lmp, int row, int col, XinRect * clip_rct,
|
||||
lm_draw_icon( lmp, r.left + cell_btn_icon_x, r.top + cell_btn_icon_y + down,
|
||||
button_icon_rid ? button_icon_rid : ( int ) xi_get_pref( XI_PREF_COMBO_ICON ),
|
||||
cell_data->button_bitmap, clip_rct, &r, TRUE, XI_COLOR_BLACK,
|
||||
xi_get_pref( XI_PREF_COLOR_CTRL ) );
|
||||
aga_get_pref( AGA_PREF_BTN_COLOR_CTRL ) );
|
||||
}
|
||||
else if ( button_full_cell && ( cell_data->icon_rid || cell_data->bitmap != NULL ) )
|
||||
{
|
||||
lm_draw_icon( lmp, r.left, r.top, cell_data->icon_rid, cell_data->bitmap,
|
||||
clip_rct, &r, TRUE, XI_COLOR_BLACK, xi_get_pref( XI_PREF_COLOR_CTRL ) );
|
||||
clip_rct, &r, TRUE, XI_COLOR_BLACK, aga_get_pref( AGA_PREF_BTN_COLOR_CTRL ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
2114
xi/xistx.c
2114
xi/xistx.c
File diff suppressed because it is too large
Load Diff
4511
xi/xitext.c
4511
xi/xitext.c
File diff suppressed because it is too large
Load Diff
5960
xi/xiutils.c
5960
xi/xiutils.c
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user