diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2011-01-18 19:28:34 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2011-01-18 19:28:34 +0000 |
commit | c3237ce75da9d1a82ae9059697434c1187f15237 (patch) | |
tree | 481dd4bd4ce22c3066787f48aa0c982999afb5b2 /app/fvwm/modules/FvwmWinList/ButtonArray.c | |
parent | 41d09277103eaf813d0d8e18193dd8881d0dceed (diff) |
Picture -> FvwmPicture, to avoid collisions with xrandr includes.
As noticed by Tristan Le Guern.
okay matthieu@
Diffstat (limited to 'app/fvwm/modules/FvwmWinList/ButtonArray.c')
-rw-r--r-- | app/fvwm/modules/FvwmWinList/ButtonArray.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/fvwm/modules/FvwmWinList/ButtonArray.c b/app/fvwm/modules/FvwmWinList/ButtonArray.c index 9be63e39c..e9b54b714 100644 --- a/app/fvwm/modules/FvwmWinList/ButtonArray.c +++ b/app/fvwm/modules/FvwmWinList/ButtonArray.c @@ -44,7 +44,7 @@ extern int ShowCurrentDesk; /* ------------------------------------------------------------------------- ButtonNew - Allocates and fills a new button structure ------------------------------------------------------------------------- */ -Button *ButtonNew(char *title, Picture *p, int up) +Button *ButtonNew(char *title, FvwmPicture *p, int up) { Button *new; @@ -100,7 +100,7 @@ void UpdateArray(ButtonArray *array,int x,int y,int w, int h) /****************************************************************************** AddButton - Allocate space for and add the button to the bottom ******************************************************************************/ -int AddButton(ButtonArray *array, char *title, Picture *p, int up) +int AddButton(ButtonArray *array, char *title, FvwmPicture *p, int up) { Button *new; @@ -154,7 +154,7 @@ int UpdateButton(ButtonArray *array, int butnum, char *title, int up) /* ------------------------------------------------------------------------- UpdateButtonPicture - Change the picture of a button ------------------------------------------------------------------------- */ -int UpdateButtonPicture(ButtonArray *array, int butnum, Picture *p) +int UpdateButtonPicture(ButtonArray *array, int butnum, FvwmPicture *p) { Button *temp; temp=find_n(array,butnum); |