7 files changed, 15 insertions, 15 deletions
diff --git a/app/fvwm/modules/FvwmButtons/FvwmButtons.c b/app/fvwm/modules/FvwmButtons/FvwmButtons.c
index cd170c7aa..11e02b4b2 100644
--- a/app/fvwm/modules/FvwmButtons/FvwmButtons.c
+++ b/app/fvwm/modules/FvwmButtons/FvwmButtons.c
@@ -1027,7 +1027,7 @@ void RedrawWindow(button_info *b)
 /**
 *** LoadIconFile()
 **/
-int LoadIconFile(char *s,Picture **p)
+int LoadIconFile(char *s,FvwmPicture **p)
 {
   *p=CachePicture(Dpy,Root,iconPath,pixmapPath,s, save_color_limit);
   if(*p)
diff --git a/app/fvwm/modules/FvwmButtons/FvwmButtons.h b/app/fvwm/modules/FvwmButtons/FvwmButtons.h
index 7cb4056a0..5d93d4cad 100644
--- a/app/fvwm/modules/FvwmButtons/FvwmButtons.h
+++ b/app/fvwm/modules/FvwmButtons/FvwmButtons.h
@@ -108,7 +108,7 @@ struct container_info_struct
   char *fore;              /* b_Fore */
   Pixel fc;                /* b_Fore */
   Pixel bc,hc,sc;          /* b_Back && !b_IconBack */
-  Picture *backicon;       /* b_Back && b_IconBack */
+  FvwmPicture *backicon;       /* b_Back && b_IconBack */
   ushort minx,miny;        /* b_Size */
 };
 
@@ -138,9 +138,9 @@ struct button_info_struct
   Window IconWin;          /* b_Icon || b_Swallow */
   Pixel fc;                /* b_Fore */
   Pixel bc,hc,sc;          /* b_Back && !b_IconBack */
-  Picture *backicon;       /* b_Back && b_IconBack */
+  FvwmPicture *backicon;       /* b_Back && b_IconBack */
   ushort minx,miny;        /* b_Size */
-  Picture *icon;           /* b_Icon */
+  FvwmPicture *icon;           /* b_Icon */
 
   byte swallow;            /* b_Swallow */
   byte swallow_mask;       /* b_Swallow */
diff --git a/app/fvwm/modules/FvwmIconMan/FvwmIconMan.h b/app/fvwm/modules/FvwmIconMan/FvwmIconMan.h
index 2866d4c80..3bd79390e 100644
--- a/app/fvwm/modules/FvwmIconMan/FvwmIconMan.h
+++ b/app/fvwm/modules/FvwmIconMan/FvwmIconMan.h
@@ -180,7 +180,7 @@ typedef struct win_data {
   struct button *button;
   /* stuff shadowed in the Button structure */
 #ifdef MINI_ICONS
-  Picture pic;
+  FvwmPicture pic;
 #endif
   char *display_string; /* what gets shown in the manager window */
   Uchar iconified, state;
@@ -206,7 +206,7 @@ typedef struct button {
   struct {
     int dirty_flags;
 #ifdef MINI_ICONS
-    Picture pic;
+    FvwmPicture pic;
 #endif
     WinData *win;
     char *display_string;
diff --git a/app/fvwm/modules/FvwmPager/FvwmPager.h b/app/fvwm/modules/FvwmPager/FvwmPager.h
index 0d2be13c0..2a82ba1ba 100644
--- a/app/fvwm/modules/FvwmPager/FvwmPager.h
+++ b/app/fvwm/modules/FvwmPager/FvwmPager.h
@@ -55,7 +55,7 @@ typedef struct pager_window
   Window icon_w;
   Window icon_pixmap_w;
   char *icon_name;
-  Picture mini_icon;
+  FvwmPicture mini_icon;
   int pager_view_width;
   int pager_view_height;
   int icon_view_width;
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)
   {