Modularize inheritance macros.

This commit is contained in:
ramiro%netscape.com 1998-09-30 11:58:37 +00:00
Родитель e2c1946553
Коммит 3d39755bf4
11 изменённых файлов: 129 добавлений и 245 удалений

Просмотреть файл

@ -39,43 +39,43 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmNbutton3DownCallback "button3DownCallback"
#define XmNbutton3UpCallback "button3UpCallback"
#define XmNarmBackground "armBackground"
#define XmNarmForeground "armForeground"
#define XmNarmOffset "armOffset"
#define XmNarmed "armed"
#define XmNarmedPixmap "armedPixmap"
#define XmNarmedPixmapMask "armedPixmapMask"
#define XmNbuttonLayout "buttonLayout"
#define XmNbuttonTrigger "buttonTrigger"
#define XmNdeterminate "determinate"
#define XmNemulateMotif "emulateMotif"
#define XmNfillOnEnter "fillOnEnter"
#define XmNinsensitivePixmap "insensitivePixmap"
#define XmNinsensitivePixmapMask "insensitivePixmapMask"
#define XmNpixmapMask "pixmapMask"
#define XmNraiseBackground "raiseBackground"
#define XmNraiseBorderThickness "raiseBorderThickness"
#define XmNraiseForeground "raiseForeground"
#define XmNraiseOffset "raiseOffset"
#define XmNraiseOnEnter "raiseOnEnter"
#define XmNraised "raised"
#define XmNraisedPixmap "raisedPixmap"
#define XmNraisedPixmapMask "raisedPixmapMask"
#define XmNtransparentCursor "transparentCursor"
#define XmNraiseBackground "raiseBackground"
#define XmNraiseBorderThickness "raiseBorderThickness"
#define XmNarmBackground "armBackground"
#define XmNarmOffset "armOffset"
#define XmNarmed "armed"
#define XmNemulateMotif "emulateMotif"
#define XmNarmedPixmap "armedPixmap"
#define XmNarmedPixmapMask "armedPixmapMask"
#define XmNbuttonLayout "buttonLayout"
#define XmNpixmapMask "pixmapMask"
#define XmNbuttonTrigger "buttonTrigger"
#define XmNraiseForeground "raiseForeground"
#define XmNinsensitivePixmap "insensitivePixmap"
#define XmNfillOnEnter "fillOnEnter"
#define XmNraiseOffset "raiseOffset"
#define XmNraiseOnEnter "raiseOnEnter"
#define XmNraised "raised"
#define XmNraisedPixmap "raisedPixmap"
#define XmNraisedPixmapMask "raisedPixmapMask"
#define XmCArmBackground "ArmBackground"
#define XmCArmForeground "ArmForeground"
#define XmCArmOffset "ArmOffset"
#define XmCArmed "Armed"
#define XmCArmedPixmap "ArmedPixmap"
#define XmCArmedPixmapMask "ArmedPixmapMask"
#define XmCButtonLayout "ButtonLayout"
#define XmCButtonTrigger "ButtonTrigger"
#define XmCFillOnEnter "FillOnEnter"
#define XmCDeterminate "Determinate"
#define XmCDragButton "DragButton"
#define XmCEmulateMotif "EmulateMotif"
#define XmCFillOnEnter "FillOnEnter"
#define XmCInsensitivePixmap "InsensitivePixmap"
#define XmCArmed "Armed"
#define XmCButtonLayout "ButtonLayout"
#define XmCInsensitivePixmapMask "InsensitivePixmapMask"
#define XmCPixmapMask "PixmapMask"
#define XmCRaiseBackground "RaiseBackground"
@ -84,11 +84,11 @@ XFE_BEGIN_CPLUSPLUS_PROTECTION
#define XmCRaisedPixmapMask "RaisedPixmapMask"
#define XmCUnderlineThickness "UnderlineThickness"
#define XmRButtonLayout "ButtonLayout"
#define XmRButtonTrigger "ButtonTrigger"
#define XmCRaiseBorderThickness "RaiseBorderThickness"
#define XmCRaiseOnEnter "RaiseOnEnter"
#define XmCRaised "Raised"
#define XmCRaiseBorderThickness "RaiseBorderThickness"
#define XmCRaiseOnEnter "RaiseOnEnter"
#define XmCRaised "Raised"
#define XmRButtonLayout "ButtonLayout"
#define XmRButtonTrigger "ButtonTrigger"
/*----------------------------------------------------------------------*/
/* */

Просмотреть файл

@ -31,6 +31,17 @@
#include <Xfe/LabelP.h>
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeButton method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritLayoutPixmap ((XtWidgetProc) _XtInherit)
#define XfeInheritDrawPixmap ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawRaiseBorder ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawUnderline ((XfeExposeProc) _XtInherit)
#define XfeInheritArmTimeout ((XtTimerCallbackProc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */
@ -96,7 +107,7 @@ typedef struct _XfeButtonPart
Boolean fill_on_arm; /* Fill on arm ? */
/* Raise resources */
Boolean fill_on_enter; /* Fill on raise ? */
Boolean fill_on_enter; /* Fill on enter ? */
Pixel raise_foreground; /* Raise foreground */
Pixel raise_background; /* Raise background */
Dimension raise_border_thickness; /* Raise border thickness*/

Просмотреть файл

@ -32,6 +32,17 @@
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeDynamicManager method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritAcceptDynamicChild ((XfeChildFunc) _XtInherit)
#define XfeInheritDeleteDynamicChild ((XfeChildFunc) _XtInherit)
#define XfeInheritInsertDynamicChild ((XfeChildFunc) _XtInherit)
#define XfeInheritLayoutDynamicChildren ((XtWidgetProc) _XtInherit)
#define XfeInheritGetChildDimensions ((XfeGeometryProc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */
/* XfeDynamicManagerClassPart */

Просмотреть файл

@ -31,7 +31,18 @@
#include <Xfe/PrimitiveP.h>
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeLabel method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritLayoutString ((XtWidgetProc) _XtInherit)
#define XfeInheritDrawString ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawSelection ((XfeExposeProc) _XtInherit)
#define XfeInheritGetLabelGC ((XfeGetGCFunc) _XtInherit)
#define XfeInheritGetSelectionGC ((XfeGetGCFunc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */
/* XfeLabelClassPart */

Просмотреть файл

@ -36,6 +36,19 @@
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeManager method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritUpdateChildrenInfo ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutWidget ((XtWidgetProc) _XtInherit)
#define XfeInheritAcceptStaticChild ((XfeChildFunc) _XtInherit)
#define XfeInheritInsertStaticChild ((XfeChildFunc) _XtInherit)
#define XfeInheritDeleteStaticChild ((XfeChildFunc) _XtInherit)
#define XfeInheritLayoutStaticChildren ((XtWidgetProc) _XtInherit)
#define XfeInheritChangeManaged ((XtWidgetProc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */
/* XfeManagerClassPart */

Просмотреть файл

@ -31,7 +31,25 @@
#include <Xfe/DynamicManagerP.h>
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeOriented method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritEnter ((XfeOrientedProc) _XtInherit)
#define XfeInheritLeave ((XfeOrientedProc) _XtInherit)
#define XfeInheritMotion ((XfeOrientedProc) _XtInherit)
#define XfeInheritDragStart ((XfeOrientedProc) _XtInherit)
#define XfeInheritDragEnd ((XfeOrientedProc) _XtInherit)
#define XfeInheritDragMotion ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantEnter ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantLeave ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantMotion ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantDragStart ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantDragEnd ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantDragMotion ((XfeOrientedProc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */
/* XfeOrientedClassPart */

Просмотреть файл

@ -34,6 +34,19 @@
#include <Xm/DrawP.h>
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfePrimitive method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritBitGravity ((XfeBitGravityType) _XtInherit)
#define XfeInheritPreferredGeometry ((XfeGeometryProc) _XtInherit)
#define XfeInheritUpdateBoundary ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutComponents ((XtWidgetProc) _XtInherit)
#define XfeInheritDrawBackground ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawShadow ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawComponents ((XfeExposeProc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */

Просмотреть файл

@ -1,158 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* The contents of this file are subject to the Netscape Public License
* Version 1.0 (the "NPL"); you may not use this file except in
* compliance with the NPL. You may obtain a copy of the NPL at
* http://www.mozilla.org/NPL/
*
* Software distributed under the NPL is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
* for the specific language governing rights and limitations under the
* NPL.
*
* The Initial Developer of this code under the NPL is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
* Reserved.
*/
/*----------------------------------------------------------------------*/
/* */
/* Name: <Xfe/TempTwoP.h> */
/* Description: XfeTempTwo widget private header file. */
/* Author: Ramiro Estrugo <ramiro@netscape.com> */
/* */
/*----------------------------------------------------------------------*/
#ifndef _XfeTempTwoP_h_ /* start TempTwoP.h */
#define _XfeTempTwoP_h_
#include <Xfe/TempTwo.h>
#include <Xfe/DynamicManagerP.h>
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoClassPart */
/* */
/*----------------------------------------------------------------------*/
typedef struct
{
XtWidgetProc layout_string; /* layout_label */
XfeExposeProc draw_string; /* draw_string */
XtPointer extension; /* extension */
} XfeTempTwoClassPart;
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoClassRec */
/* */
/*----------------------------------------------------------------------*/
typedef struct _XfeTempTwoClassRec
{
CoreClassPart core_class;
CompositeClassPart composite_class;
ConstraintClassPart constraint_class;
XmManagerClassPart manager_class;
XfeManagerClassPart xfe_manager_class;
XfeDynamicManagerClassPart xfe_dynamic_manager_class;
XfeTempTwoClassPart xfe_temp_two_class;
} XfeTempTwoClassRec;
externalref XfeTempTwoClassRec xfeTempTwoClassRec;
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoPart */
/* */
/*----------------------------------------------------------------------*/
typedef struct _XfeTempTwoPart
{
/* Cursor resources */
Cursor vertical_cursor; /* Vertical cursor */
Cursor horizontal_cursor; /* Horizontal cursor */
/* Color resources */
Pixel sash_color; /* Sash color */
/* Resource Data Members */
Dimension spacing; /* Spacing */
int separator_thickness; /* Separator thickness */
unsigned char separator_type; /* Separator type */
unsigned char orientation; /* Orientation */
unsigned char button_layout; /* Button layout */
Dimension raise_border_thickness; /* Raise border thickness*/
Boolean raised; /* Raised ? */
/* Private data -- Dont even look past this comment -- */
GC temp_GC; /* Temp GC */
XRectangle temp_rect; /* Temp rect */
} XfeTempTwoPart;
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoRec */
/* */
/*----------------------------------------------------------------------*/
typedef struct _XfeTempTwoRec
{
CorePart core;
CompositePart composite;
ConstraintPart constraint;
XmManagerPart manager;
XfeManagerPart xfe_manager;
XfeDynamicManagerPart xfe_dynamic_manager;
XfeTempTwoPart xfe_temp_two;
} XfeTempTwoRec;
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoConstraintPart */
/* */
/*----------------------------------------------------------------------*/
typedef struct _XfeTempTwoConstraintPart
{
Dimension min_width;
Dimension min_height;
Dimension max_width;
Dimension max_height;
} XfeTempTwoConstraintPart;
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoConstraintRec */
/* */
/*----------------------------------------------------------------------*/
typedef struct _XfeTempTwoConstraintRec
{
XmManagerConstraintPart manager;
XfeManagerConstraintPart xfe_manager;
XfeDynamicManagerConstraintPart xfe_dynamic_manager;
XfeTempTwoConstraintPart xfe_temp_two;
} XfeTempTwoConstraintRec;
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoPart Access Macro */
/* */
/*----------------------------------------------------------------------*/
#define _XfeTempTwoPart(w) &(((XfeTempTwoWidget) w) -> xfe_temp_two)
/*----------------------------------------------------------------------*/
/* */
/* XfeTempTwoPart child constraint part access macro */
/* */
/*----------------------------------------------------------------------*/
#define _XfeTempTwoConstraintPart(w) \
(&(((XfeTempTwoConstraintRec *) _XfeConstraints(w)) -> xfe_temp_two))
XFE_END_CPLUSPLUS_PROTECTION
#endif /* end TempTwoP.h */

Просмотреть файл

@ -103,62 +103,6 @@ typedef void (*XfeBitGravityType)(void);
typedef int XfeBitGravityType;
#endif
/*----------------------------------------------------------------------*/
/* */
/* Widget method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritAcceptDynamicChild ((XfeChildFunc) _XtInherit)
#define XfeInheritAcceptStaticChild ((XfeChildFunc) _XtInherit)
#define XfeInheritArmTimeout ((XtTimerCallbackProc) _XtInherit)
#define XfeInheritBitGravity ((XfeBitGravityType) _XtInherit)
#define XfeInheritChangeManaged ((XtWidgetProc) _XtInherit)
#define XfeInheritClickTimeout ((XtTimerCallbackProc) _XtInherit)
#define XfeInheritDeleteDynamicChild ((XfeChildFunc) _XtInherit)
#define XfeInheritDeleteStaticChild ((XfeChildFunc) _XtInherit)
#define XfeInheritDescendantDragEnd ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantDragMotion ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantDragStart ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantEnter ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantLeave ((XfeOrientedProc) _XtInherit)
#define XfeInheritDescendantMotion ((XfeOrientedProc) _XtInherit)
#define XfeInheritDragEnd ((XfeOrientedProc) _XtInherit)
#define XfeInheritDragMotion ((XfeOrientedProc) _XtInherit)
#define XfeInheritDragStart ((XfeOrientedProc) _XtInherit)
#define XfeInheritDrawBackground ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawComponents ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawHighlight ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawPixmap ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawRaiseBorder ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawSelection ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawShadow ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawString ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawTitleShadow ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawUnderline ((XfeExposeProc) _XtInherit)
#define XfeInheritEnter ((XfeOrientedProc) _XtInherit)
#define XfeInheritGetBackgroundGC ((XfeGetGCFunc) _XtInherit)
#define XfeInheritGetChildDimensions ((XfeGeometryProc) _XtInherit)
#define XfeInheritGetLabelGC ((XfeGetGCFunc) _XtInherit)
#define XfeInheritGetPixmapGC ((XfeGetGCFunc) _XtInherit)
#define XfeInheritGetSelectionGC ((XfeGetGCFunc) _XtInherit)
#define XfeInheritInsertDynamicChild ((XfeChildFunc) _XtInherit)
#define XfeInheritInsertStaticChild ((XfeChildFunc) _XtInherit)
#define XfeInheritLayoutArrow ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutComponents ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutDynamicChildren ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutIndicator ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutPixmap ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutStaticChildren ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutString ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutTitle ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutWidget ((XtWidgetProc) _XtInherit)
#define XfeInheritLeave ((XfeOrientedProc) _XtInherit)
#define XfeInheritMotion ((XfeOrientedProc) _XtInherit)
#define XfeInheritPreferredGeometry ((XfeGeometryProc) _XtInherit)
#define XfeInheritToggleSelection ((XtWidgetProc) _XtInherit)
#define XfeInheritUpdateBoundary ((XtWidgetProc) _XtInherit)
#define XfeInheritUpdateChildrenInfo ((XtWidgetProc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */
/* Method inheritance resolution macro */

Просмотреть файл

@ -31,6 +31,16 @@
#include <Xfe/ManagerP.h>
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeComboBox method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritLayoutTitle ((XtWidgetProc) _XtInherit)
#define XfeInheritLayoutArrow ((XtWidgetProc) _XtInherit)
#define XfeInheritDrawHighlight ((XfeExposeProc) _XtInherit)
#define XfeInheritDrawTitleShadow ((XfeExposeProc) _XtInherit)
/*----------------------------------------------------------------------*/
/* */

Просмотреть файл

@ -31,7 +31,18 @@
#include <Xfe/OrientedP.h>
XFE_BEGIN_CPLUSPLUS_PROTECTION
/*----------------------------------------------------------------------*/
/* */
/* XfeToolBar method inheritance macros */
/* */
/*----------------------------------------------------------------------*/
#define XfeInheritLayoutIndicator ((XtWidgetProc) _XtInherit)
#ifndef XfeInheritDrawRaiseBorder
#define XfeInheritDrawRaiseBorder ((XfeExposeProc) _XtInherit)
#endif
/*----------------------------------------------------------------------*/
/* */
/* XfeToolBarClassPart */