suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid Xaw headers

Browse Source 
svn: r978
This commit is contained in:
Matthew Flatt 2005-10-04 20:43:54 +00:00
parent 7e050ed5c2
commit 54ea8d32a8
3 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wxxt/src/Makefile.in
View File

@ -116,8 +116,7 @@ COBJS =\
\
XWidgets/xwMenu.@LTO@\
\
XWidgets/xwMultiList.@LTO@\
XWidgets/xwScrollText.@LTO@
XWidgets/xwMultiList.@LTO@
WOBJS =\
XWidgets/xwCommon.@LTO@\
@ -334,8 +333,6 @@ XWidgets/xwMultiList.@LTO@: $(srcdir)/XWidgets/xwMultiList.c
$(CC) -c $(CFLAGS) $(_WX_C_FLAGS) -o XWidgets/xwMultiList.@LTO@ $(srcdir)/XWidgets/xwMultiList.c
XWidgets/xwRowCol.@LTO@: $(srcdir)/XWidgets/xwRowCol.c
$(CC) -c $(CFLAGS) $(_WX_C_FLAGS) -o XWidgets/xwRowCol.@LTO@ $(srcdir)/XWidgets/xwRowCol.c
XWidgets/xwScrollText.@LTO@: $(srcdir)/XWidgets/xwScrollText.c
$(CC) -c $(CFLAGS) $(_WX_C_FLAGS) -o XWidgets/xwScrollText.@LTO@ $(srcdir)/XWidgets/xwScrollText.c
XWidgets/xwScrollWin.@LTO@: $(srcdir)/XWidgets/xwScrollWin.c
$(CC) -c $(CFLAGS) $(_WX_C_FLAGS) -o XWidgets/xwScrollWin.@LTO@ $(srcdir)/XWidgets/xwScrollWin.c
XWidgets/xwScrollbar.@LTO@: $(srcdir)/XWidgets/xwScrollbar.c
@ -784,9 +781,6 @@ XWidgets/xwMenu.@LTO@:\
XWidgets/xwMultiList.@LTO@:\
$(srcdir)/XWidgets/xwMultiList.c $(srcdir)/XWidgets/xwMultiList.h $(srcdir)/XWidgets/xwMultiListP.h
XWidgets/xwScrollText.@LTO@:\
$(srcdir)/XWidgets/xwScrollText.c $(srcdir)/XWidgets/xwScrollText.h $(srcdir)/XWidgets/xwScrollTextP.h
XWidgets/xwCommon.@LTO@: $(xwCommon_w_dep) $(srcdir)/XWidgets/wxAllocColor.c
XWidgets/xwFrame.@LTO@: $(xwFrame_w_dep)
@ -881,7 +875,6 @@ XWidgets/xwScrollWin.@LTO@: $(xwScrollWin_w_dep)
@INCLUDEDEP@ XWidgets/xwscroll.d
@INCLUDEDEP@ XWidgets/xwMenu.d
@INCLUDEDEP@ XWidgets/xwMultiList.d
@INCLUDEDEP@ XWidgets/xwScrollText.d
@INCLUDEDEP@ XWidgets/xwCommon.d
@INCLUDEDEP@ XWidgets/xwFrame.d
@INCLUDEDEP@ XWidgets/xwBoard.d

10
src/wxxt/src/XWidgets/xwMultiList.c
View File

@ -79,7 +79,7 @@ Pixmap XmuCreateStippledPixmap();
extern void XawInitializeWidgetSet();
extern int wxGetMultiClickTime(Display*);
#define SUPERCLASS &(simpleClassRec)
#define SUPERCLASS &(coreClassRec)
#ifdef WX_USE_XFT
# define FontAscent(f, xf) (xf ? (xf)->ascent : (f)->max_bounds.ascent)
@ -106,7 +106,6 @@ extern int wxGetMultiClickTime(Display*);
#define StrCopyRetLength(s,lp) strcpy(TypeAlloc(char,(*lp=(strlen(s)+1))),s)
#define CoreFieldOffset(f) XtOffset(Widget,core.f)
#define SimpleFieldOffset(f) XtOffset(XfwfMultiListWidget,simple.f)
#define MultiListFieldOffset(f) XtOffset(XfwfMultiListWidget,multiList.f)
/*===========================================================================*
@ -200,8 +199,6 @@ static XtResource resources[] =
{XtNbackground, XtCBackground, XtRPixel, sizeof(Pixel),
CoreFieldOffset(background_pixel),XtRString,"XtDefaultBackground"},
{XtNcursor, XtCCursor, XtRCursor, sizeof(Cursor),
SimpleFieldOffset(cursor), XtRString, "left_ptr"},
{XtNhighlightForeground, XtCHForeground, XtRPixel, sizeof(Pixel),
MultiListFieldOffset(highlight_fg), XtRString, "XtDefaultBackground"},
{XtNhighlightBackground, XtCHBackground, XtRPixel, sizeof(Pixel),
@ -328,10 +325,7 @@ XfwfMultiListClassRec xfwfMultiListClassRec =
PreferredGeometry,
/* display_accelerator */ XtInheritDisplayAccelerator,
/* extension */ NULL
}, /* Core Part */
{
/* change_sensitive */ XtInheritChangeSensitive
}
} /* Core Part */
};
WidgetClass xfwfMultiListWidgetClass = (WidgetClass)&xfwfMultiListClassRec;

5
src/wxxt/src/XWidgets/xwMultiListP.h
View File

@ -54,7 +54,7 @@
#ifndef _MULTILISTP_H_
#define _MULTILISTP_H_
#include <X11/Xaw/SimpleP.h>
#include <X11/CoreP.h>
#include <xwMultiList.h>
/*---------------------------------------------------------------------------*
@ -84,7 +84,6 @@ typedef struct
typedef struct _XfwfMultiListClassRec
{
CoreClassPart core_class;
SimpleClassPart simple_class;
XfwfMultiListClassPart multiList_class;
} XfwfMultiListClassRec;
@ -139,7 +138,6 @@ typedef struct
typedef struct _XfwfMultiListRec
{
CorePart core;
SimplePart simple;
XfwfMultiListPart multiList;
} XfwfMultiListRec;
@ -154,7 +152,6 @@ typedef struct _XfwfMultiListRec
#define MultiListItemString(i) ((i)->string)
#define InstanceCore(w) (&((w)->core))
#define InstanceSimple(w) (&((w)->simple))
#define InstanceMultiList(w) (&((w)->multiList))
#define MultiListWidth(w) (InstanceCore(w)->width)