Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: E.h Makefile.am aclass.h backgrounds.h borders.h buttons.c buttons.h desktops.c desktops.h dialog.h ecompmgr.c ecompmgr.h eobj.h ewins.h fx.c groups.h iclass.c iclass.h menus.h mwm.c snaps.h tclass.h tooltips.h Added Files: etypes.h Log Message: Move frequently used opaque type definitions to etypes.h. =================================================================== RCS file: /cvs/e/e16/e/src/E.h,v retrieving revision 1.541 retrieving revision 1.542 diff -u -3 -r1.541 -r1.542 --- E.h 2 Apr 2006 09:45:39 -0000 1.541 +++ E.h 6 Apr 2006 21:20:16 -0000 1.542 @@ -236,15 +236,11 @@ /* * Types */ - -struct _border; - -typedef struct _ewin EWin; -typedef struct _ecursor ECursor; +#include "etypes.h" typedef struct _client Client; -typedef struct _constraints +typedef struct { int min, max; } @@ -980,7 +976,7 @@ /* windowmatch.c */ int WindowMatchConfigLoad(FILE * fs); -struct _border *WindowMatchEwinBorder(const EWin * ewin); +Border *WindowMatchEwinBorder(const EWin * ewin); const char *WindowMatchEwinIcon(const EWin * ewin); void WindowMatchEwinOps(EWin * ewin); =================================================================== RCS file: /cvs/e/e16/e/src/Makefile.am,v retrieving revision 1.66 retrieving revision 1.67 diff -u -3 -r1.66 -r1.67 --- Makefile.am 29 Mar 2006 19:13:16 -0000 1.66 +++ Makefile.am 6 Apr 2006 21:20:16 -0000 1.67 @@ -51,6 +51,7 @@ emodule.h \ eobj.c \ eobj.h \ + etypes.h \ events.c \ ewins.c \ ewins.h \ =================================================================== RCS file: /cvs/e/e16/e/src/aclass.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- aclass.h 30 Mar 2006 21:30:50 -0000 1.4 +++ aclass.h 6 Apr 2006 21:20:16 -0000 1.5 @@ -24,10 +24,7 @@ #ifndef _ACLASS_H #define _ACLASS_H -struct _ewin; - -typedef struct _action Action; -typedef struct _actionclass ActionClass; +#include "etypes.h" /* aclass.c */ int AclassConfigLoad(FILE * fs); @@ -48,7 +45,7 @@ int ActionclassGetActionCount(ActionClass * ac); Action *ActionclassGetAction(ActionClass * ac, int ix); int ActionclassEvent(ActionClass * ac, XEvent * ev, - struct _ewin *ewin); + EWin * ewin); int ActionclassesGlobalEvent(XEvent * ev); const char *ActionGetTooltipString(Action * aa); @@ -57,7 +54,7 @@ int ActionGetButton(Action * aa); int ActionGetModifiers(Action * aa); -void GrabButtonGrabs(struct _ewin *ewin); -void UnGrabButtonGrabs(struct _ewin *ewin); +void GrabButtonGrabs(EWin * ewin); +void UnGrabButtonGrabs(EWin * ewin); #endif /* _ACLASS_H */ =================================================================== RCS file: /cvs/e/e16/e/src/backgrounds.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- backgrounds.h 1 Mar 2006 21:57:50 -0000 1.9 +++ backgrounds.h 6 Apr 2006 21:20:16 -0000 1.10 @@ -24,8 +24,6 @@ #ifndef _BACKGROUNDS_H_ #define _BACKGROUNDS_H_ -typedef struct _background Background; - /* backgrounds.c */ Background *BackgroundFind(const char *name); =================================================================== RCS file: /cvs/e/e16/e/src/borders.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- borders.h 29 Mar 2006 19:13:16 -0000 1.4 +++ borders.h 6 Apr 2006 21:20:16 -0000 1.5 @@ -25,8 +25,9 @@ #define _BORDERS_H_ #include "eimage.h" +#include "etypes.h" -typedef struct _winpoint +typedef struct { int originbox; struct @@ -38,19 +39,19 @@ } WinPoint; -typedef struct _geometry +typedef struct { Constraints width, height; WinPoint topleft, bottomright; } Geometry; -typedef struct _winpart +typedef struct { Geometry geom; - struct _imageclass *iclass; - struct _actionclass *aclass; - struct _textclass *tclass; + ImageClass *iclass; + ActionClass *aclass; + TextClass *tclass; ECursor *ec; signed char ontop; int flags; @@ -58,7 +59,7 @@ } WinPart; -typedef struct _border +struct _border { char *name; char *group_border_name; @@ -69,11 +70,10 @@ char shadedir; char throwaway; unsigned int ref_count; - struct _actionclass *aclass; -} -Border; + ActionClass *aclass; +}; -typedef struct _ewinbit +struct _ewinbit { EWin *ewin; /* Belongs to */ Window win; @@ -83,10 +83,9 @@ char expose; char no_expose; char left; - struct _imagestate *is; - struct _textstate *ts; -} -EWinBit; + ImageState *is; + TextState *ts; +}; /* borders.c */ Border *BorderFind(const char *name); =================================================================== RCS file: /cvs/e/e16/e/src/buttons.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -3 -r1.84 -r1.85 --- buttons.c 29 Mar 2006 19:13:16 -0000 1.84 +++ buttons.c 6 Apr 2006 21:20:16 -0000 1.85 @@ -38,7 +38,7 @@ ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | \ PointerMotionMask) -typedef struct _bgeometry +typedef struct { Constraints width, height; int xorigin, yorigin; =================================================================== RCS file: /cvs/e/e16/e/src/buttons.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- buttons.h 18 Feb 2006 08:30:04 -0000 1.8 +++ buttons.h 6 Apr 2006 21:20:16 -0000 1.9 @@ -25,21 +25,14 @@ #define _BUTTONS_H_ #include "eobj.h" +#include "etypes.h" -struct _actionclass; -struct _desk; -struct _imageclass; -struct _textclass; - -typedef struct _button Button; - -typedef void (ButtonCbFunc) (EObj * eo, XEvent * ev, - struct _actionclass * ac); +typedef void (ButtonCbFunc) (EObj * eo, XEvent * ev, ActionClass * ac); /* buttons.c */ Button *ButtonCreate(const char *name, int id, - struct _imageclass *ic, - struct _actionclass *ac, struct _textclass *tc, + ImageClass * ic, + ActionClass * ac, TextClass * tc, const char *label, char ontop, int flags, int minw, int maxw, int minh, int maxh, int xo, int yo, int xa, int xr, int ya, int yr, @@ -56,16 +49,15 @@ void ButtonSwallowInto(Button * b, EObj * eo); void ButtonSetCallback(Button * b, ButtonCbFunc * func, EObj * eo); -int ButtonGetInfo(const Button * b, RectBox * r, - struct _desk *d); +int ButtonGetInfo(const Button * b, RectBox * r, Desk * d); int ButtonDoShowDefault(const Button * b); int ButtonEmbedWindow(Button * ButtonToUse, Window WindowToEmbed); Button **ButtonsGetList(int *pnum); -void ButtonsForeach(int id, struct _desk *dsk, +void ButtonsForeach(int id, Desk * dsk, void (*func) (Button * b)); -void ButtonsMoveStickyToDesk(struct _desk *d); +void ButtonsMoveStickyToDesk(Desk * d); int ButtonsConfigLoad(FILE * fs); #endif /* _BUTTONS_H_ */ =================================================================== RCS file: /cvs/e/e16/e/src/desktops.c,v retrieving revision 1.229 retrieving revision 1.230 diff -u -3 -r1.229 -r1.230 --- desktops.c 29 Mar 2006 23:45:32 -0000 1.229 +++ desktops.c 6 Apr 2006 21:20:16 -0000 1.230 @@ -47,7 +47,7 @@ #define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32 -typedef struct _desktops +typedef struct { Desk *current; Desk *previous; =================================================================== RCS file: /cvs/e/e16/e/src/desktops.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- desktops.h 1 Mar 2006 21:57:50 -0000 1.25 +++ desktops.h 6 Apr 2006 21:20:16 -0000 1.26 @@ -25,6 +25,7 @@ #define _DESKTOPS_H_ #include "eobj.h" +#include "etypes.h" #define USE_BG_WIN_ON_ALL_DESKS 0 @@ -33,24 +34,19 @@ #define DESK_BG_TIMEOUT 3 #define DESK_BG_RECONFIGURE_ALL 4 -typedef struct _desk Desk; - -struct _background; -struct _button; - struct _desk { EObj o; unsigned int num; char viewable; char visible; - struct _button *tag; + Button *tag; int current_area_x; int current_area_y; long event_mask; struct { - struct _background *bg; + Background *bg; EObj *o; #if USE_COMPOSITE EObj *o_bg; @@ -79,10 +75,10 @@ void DeskRestack(Desk * dsk); Window DeskGetBackgroundWin(const Desk * dsk); -struct _background *DeskBackgroundGet(const Desk * dsk); -void DeskBackgroundSet(Desk * dsk, struct _background *bg); +Background *DeskBackgroundGet(const Desk * dsk); +void DeskBackgroundSet(Desk * dsk, Background * bg); -void DesksBackgroundRefresh(struct _background *bg, int what); +void DesksBackgroundRefresh(Background * bg, int what); void DeskCurrentGetArea(int *ax, int *ay); void DeskCurrentGotoArea(int ax, int ay); =================================================================== RCS file: /cvs/e/e16/e/src/dialog.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- dialog.h 18 Feb 2006 08:30:08 -0000 1.5 +++ dialog.h 6 Apr 2006 21:20:16 -0000 1.6 @@ -47,11 +47,9 @@ #define DLG_OAC 7 #define DLG_OC 5 -struct _imageclass; -struct _textclass; - typedef struct _dialog Dialog; typedef struct _ditem DItem; + typedef void (DialogCallbackFunc) (Dialog * d, int val, void *data); typedef void (DialogItemCallbackFunc) (int val, void *data); @@ -82,8 +80,8 @@ DItem *DialogAddItem(DItem * dii, int type); void DialogItemSetCallback(DItem * di, DialogCallbackFunc * func, int val, void *data); -void DialogItemSetClass(DItem * di, struct _imageclass *ic, - struct _textclass *tclass); +void DialogItemSetClass(DItem * di, ImageClass * ic, + TextClass * tclass); void DialogItemSetPadding(DItem * di, int left, int right, int top, int bottom); void DialogItemSetFill(DItem * di, char fill_h, char fill_v); =================================================================== RCS file: /cvs/e/e16/e/src/ecompmgr.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -3 -r1.106 -r1.107 --- ecompmgr.c 2 Apr 2006 09:45:39 -0000 1.106 +++ ecompmgr.c 6 Apr 2006 21:20:16 -0000 1.107 @@ -703,7 +703,7 @@ static Picture transBlackPicture; -typedef struct _conv +typedef struct { int size; double *data; =================================================================== RCS file: /cvs/e/e16/e/src/ecompmgr.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- ecompmgr.h 4 Mar 2006 14:11:52 -0000 1.27 +++ ecompmgr.h 6 Apr 2006 21:20:16 -0000 1.28 @@ -26,6 +26,7 @@ #if USE_COMPOSITE #include "eobj.h" +#include "etypes.h" typedef struct { @@ -35,13 +36,11 @@ int fade_speed; } cfg_composite; -struct _desk; - int EVisualIsARGB(Visual * vis); int ECompMgrIsActive(void); -int ECompMgrDeskConfigure(struct _desk *dsk); +int ECompMgrDeskConfigure(Desk * dsk); void ECompMgrWinNew(EObj * eo); void ECompMgrWinDel(EObj * eo); @@ -49,8 +48,7 @@ void ECompMgrWinUnmap(EObj * eo); void ECompMgrWinMoveResize(EObj * eo, int change_xy, int change_wh, int change_bw); -void ECompMgrWinReparent(EObj * eo, struct _desk *dsk, - int change_xy); +void ECompMgrWinReparent(EObj * eo, Desk * dsk, int change_xy); void ECompMgrWinRaise(EObj * eo); void ECompMgrWinLower(EObj * eo); void ECompMgrWinChangeShape(EObj * eo); =================================================================== RCS file: /cvs/e/e16/e/src/eobj.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- eobj.h 2 Apr 2006 09:45:39 -0000 1.24 +++ eobj.h 6 Apr 2006 21:20:16 -0000 1.25 @@ -23,7 +23,7 @@ #ifndef _EOBJ_H_ #define _EOBJ_H_ -struct _desk; +#include "etypes.h" typedef struct _eobj EObj; @@ -33,7 +33,7 @@ short type; /* Ewin, button, other, ... */ short ilayer; /* Internal stacking layer */ short layer; /* Stacking layer */ - struct _desk *desk; /* Belongs on desk */ + Desk *desk; /* Belongs on desk */ int x, y; int w, h; signed char stacked; @@ -166,7 +166,7 @@ int EobjListStackCheck(EObj * eo); EObj *EobjListStackFind(Window win); EObj *const *EobjListStackGet(int *num); -EObj *const *EobjListStackGetForDesk(int *num, struct _desk *dsk); +EObj *const *EobjListStackGetForDesk(int *num, Desk * dsk); void EobjListFocusAdd(EObj * eo, int ontop); void EobjListFocusDel(EObj * eo); int EobjListFocusRaise(EObj * eo); =================================================================== RCS file: /cvs/e/e16/e/src/ewins.h,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- ewins.h 2 Apr 2006 09:45:40 -0000 1.43 +++ ewins.h 6 Apr 2006 21:20:16 -0000 1.44 @@ -25,18 +25,9 @@ #define _EWIN_H_ #include "eobj.h" +#include "etypes.h" #include "xwin.h" -struct _border; -struct _ewinbit; -struct _desk; -struct _group; -struct _snapshot; - -#if 0 -typedef struct _ewin EWin; -#endif - /* Window operation sources */ #define OPSRC_UNKNOWN 0 #define OPSRC_APP 1 @@ -71,10 +62,10 @@ char type; Window win_container; - const struct _border *border; - const struct _border *normal_border; - const struct _border *previous_border; - struct _ewinbit *bits; + const Border *border; + const Border *normal_border; + const Border *previous_border; + EWinBit *bits; struct { @@ -227,7 +218,7 @@ } update; int num_groups; - struct _group **groups; + Group **groups; int area_x, area_y; char *session_id; PmapMask mini_pmm; @@ -236,7 +227,7 @@ int shape_x, shape_y, shape_w, shape_h; int req_x, req_y; - struct _snapshot *snap; + Snapshot *snap; int head; /* Unused? */ int vx, vy; /* Position in virtual root */ @@ -318,7 +309,7 @@ void EwinBorderUpdateState(EWin * ewin); int EwinIsOnScreen(const EWin * ewin); void EwinRememberPositionSet(EWin * ewin); -void EwinRememberPositionGet(EWin * ewin, struct _desk *dsk, +void EwinRememberPositionGet(EWin * ewin, Desk * dsk, int *px, int *py); unsigned int EwinFlagsEncode(const EWin * ewin); void EwinFlagsDecode(EWin * ewin, unsigned int flags); @@ -329,7 +320,7 @@ void EwinsEventsConfigure(int mode); void EwinsSetFree(void); void EwinsShowDesktop(int on); -void EwinsMoveStickyToDesk(struct _desk *d); +void EwinsMoveStickyToDesk(Desk * d); /* ewin-ops.c */ void SlideEwinTo(EWin * ewin, int fx, int fy, int tx, int ty, @@ -342,11 +333,10 @@ void EwinMoveResize(EWin * ewin, int x, int y, int w, int h); void EwinMoveResizeWithGravity(EWin * ewin, int x, int y, int w, int h, int grav); -void EwinMoveToDesktop(EWin * ewin, struct _desk *d); -void EwinMoveToDesktopAt(EWin * ewin, struct _desk *d, int x, - int y); +void EwinMoveToDesktop(EWin * ewin, Desk * d); +void EwinMoveToDesktopAt(EWin * ewin, Desk * d, int x, int y); void EwinFloatAt(EWin * ewin, int x, int y); -void EwinUnfloatAt(EWin * ewin, struct _desk *d, int x, int y); +void EwinUnfloatAt(EWin * ewin, Desk * d, int x, int y); void EwinIconify(EWin * ewin); void EwinDeIconify(EWin * ewin); void EwinInstantShade(EWin * ewin, int force); @@ -373,7 +363,7 @@ void EwinOpSetLayer(EWin * ewin, int source, int layer); void EwinOpSetBorder(EWin * ewin, int source, const char *name); void EwinOpSetOpacity(EWin * ewin, int source, int opacity); -void EwinOpMoveToDesk(EWin * ewin, int source, struct _desk *dsk, +void EwinOpMoveToDesk(EWin * ewin, int source, Desk * dsk, int inc); void EwinOpFullscreen(EWin * ewin, int source, int on); @@ -394,7 +384,7 @@ /* stacking.c */ EWin *const *EwinListStackGet(int *num); EWin *const *EwinListFocusGet(int *num); -EWin *const *EwinListGetForDesk(int *num, struct _desk *d); +EWin *const *EwinListGetForDesk(int *num, Desk * d); EWin *const *EwinListOrderGet(int *num); EWin *EwinListStackGetTop(void); int EwinListStackIsRaised(const EWin * ewin); =================================================================== RCS file: /cvs/e/e16/e/src/fx.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- fx.c 29 Mar 2006 19:13:16 -0000 1.61 +++ fx.c 6 Apr 2006 21:20:16 -0000 1.62 @@ -41,7 +41,7 @@ #define FX_OP_STOP 2 #define FX_OP_TOGGLE 3 -typedef struct _fxhandler +typedef struct { const char *name; void (*init_func) (const char *name); @@ -196,7 +196,7 @@ static int fx_raindrops_number = 4; static PixImg *fx_raindrops_draw = NULL; -typedef struct _drop_context +typedef struct { int x, y; int count; =================================================================== RCS file: /cvs/e/e16/e/src/groups.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- groups.h 18 Feb 2006 08:30:08 -0000 1.3 +++ groups.h 6 Apr 2006 21:20:16 -0000 1.4 @@ -40,8 +40,6 @@ #define GROUP_ACTION_SET_WINDOW_BORDER 8 #define GROUP_ACTION_RAISE_LOWER 9 -typedef struct _group Group; - typedef struct _groupconfig { char iconify; =================================================================== RCS file: /cvs/e/e16/e/src/iclass.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- iclass.c 29 Mar 2006 22:56:29 -0000 1.91 +++ iclass.c 6 Apr 2006 21:20:16 -0000 1.92 @@ -33,7 +33,7 @@ #include "xwin.h" #if ENABLE_COLOR_MODIFIERS -typedef struct _modcurve +typedef struct { int num; unsigned char *px; @@ -42,7 +42,7 @@ } ModCurve; -typedef struct _colormodifierclass +typedef struct { char *name; ModCurve red, green, blue; @@ -67,7 +67,7 @@ #endif }; -typedef struct _ImageStateArray +typedef struct { ImageState *normal; ImageState *hilited; =================================================================== RCS file: /cvs/e/e16/e/src/iclass.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- iclass.h 29 Mar 2006 19:13:17 -0000 1.9 +++ iclass.h 6 Apr 2006 21:20:16 -0000 1.10 @@ -25,14 +25,9 @@ #define _ICLASS_H #include "eimage.h" +#include "etypes.h" #include "xwin.h" -struct _textclass; -struct _textstate; - -typedef struct _imageclass ImageClass; -typedef struct _imagestate ImageState; - #define BEVEL_NONE 0 #define BEVEL_AMIGA 1 #define BEVEL_MOTIF 2 @@ -126,7 +121,7 @@ int image_type); void ITApply(Window win, ImageClass * ic, ImageState * is, int w, int h, int state, int active, int sticky, - char expose, int image_type, struct _textclass *tc, - struct _textstate *ts, const char *text); + char expose, int image_type, TextClass * tc, + TextState * ts, const char *text); #endif /* _ICLASS_H */ =================================================================== RCS file: /cvs/e/e16/e/src/menus.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- menus.h 20 Feb 2006 18:20:29 -0000 1.7 +++ menus.h 6 Apr 2006 21:20:16 -0000 1.8 @@ -24,7 +24,7 @@ #ifndef _MENUS_H_ #define _MENUS_H_ -struct _imageclass; +#include "etypes.h" typedef struct _menu Menu; typedef struct _menuitem MenuItem; @@ -43,7 +43,7 @@ void MenuHide(Menu * m); void MenuEmpty(Menu * m, int destroying); void MenuRepack(Menu * m); -MenuItem *MenuItemCreate(const char *text, struct _imageclass *ic, +MenuItem *MenuItemCreate(const char *text, ImageClass * ic, const char *action_params, Menu * child); void MenuSetInternal(Menu * m); void MenuSetDynamic(Menu * m); =================================================================== RCS file: /cvs/e/e16/e/src/mwm.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- mwm.c 19 Mar 2006 14:59:48 -0000 1.32 +++ mwm.c 6 Apr 2006 21:20:16 -0000 1.33 @@ -181,7 +181,7 @@ MWM_SetInfo(void) { Atom a1; - struct _mwminfo + struct { long flags; Window win; =================================================================== RCS file: /cvs/e/e16/e/src/snaps.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- snaps.h 7 Jan 2006 07:20:58 -0000 1.5 +++ snaps.h 6 Apr 2006 21:20:16 -0000 1.6 @@ -23,7 +23,7 @@ #ifndef _SNAPS_H_ #define _SNAPS_H_ -typedef struct _snapshot Snapshot; +#include "etypes.h" #define SNAP_MATCH_TITLE (1 << 0) #define SNAP_MATCH_NAME (1 << 1) =================================================================== RCS file: /cvs/e/e16/e/src/tclass.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- tclass.h 7 Jan 2006 07:20:58 -0000 1.4 +++ tclass.h 6 Apr 2006 21:20:16 -0000 1.5 @@ -24,13 +24,9 @@ #ifndef _TCLASS_H #define _TCLASS_H +#include "etypes.h" #include "xwin.h" -struct _imageclass; - -typedef struct _textclass TextClass; -typedef struct _textstate TextState; - #define MODE_VERBATIM 0 #define MODE_WRAP_CHAR 1 #define MODE_WRAP_WORD 2 @@ -82,7 +78,7 @@ int TextclassGetJustification(TextClass * tc); void TextclassSetJustification(TextClass * tc, int just); TextClass *TextclassFind(const char *name, int fallback); -void TextclassApply(struct _imageclass *ic, Window win, int w, +void TextclassApply(ImageClass * ic, Window win, int w, int h, int active, int sticky, int state, char expose, TextClass * tclass, const char *text); =================================================================== RCS file: /cvs/e/e16/e/src/tooltips.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- tooltips.h 18 Feb 2006 08:30:09 -0000 1.4 +++ tooltips.h 6 Apr 2006 21:20:16 -0000 1.5 @@ -24,16 +24,16 @@ #ifndef _TOOLTIPS_H_ #define _TOOLTIPS_H_ -struct _actionclass; +#include "etypes.h" typedef struct _tooltip ToolTip; -typedef struct _actionclass *(CB_GetAclass) (void *data); +typedef ActionClass *(CB_GetAclass) (void *data); int TooltipConfigLoad(FILE * fs); void TooltipShow(ToolTip * tt, const char *text, - struct _actionclass *ac, int x, int y); + ActionClass * ac, int x, int y); void TooltipHide(ToolTip * tt); ToolTip *TooltipFind(const char *name); ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs