summaryrefslogtreecommitdiff
path: root/app/fvwm/modules/FvwmWinList
diff options
context:
space:
mode:
Diffstat (limited to 'app/fvwm/modules/FvwmWinList')
-rw-r--r--app/fvwm/modules/FvwmWinList/ButtonArray.c6
-rw-r--r--app/fvwm/modules/FvwmWinList/ButtonArray.h8
-rw-r--r--app/fvwm/modules/FvwmWinList/FvwmWinList.c2
3 files changed, 8 insertions, 8 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);
diff --git a/app/fvwm/modules/FvwmWinList/ButtonArray.h b/app/fvwm/modules/FvwmWinList/ButtonArray.h
index 628b6e21a..119805ea4 100644
--- a/app/fvwm/modules/FvwmWinList/ButtonArray.h
+++ b/app/fvwm/modules/FvwmWinList/ButtonArray.h
@@ -19,7 +19,7 @@ typedef struct button
char *truncate_title; /* valid only if truncatewidth > 0 */
int up, needsupdate, tw, set, truncatewidth;
struct button *next;
- Picture p;
+ FvwmPicture p;
long desk;
} Button;
@@ -33,12 +33,12 @@ typedef struct
#define MAX_COLOUR_SETS 4
/* Function Prototypes */
-Button *ButtonNew(char *title, Picture *p, int up);
+Button *ButtonNew(char *title, FvwmPicture *p, int up);
void InitArray(ButtonArray *array,int x,int y,int w,int h);
void UpdateArray(ButtonArray *array,int x,int y,int w, int h);
-int AddButton(ButtonArray *array, char *title, Picture *p,int up);
+int AddButton(ButtonArray *array, char *title, FvwmPicture *p,int up);
int UpdateButton(ButtonArray *array, int butnum, char *title, int up);
-int UpdateButtonPicture(ButtonArray *array, int butnum, Picture *p);
+int UpdateButtonPicture(ButtonArray *array, int butnum, FvwmPicture *p);
int UpdateButtonSet(ButtonArray *array, int butnum, int set);
void RemoveButton(ButtonArray *array, int butnum);
Button *find_n(ButtonArray *array, int n);
diff --git a/app/fvwm/modules/FvwmWinList/FvwmWinList.c b/app/fvwm/modules/FvwmWinList/FvwmWinList.c
index 9fb6aaa39..3347d1464 100644
--- a/app/fvwm/modules/FvwmWinList/FvwmWinList.c
+++ b/app/fvwm/modules/FvwmWinList/FvwmWinList.c
@@ -285,7 +285,7 @@ void ProcessMessage(unsigned long type,unsigned long *body)
char *name,*string;
static int current_focus=-1;
- Picture p;
+ FvwmPicture p;
switch(type)
{