summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2009-03-25 00:43:36 +0000
committerleo2009-03-25 00:43:36 +0000
commit76f252008d0ecaeba10e1b59c08dbcdd86465f11 (patch)
tree6f97529227e8fbaace47d3402813570415169f02
parenta68843add80437470086ee57c1db9d1179219e0e (diff)
Fixed compiler warnings.
git-svn-id: http://svn.leocad.org/tags/leocad-0.75@756 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rwxr-xr-xlinux/gtkmisc.cpp30
-rwxr-xr-xlinux/gtkmisc.h32
-rw-r--r--linux/gtktools.cpp20
-rw-r--r--linux/gtktools.h10
-rw-r--r--linux/main.cpp4
-rw-r--r--linux/pixmaps/ac-brick.xpm2
-rw-r--r--linux/pixmaps/ac-cam.xpm2
-rw-r--r--linux/pixmaps/ac-erase.xpm2
-rw-r--r--linux/pixmaps/ac-light.xpm2
-rw-r--r--linux/pixmaps/ac-move.xpm2
-rw-r--r--linux/pixmaps/ac-next.xpm2
-rw-r--r--linux/pixmaps/ac-paint.xpm2
-rw-r--r--linux/pixmaps/ac-pan.xpm2
-rw-r--r--linux/pixmaps/ac-prev.xpm2
-rw-r--r--linux/pixmaps/ac-roll.xpm2
-rw-r--r--linux/pixmaps/ac-rot.xpm2
-rw-r--r--linux/pixmaps/ac-rotv.xpm2
-rw-r--r--linux/pixmaps/ac-sel.xpm2
-rw-r--r--linux/pixmaps/ac-spot.xpm2
-rw-r--r--linux/pixmaps/ac-zoom.xpm2
-rw-r--r--linux/pixmaps/ac-zoome.xpm2
-rw-r--r--linux/pixmaps/ac-zoomr.xpm2
-rw-r--r--linux/pixmaps/an-anim.xpm2
-rw-r--r--linux/pixmaps/an-first.xpm2
-rw-r--r--linux/pixmaps/an-key.xpm2
-rw-r--r--linux/pixmaps/an-last.xpm2
-rw-r--r--linux/pixmaps/an-next.xpm2
-rw-r--r--linux/pixmaps/an-play.xpm2
-rw-r--r--linux/pixmaps/an-prev.xpm2
-rw-r--r--linux/pixmaps/an-stop.xpm2
-rw-r--r--linux/pixmaps/cr_brick.xpm2
-rw-r--r--linux/pixmaps/cr_cam.xpm2
-rw-r--r--linux/pixmaps/cr_erase.xpm2
-rw-r--r--linux/pixmaps/cr_light.xpm2
-rw-r--r--linux/pixmaps/cr_move.xpm2
-rw-r--r--linux/pixmaps/cr_paint.xpm2
-rw-r--r--linux/pixmaps/cr_pan.xpm2
-rw-r--r--linux/pixmaps/cr_roll.xpm2
-rw-r--r--linux/pixmaps/cr_rot.xpm2
-rw-r--r--linux/pixmaps/cr_rotv.xpm2
-rw-r--r--linux/pixmaps/cr_sel.xpm2
-rw-r--r--linux/pixmaps/cr_selm.xpm2
-rw-r--r--linux/pixmaps/cr_spot.xpm2
-rw-r--r--linux/pixmaps/cr_zoom.xpm2
-rw-r--r--linux/pixmaps/cr_zoomr.xpm2
-rw-r--r--linux/pixmaps/icon32.xpm2
-rw-r--r--linux/pixmaps/info.xpm2
-rw-r--r--linux/pixmaps/photo.xpm2
-rw-r--r--linux/pixmaps/pi-acces.xpm2
-rw-r--r--linux/pixmaps/pi-brick.xpm2
-rw-r--r--linux/pixmaps/pi-extra.xpm2
-rw-r--r--linux/pixmaps/pi-misc.xpm2
-rw-r--r--linux/pixmaps/pi-plate.xpm2
-rw-r--r--linux/pixmaps/pi-slope.xpm2
-rw-r--r--linux/pixmaps/pi-space.xpm2
-rw-r--r--linux/pixmaps/pi-tech.xpm2
-rw-r--r--linux/pixmaps/pi-tile.xpm2
-rw-r--r--linux/pixmaps/pi-train.xpm2
-rw-r--r--linux/pixmaps/st-about.xpm2
-rw-r--r--linux/pixmaps/st-bg.xpm2
-rw-r--r--linux/pixmaps/st-copy.xpm2
-rw-r--r--linux/pixmaps/st-cut.xpm2
-rw-r--r--linux/pixmaps/st-fast.xpm2
-rw-r--r--linux/pixmaps/st-help.xpm2
-rw-r--r--linux/pixmaps/st-new.xpm2
-rw-r--r--linux/pixmaps/st-open.xpm2
-rw-r--r--linux/pixmaps/st-paste.xpm2
-rw-r--r--linux/pixmaps/st-prev.xpm2
-rw-r--r--linux/pixmaps/st-print.xpm2
-rw-r--r--linux/pixmaps/st-redo.xpm2
-rw-r--r--linux/pixmaps/st-save.xpm2
-rw-r--r--linux/pixmaps/st-snap.xpm2
-rw-r--r--linux/pixmaps/st-snapa.xpm2
-rw-r--r--linux/pixmaps/st-undo.xpm2
-rw-r--r--linux/system.cpp10
75 files changed, 122 insertions, 122 deletions
diff --git a/linux/gtkmisc.cpp b/linux/gtkmisc.cpp
index ade4e34..9bc5ae0 100755
--- a/linux/gtkmisc.cpp
+++ b/linux/gtkmisc.cpp
@@ -66,7 +66,7 @@ void load_pixmap (const char* filename, GdkPixmap **gdkpixmap, GdkBitmap **mask)
}
// Load a xpm file and return a pixmap widget
-GtkWidget* create_pixmap (char* filename)
+GtkWidget* create_pixmap (const char* filename)
{
GdkPixmap *gdkpixmap;
GdkBitmap *mask;
@@ -103,7 +103,7 @@ GtkWidget* menu_tearoff (GtkWidget *menu)
return menu_item;
}
-GtkWidget* create_sub_menu (GtkWidget *bar, char *label, GtkAccelGroup *accel)
+GtkWidget* create_sub_menu(GtkWidget* bar, const char* label, GtkAccelGroup* accel)
{
GtkWidget *item, *menu;
@@ -117,7 +117,7 @@ GtkWidget* create_sub_menu (GtkWidget *bar, char *label, GtkAccelGroup *accel)
return menu;
}
-GtkWidget* create_menu_in_menu (GtkWidget *menu, gchar *label, GtkAccelGroup *accel)
+GtkWidget* create_menu_in_menu(GtkWidget* menu, const char* label, GtkAccelGroup* accel)
{
GtkWidget *item, *submenu;
@@ -131,8 +131,8 @@ GtkWidget* create_menu_in_menu (GtkWidget *menu, gchar *label, GtkAccelGroup *ac
return submenu;
}
-GtkWidget* create_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_accel,
- GtkSignalFunc func, GtkObject *window, int id, const char* data)
+GtkWidget* create_menu_item(GtkWidget *menu, const char *label, GtkAccelGroup *menu_accel,
+ GtkSignalFunc func, GtkObject *window, int id, const char* data)
{
GtkWidget *item;
@@ -147,8 +147,8 @@ GtkWidget* create_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_
return item;
}
-GtkWidget* create_pixmap_menu_item (GtkWidget *menu, gchar *label, gchar **pixmap, GtkAccelGroup *menu_accel,
- GtkSignalFunc func, GtkObject *window, int id, const char* data)
+GtkWidget* create_pixmap_menu_item(GtkWidget *menu, const gchar *label, const char **pixmap, GtkAccelGroup *menu_accel,
+ GtkSignalFunc func, GtkObject *window, int id, const char* data)
{
GtkWidget *item, *pixmap_widget;
@@ -168,8 +168,8 @@ GtkWidget* create_pixmap_menu_item (GtkWidget *menu, gchar *label, gchar **pixma
return item;
}
-GtkWidget* create_check_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_accel,
- GtkSignalFunc func, GtkObject *window, int id, const char* data)
+GtkWidget* create_check_menu_item(GtkWidget *menu, const char *label, GtkAccelGroup *menu_accel,
+ GtkSignalFunc func, GtkObject *window, int id, const char* data)
{
GtkWidget *item;
@@ -184,9 +184,9 @@ GtkWidget* create_check_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup
return item;
}
-GtkWidget* create_radio_menu_item (GtkWidget *menu, GtkWidget *last, gchar *label,
- GtkAccelGroup *menu_accel, GtkSignalFunc func,
- GtkObject *window, int id, const char* data)
+GtkWidget* create_radio_menu_item(GtkWidget *menu, GtkWidget *last, const char *label,
+ GtkAccelGroup *menu_accel, GtkSignalFunc func,
+ GtkObject *window, int id, const char* data)
{
GtkWidget *item;
GSList *group = NULL;
@@ -204,9 +204,9 @@ GtkWidget* create_radio_menu_item (GtkWidget *menu, GtkWidget *last, gchar *labe
return item;
}
-GtkWidget* create_radio_menu_pixmap (GtkWidget *menu, GtkWidget *last, gchar *filename,
- GtkAccelGroup *menu_accel, GtkSignalFunc func,
- GtkObject *window, int id, const char* data)
+GtkWidget* create_radio_menu_pixmap(GtkWidget *menu, GtkWidget *last, const char *filename,
+ GtkAccelGroup *menu_accel, GtkSignalFunc func,
+ GtkObject *window, int id, const char* data)
{
GtkWidget *item, *pixmap;
GSList *group = NULL;
diff --git a/linux/gtkmisc.h b/linux/gtkmisc.h
index eed42d3..fac67a7 100755
--- a/linux/gtkmisc.h
+++ b/linux/gtkmisc.h
@@ -4,22 +4,22 @@
GtkWidget* create_pixmap (char* filename);
void load_pixmap (const char* filename, GdkPixmap **gdkpixmap, GdkBitmap **mask);
-GtkWidget* menu_separator (GtkWidget *menu);
-GtkWidget* menu_tearoff (GtkWidget *menu);
-GtkWidget* create_sub_menu (GtkWidget *bar, char *label, GtkAccelGroup *accel);
-GtkWidget* create_menu_in_menu (GtkWidget *menu, gchar *label, GtkAccelGroup *accel);
-GtkWidget* create_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *accel,
- GtkSignalFunc func, GtkObject *window, int id, const char* data);
-GtkWidget* create_pixmap_menu_item (GtkWidget *menu, gchar *label, gchar **pixmap, GtkAccelGroup *accel,
- GtkSignalFunc func, GtkObject *window, int id, const char* data);
-GtkWidget* create_check_menu_item (GtkWidget *menu, gchar *label, GtkAccelGroup *menu_accel,
- GtkSignalFunc func, GtkObject *window, int id, const char* data);
-GtkWidget* create_radio_menu_item (GtkWidget *menu, GtkWidget *last, gchar *label,
- GtkAccelGroup *menu_accel, GtkSignalFunc func,
- GtkObject *window, int id, const char* data);
-GtkWidget* create_radio_menu_pixmap (GtkWidget *menu, GtkWidget *last, gchar *filename,
- GtkAccelGroup *menu_accel, GtkSignalFunc func,
- GtkObject *window, int id, const char* data);
+GtkWidget* menu_separator(GtkWidget *menu);
+GtkWidget* menu_tearoff(GtkWidget *menu);
+GtkWidget* create_sub_menu(GtkWidget *bar, const char *label, GtkAccelGroup *accel);
+GtkWidget* create_menu_in_menu(GtkWidget *menu, const char *label, GtkAccelGroup *accel);
+GtkWidget* create_menu_item(GtkWidget *menu, const char *label, GtkAccelGroup *accel,
+ GtkSignalFunc func, GtkObject *window, int id, const char* data);
+GtkWidget* create_pixmap_menu_item(GtkWidget *menu, const char *label, const char **pixmap, GtkAccelGroup *accel,
+ GtkSignalFunc func, GtkObject *window, int id, const char* data);
+GtkWidget* create_check_menu_item(GtkWidget *menu, const char *label, GtkAccelGroup *menu_accel,
+ GtkSignalFunc func, GtkObject *window, int id, const char* data);
+GtkWidget* create_radio_menu_item(GtkWidget *menu, GtkWidget *last, const char *label,
+ GtkAccelGroup *menu_accel, GtkSignalFunc func,
+ GtkObject *window, int id, const char* data);
+GtkWidget* create_radio_menu_pixmap(GtkWidget *menu, GtkWidget *last, const char *filename,
+ GtkAccelGroup *menu_accel, GtkSignalFunc func,
+ GtkObject *window, int id, const char* data);
#endif // _GTKMISC_H_
diff --git a/linux/gtktools.cpp b/linux/gtktools.cpp
index d285ce5..40cf51e 100644
--- a/linux/gtktools.cpp
+++ b/linux/gtktools.cpp
@@ -4,23 +4,22 @@
#include <gtk/gtk.h>
#include "gtktools.h"
-GtkWidget* new_pixmap (GtkWidget *widget, char **data)
+GtkWidget* new_pixmap(GtkWidget *widget, const char **data)
{
GdkPixmap *gdkpixmap;
GdkBitmap *mask;
GtkWidget *pixmap;
- gdkpixmap = gdk_pixmap_create_from_xpm_d (widget->window, &mask,
- &widget->style->bg[GTK_STATE_NORMAL], data);
- pixmap = gtk_pixmap_new (gdkpixmap, mask);
+ gdkpixmap = gdk_pixmap_create_from_xpm_d(widget->window, &mask, &widget->style->bg[GTK_STATE_NORMAL], (gchar**)data);
+ pixmap = gtk_pixmap_new(gdkpixmap, mask);
- gdk_pixmap_unref (gdkpixmap);
- gdk_pixmap_unref (mask);
+ gdk_pixmap_unref(gdkpixmap);
+ gdk_pixmap_unref(mask);
return pixmap;
}
-GtkWidget* clist_title_with_arrow (GtkWidget* clist, char col, char* label_text)
+GtkWidget* clist_title_with_arrow(GtkWidget* clist, char col, const char* label_text)
{
GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
GtkWidget *arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_IN);
@@ -32,10 +31,11 @@ GtkWidget* clist_title_with_arrow (GtkWidget* clist, char col, char* label_text)
gtk_widget_show (hbox);
gtk_clist_set_column_widget (GTK_CLIST (clist), col, hbox);
+
return arrow;
}
-void set_notebook_tab (GtkWidget *notebook, gint page_num, GtkWidget *widget)
+void set_notebook_tab(GtkWidget *notebook, gint page_num, GtkWidget *widget)
{
gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook), gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), page_num), widget);
/*
@@ -52,7 +52,7 @@ void set_notebook_tab (GtkWidget *notebook, gint page_num, GtkWidget *widget)
*/
}
-void set_button_pixmap (GtkWidget* widget, float* color)
+void set_button_pixmap(GtkWidget* widget, float* color)
{
if (widget->window == NULL)
return;
@@ -79,7 +79,7 @@ void set_button_pixmap (GtkWidget* widget, float* color)
gdk_gc_destroy(gc);
}
-void set_button_pixmap2 (GtkWidget* widget, unsigned char* color)
+void set_button_pixmap2(GtkWidget* widget, unsigned char* color)
{
GdkColor c;
GdkGC* gc;
diff --git a/linux/gtktools.h b/linux/gtktools.h
index e524500..e0a4207 100644
--- a/linux/gtktools.h
+++ b/linux/gtktools.h
@@ -2,11 +2,11 @@
#ifndef _GTKTOOLS_H_
#define _GTKTOOLS_H_
-GtkWidget* new_pixmap (GtkWidget *widget, char **data);
-GtkWidget* clist_title_with_arrow (GtkWidget* clist, char col, char* label_text);
-void set_notebook_tab (GtkWidget *notebook, gint page_num, GtkWidget *widget);
-void set_button_pixmap (GtkWidget* widget, float* color);
-void set_button_pixmap2 (GtkWidget* widget, unsigned char* color);
+GtkWidget* new_pixmap(GtkWidget* widget, const char** data);
+GtkWidget* clist_title_with_arrow(GtkWidget* clist, char col, const char* label_text);
+void set_notebook_tab(GtkWidget* notebook, gint page_num, GtkWidget* widget);
+void set_button_pixmap(GtkWidget* widget, float* color);
+void set_button_pixmap2(GtkWidget* widget, unsigned char* color);
#endif // _GTKTOOLS_H_
diff --git a/linux/main.cpp b/linux/main.cpp
index 6a71cec..e83687b 100644
--- a/linux/main.cpp
+++ b/linux/main.cpp
@@ -674,8 +674,8 @@ int main (int argc, char* argv[])
GdkPixmap *gdkpixmap;
GdkBitmap *mask;
- gdkpixmap = gdk_pixmap_create_from_xpm_d (((GtkWidget*)(*main_window))->window, &mask,
- &((GtkWidget*)(*main_window))->style->bg[GTK_STATE_NORMAL], icon32);
+ gdkpixmap = gdk_pixmap_create_from_xpm_d(((GtkWidget*)(*main_window))->window, &mask,
+ &((GtkWidget*)(*main_window))->style->bg[GTK_STATE_NORMAL], (gchar**)icon32);
gdk_window_set_icon (((GtkWidget*)(*main_window))->window, NULL, gdkpixmap, mask);
gtk_widget_show (GTK_WIDGET (((GtkWidget*)(*main_window))));
diff --git a/linux/pixmaps/ac-brick.xpm b/linux/pixmaps/ac-brick.xpm
index f56ac14..b034104 100644
--- a/linux/pixmaps/ac-brick.xpm
+++ b/linux/pixmaps/ac-brick.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_brick[] = {
+static const char*ac_brick[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c #00007f",
diff --git a/linux/pixmaps/ac-cam.xpm b/linux/pixmaps/ac-cam.xpm
index 00516b9..cfb6913 100644
--- a/linux/pixmaps/ac-cam.xpm
+++ b/linux/pixmaps/ac-cam.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * ac_cam[] = {
+static const char* ac_cam[] = {
"16 15 6 1",
". c None",
"+ c #7F7F7F",
diff --git a/linux/pixmaps/ac-erase.xpm b/linux/pixmaps/ac-erase.xpm
index afce83f..650f0e4 100644
--- a/linux/pixmaps/ac-erase.xpm
+++ b/linux/pixmaps/ac-erase.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_erase[] = {
+static const char*ac_erase[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-light.xpm b/linux/pixmaps/ac-light.xpm
index d3aeb7e..388b959 100644
--- a/linux/pixmaps/ac-light.xpm
+++ b/linux/pixmaps/ac-light.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * ac_light[] = {
+static const char* ac_light[] = {
"16 15 5 1",
". c None",
"+ c #000000",
diff --git a/linux/pixmaps/ac-move.xpm b/linux/pixmaps/ac-move.xpm
index df6f9a1..845cca4 100644
--- a/linux/pixmaps/ac-move.xpm
+++ b/linux/pixmaps/ac-move.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_move[] = {
+static const char*ac_move[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-next.xpm b/linux/pixmaps/ac-next.xpm
index e1bb7a0..4f9d417 100644
--- a/linux/pixmaps/ac-next.xpm
+++ b/linux/pixmaps/ac-next.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_next[] = {
+static const char*ac_next[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-paint.xpm b/linux/pixmaps/ac-paint.xpm
index 416542d..ba511da 100644
--- a/linux/pixmaps/ac-paint.xpm
+++ b/linux/pixmaps/ac-paint.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_paint[] = {
+static const char*ac_paint[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-pan.xpm b/linux/pixmaps/ac-pan.xpm
index 1b312c7..ce88b77 100644
--- a/linux/pixmaps/ac-pan.xpm
+++ b/linux/pixmaps/ac-pan.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_pan[] = {
+static const char*ac_pan[] = {
"16 15 5 1",
". c None",
"+ c #000000",
diff --git a/linux/pixmaps/ac-prev.xpm b/linux/pixmaps/ac-prev.xpm
index 0e8b3aa..1bfcdd3 100644
--- a/linux/pixmaps/ac-prev.xpm
+++ b/linux/pixmaps/ac-prev.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_prev[] = {
+static const char*ac_prev[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-roll.xpm b/linux/pixmaps/ac-roll.xpm
index ab2dc78..c61ff1a 100644
--- a/linux/pixmaps/ac-roll.xpm
+++ b/linux/pixmaps/ac-roll.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_roll[] = {
+static const char*ac_roll[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-rot.xpm b/linux/pixmaps/ac-rot.xpm
index e02a276..360f69c 100644
--- a/linux/pixmaps/ac-rot.xpm
+++ b/linux/pixmaps/ac-rot.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_rot[] = {
+static const char*ac_rot[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-rotv.xpm b/linux/pixmaps/ac-rotv.xpm
index 16ef97f..94b441d 100644
--- a/linux/pixmaps/ac-rotv.xpm
+++ b/linux/pixmaps/ac-rotv.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_rotv[] = {
+static const char*ac_rotv[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-sel.xpm b/linux/pixmaps/ac-sel.xpm
index 5a0d157..fef7ec5 100644
--- a/linux/pixmaps/ac-sel.xpm
+++ b/linux/pixmaps/ac-sel.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_sel[] = {
+static const char*ac_sel[] = {
/* columns rows colors chars-per-pixel */
"16 15 2 1",
" c Gray0",
diff --git a/linux/pixmaps/ac-spot.xpm b/linux/pixmaps/ac-spot.xpm
index cc96760..4ad9388 100644
--- a/linux/pixmaps/ac-spot.xpm
+++ b/linux/pixmaps/ac-spot.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * ac_spot[] = {
+static const char* ac_spot[] = {
"16 15 6 1",
". c None",
"+ c #000000",
diff --git a/linux/pixmaps/ac-zoom.xpm b/linux/pixmaps/ac-zoom.xpm
index 86d5ba7..b5dc0cc 100644
--- a/linux/pixmaps/ac-zoom.xpm
+++ b/linux/pixmaps/ac-zoom.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_zoom[] = {
+static const char*ac_zoom[] = {
"16 15 7 1",
". c None",
"+ c #00007F",
diff --git a/linux/pixmaps/ac-zoome.xpm b/linux/pixmaps/ac-zoome.xpm
index e7a0b4c..60833fb 100644
--- a/linux/pixmaps/ac-zoome.xpm
+++ b/linux/pixmaps/ac-zoome.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_zoome[] = {
+static const char*ac_zoome[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
" c #00007f",
diff --git a/linux/pixmaps/ac-zoomr.xpm b/linux/pixmaps/ac-zoomr.xpm
index bbbb268..8d6188c 100644
--- a/linux/pixmaps/ac-zoomr.xpm
+++ b/linux/pixmaps/ac-zoomr.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *ac_zoomr[] = {
+static const char*ac_zoomr[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
" c Gray0",
diff --git a/linux/pixmaps/an-anim.xpm b/linux/pixmaps/an-anim.xpm
index 77003b6..04b21f2 100644
--- a/linux/pixmaps/an-anim.xpm
+++ b/linux/pixmaps/an-anim.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * an_anim[] = {
+static const char* an_anim[] = {
"16 15 5 1",
". c #000000",
"+ c #7F7F7F",
diff --git a/linux/pixmaps/an-first.xpm b/linux/pixmaps/an-first.xpm
index 50be91d..d27c819 100644
--- a/linux/pixmaps/an-first.xpm
+++ b/linux/pixmaps/an-first.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *an_first[] = {
+static const char*an_first[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c #00007f",
diff --git a/linux/pixmaps/an-key.xpm b/linux/pixmaps/an-key.xpm
index 67ea35c..546c269 100644
--- a/linux/pixmaps/an-key.xpm
+++ b/linux/pixmaps/an-key.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *an_key[] = {
+static const char*an_key[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
" c Gray0",
diff --git a/linux/pixmaps/an-last.xpm b/linux/pixmaps/an-last.xpm
index d603cca..14ffa05 100644
--- a/linux/pixmaps/an-last.xpm
+++ b/linux/pixmaps/an-last.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *an_last[] = {
+static const char*an_last[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c #00007f",
diff --git a/linux/pixmaps/an-next.xpm b/linux/pixmaps/an-next.xpm
index 93bbbf8..891a24e 100644
--- a/linux/pixmaps/an-next.xpm
+++ b/linux/pixmaps/an-next.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *an_next[] = {
+static const char*an_next[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c #00007f",
diff --git a/linux/pixmaps/an-play.xpm b/linux/pixmaps/an-play.xpm
index e07663c..f1f0aad 100644
--- a/linux/pixmaps/an-play.xpm
+++ b/linux/pixmaps/an-play.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *an_play[] = {
+static const char*an_play[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c #00007f",
diff --git a/linux/pixmaps/an-prev.xpm b/linux/pixmaps/an-prev.xpm
index 01e536d..b0ef885 100644
--- a/linux/pixmaps/an-prev.xpm
+++ b/linux/pixmaps/an-prev.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *an_prev[] = {
+static const char*an_prev[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c #00007f",
diff --git a/linux/pixmaps/an-stop.xpm b/linux/pixmaps/an-stop.xpm
index a15274b..a70eb48 100644
--- a/linux/pixmaps/an-stop.xpm
+++ b/linux/pixmaps/an-stop.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *an_stop[] = {
+static const char*an_stop[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c #00007f",
diff --git a/linux/pixmaps/cr_brick.xpm b/linux/pixmaps/cr_brick.xpm
index 78b9a0c..2595cf2 100644
--- a/linux/pixmaps/cr_brick.xpm
+++ b/linux/pixmaps/cr_brick.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_brick[] = {
+static const char* cr_brick[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_cam.xpm b/linux/pixmaps/cr_cam.xpm
index 87c27bf..c413f1e 100644
--- a/linux/pixmaps/cr_cam.xpm
+++ b/linux/pixmaps/cr_cam.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_cam[] = {
+static const char* cr_cam[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_erase.xpm b/linux/pixmaps/cr_erase.xpm
index b801260..ad34e45 100644
--- a/linux/pixmaps/cr_erase.xpm
+++ b/linux/pixmaps/cr_erase.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_erase[] = {
+static const char* cr_erase[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_light.xpm b/linux/pixmaps/cr_light.xpm
index 563cfb5..7ce3039 100644
--- a/linux/pixmaps/cr_light.xpm
+++ b/linux/pixmaps/cr_light.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_light[] = {
+static const char* cr_light[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_move.xpm b/linux/pixmaps/cr_move.xpm
index a5d5b3f..e9cf1b0 100644
--- a/linux/pixmaps/cr_move.xpm
+++ b/linux/pixmaps/cr_move.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_move[] = {
+static const char* cr_move[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_paint.xpm b/linux/pixmaps/cr_paint.xpm
index 51177ff..16190d3 100644
--- a/linux/pixmaps/cr_paint.xpm
+++ b/linux/pixmaps/cr_paint.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_paint[] = {
+static const char* cr_paint[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_pan.xpm b/linux/pixmaps/cr_pan.xpm
index a640dad..94763e0 100644
--- a/linux/pixmaps/cr_pan.xpm
+++ b/linux/pixmaps/cr_pan.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_pan[] = {
+static const char* cr_pan[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_roll.xpm b/linux/pixmaps/cr_roll.xpm
index 279bd53..1b5e340 100644
--- a/linux/pixmaps/cr_roll.xpm
+++ b/linux/pixmaps/cr_roll.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_roll[] = {
+static const char* cr_roll[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_rot.xpm b/linux/pixmaps/cr_rot.xpm
index 8dbbcc6..bca82a2 100644
--- a/linux/pixmaps/cr_rot.xpm
+++ b/linux/pixmaps/cr_rot.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_rot[] = {
+static const char* cr_rot[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_rotv.xpm b/linux/pixmaps/cr_rotv.xpm
index 9ebea8a..b92b0a0 100644
--- a/linux/pixmaps/cr_rotv.xpm
+++ b/linux/pixmaps/cr_rotv.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_rotv[] = {
+static const char* cr_rotv[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_sel.xpm b/linux/pixmaps/cr_sel.xpm
index 5bb7885..cb0e27c 100644
--- a/linux/pixmaps/cr_sel.xpm
+++ b/linux/pixmaps/cr_sel.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_sel[] = {
+static const char* cr_sel[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_selm.xpm b/linux/pixmaps/cr_selm.xpm
index 331db8b..7488ea9 100644
--- a/linux/pixmaps/cr_selm.xpm
+++ b/linux/pixmaps/cr_selm.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_selm[] = {
+static const char* cr_selm[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_spot.xpm b/linux/pixmaps/cr_spot.xpm
index 72b445d..1301227 100644
--- a/linux/pixmaps/cr_spot.xpm
+++ b/linux/pixmaps/cr_spot.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_spot[] = {
+static const char* cr_spot[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_zoom.xpm b/linux/pixmaps/cr_zoom.xpm
index 07b4038..5820aed 100644
--- a/linux/pixmaps/cr_zoom.xpm
+++ b/linux/pixmaps/cr_zoom.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_zoom[] = {
+static const char* cr_zoom[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/cr_zoomr.xpm b/linux/pixmaps/cr_zoomr.xpm
index 6da8c8c..7e417ed 100644
--- a/linux/pixmaps/cr_zoomr.xpm
+++ b/linux/pixmaps/cr_zoomr.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *cr_zoomr[] = {
+static const char* cr_zoomr[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c None",
diff --git a/linux/pixmaps/icon32.xpm b/linux/pixmaps/icon32.xpm
index 230ca60..d0ea2ea 100644
--- a/linux/pixmaps/icon32.xpm
+++ b/linux/pixmaps/icon32.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *icon32[] = {
+static const char* icon32[] = {
/* columns rows colors chars-per-pixel */
"32 32 3 1",
" c Gray0",
diff --git a/linux/pixmaps/info.xpm b/linux/pixmaps/info.xpm
index d37937d..8d26786 100644
--- a/linux/pixmaps/info.xpm
+++ b/linux/pixmaps/info.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *info[] = {
+static const char* info[] = {
/* width height ncolors chars_per_pixel */
"16 15 4 1",
/* colors */
diff --git a/linux/pixmaps/photo.xpm b/linux/pixmaps/photo.xpm
index 9ae4b91..30dbbbf 100644
--- a/linux/pixmaps/photo.xpm
+++ b/linux/pixmaps/photo.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *photo[] = {
+static const char* photo[] = {
/* width height ncolors chars_per_pixel */
"16 15 6 1",
/* colors */
diff --git a/linux/pixmaps/pi-acces.xpm b/linux/pixmaps/pi-acces.xpm
index bf4792a..db31015 100644
--- a/linux/pixmaps/pi-acces.xpm
+++ b/linux/pixmaps/pi-acces.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_acces[] = {
+static const char* pi_acces[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-brick.xpm b/linux/pixmaps/pi-brick.xpm
index 1690760..e5a4267 100644
--- a/linux/pixmaps/pi-brick.xpm
+++ b/linux/pixmaps/pi-brick.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_brick[] = {
+static const char* pi_brick[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-extra.xpm b/linux/pixmaps/pi-extra.xpm
index 5702389..3b0e220 100644
--- a/linux/pixmaps/pi-extra.xpm
+++ b/linux/pixmaps/pi-extra.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_extra[] = {
+static const char* pi_extra[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-misc.xpm b/linux/pixmaps/pi-misc.xpm
index 2e5d5e0..4450f98 100644
--- a/linux/pixmaps/pi-misc.xpm
+++ b/linux/pixmaps/pi-misc.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_misc[] = {
+static const char* pi_misc[] = {
/* columns rows colors chars-per-pixel */
"16 15 2 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-plate.xpm b/linux/pixmaps/pi-plate.xpm
index c253307..6a5d564 100644
--- a/linux/pixmaps/pi-plate.xpm
+++ b/linux/pixmaps/pi-plate.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_plate[] = {
+static const char* pi_plate[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-slope.xpm b/linux/pixmaps/pi-slope.xpm
index a2d9cdf..1a043b3 100644
--- a/linux/pixmaps/pi-slope.xpm
+++ b/linux/pixmaps/pi-slope.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_slope[] = {
+static const char* pi_slope[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-space.xpm b/linux/pixmaps/pi-space.xpm
index d5c69b9..b338d07 100644
--- a/linux/pixmaps/pi-space.xpm
+++ b/linux/pixmaps/pi-space.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_space[] = {
+static const char* pi_space[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-tech.xpm b/linux/pixmaps/pi-tech.xpm
index 0c1c80a..ea0dfa9 100644
--- a/linux/pixmaps/pi-tech.xpm
+++ b/linux/pixmaps/pi-tech.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_tech[] = {
+static const char* pi_tech[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-tile.xpm b/linux/pixmaps/pi-tile.xpm
index f3421f4..7b8746b 100644
--- a/linux/pixmaps/pi-tile.xpm
+++ b/linux/pixmaps/pi-tile.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_tile[] = {
+static const char* pi_tile[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/pi-train.xpm b/linux/pixmaps/pi-train.xpm
index a0037af..ae3a98c 100644
--- a/linux/pixmaps/pi-train.xpm
+++ b/linux/pixmaps/pi-train.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *pi_train[] = {
+static const char* pi_train[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/st-about.xpm b/linux/pixmaps/st-about.xpm
index e0dd59e..fa2060f 100644
--- a/linux/pixmaps/st-about.xpm
+++ b/linux/pixmaps/st-about.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_about[] = {
+static const char*st_about[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/st-bg.xpm b/linux/pixmaps/st-bg.xpm
index 0843ac0..31362e9 100644
--- a/linux/pixmaps/st-bg.xpm
+++ b/linux/pixmaps/st-bg.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * st_bg[] = {
+static const char* st_bg[] = {
"16 15 5 1",
". c None",
"+ c #000000",
diff --git a/linux/pixmaps/st-copy.xpm b/linux/pixmaps/st-copy.xpm
index 4a1bd19..6dfb848 100644
--- a/linux/pixmaps/st-copy.xpm
+++ b/linux/pixmaps/st-copy.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_copy[] = {
+static const char*st_copy[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/st-cut.xpm b/linux/pixmaps/st-cut.xpm
index eace7c9..b4be3c3 100644
--- a/linux/pixmaps/st-cut.xpm
+++ b/linux/pixmaps/st-cut.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_cut[] = {
+static const char*st_cut[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/st-fast.xpm b/linux/pixmaps/st-fast.xpm
index 6c21876..dce93c5 100644
--- a/linux/pixmaps/st-fast.xpm
+++ b/linux/pixmaps/st-fast.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * st_fast[] = {
+static const char* st_fast[] = {
"16 15 3 1",
". c None",
"+ c #7F7F7F",
diff --git a/linux/pixmaps/st-help.xpm b/linux/pixmaps/st-help.xpm
index d1396ce..ba99d46 100644
--- a/linux/pixmaps/st-help.xpm
+++ b/linux/pixmaps/st-help.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_help[] = {
+static const char*st_help[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/st-new.xpm b/linux/pixmaps/st-new.xpm
index a34f0d2..21d4e84 100644
--- a/linux/pixmaps/st-new.xpm
+++ b/linux/pixmaps/st-new.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_new[] = {
+static const char*st_new[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Gray0",
diff --git a/linux/pixmaps/st-open.xpm b/linux/pixmaps/st-open.xpm
index 62424f3..50d9e93 100644
--- a/linux/pixmaps/st-open.xpm
+++ b/linux/pixmaps/st-open.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_open[] = {
+static const char*st_open[] = {
/* columns rows colors chars-per-pixel */
"16 15 5 1",
" c Gray0",
diff --git a/linux/pixmaps/st-paste.xpm b/linux/pixmaps/st-paste.xpm
index 526f54a..f2c7244 100644
--- a/linux/pixmaps/st-paste.xpm
+++ b/linux/pixmaps/st-paste.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_paste[] = {
+static const char*st_paste[] = {
/* columns rows colors chars-per-pixel */
"16 15 8 1",
" c Gray0",
diff --git a/linux/pixmaps/st-prev.xpm b/linux/pixmaps/st-prev.xpm
index 1487070..d8be122 100644
--- a/linux/pixmaps/st-prev.xpm
+++ b/linux/pixmaps/st-prev.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * st_prev[] = {
+static const char* st_prev[] = {
"16 15 6 1",
"+ c None",
". c #000000",
diff --git a/linux/pixmaps/st-print.xpm b/linux/pixmaps/st-print.xpm
index 3d9c902..a3dc02a 100644
--- a/linux/pixmaps/st-print.xpm
+++ b/linux/pixmaps/st-print.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * st_print[] = {
+static const char* st_print[] = {
"16 15 6 1",
". c None",
"+ c #000000",
diff --git a/linux/pixmaps/st-redo.xpm b/linux/pixmaps/st-redo.xpm
index 0487db7..c1c8234 100644
--- a/linux/pixmaps/st-redo.xpm
+++ b/linux/pixmaps/st-redo.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_redo[] = {
+static const char*st_redo[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c #00007f",
diff --git a/linux/pixmaps/st-save.xpm b/linux/pixmaps/st-save.xpm
index 7f7b00d..862aea8 100644
--- a/linux/pixmaps/st-save.xpm
+++ b/linux/pixmaps/st-save.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_save[] = {
+static const char*st_save[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Gray0",
diff --git a/linux/pixmaps/st-snap.xpm b/linux/pixmaps/st-snap.xpm
index 42a7495..95414e4 100644
--- a/linux/pixmaps/st-snap.xpm
+++ b/linux/pixmaps/st-snap.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_snap[] = {
+static const char*st_snap[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
" c Gray0",
diff --git a/linux/pixmaps/st-snapa.xpm b/linux/pixmaps/st-snapa.xpm
index 4be915c..5a691d7 100644
--- a/linux/pixmaps/st-snapa.xpm
+++ b/linux/pixmaps/st-snapa.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char * st_snapa[] = {
+static const char* st_snapa[] = {
"16 15 5 1",
". c None",
"+ c #000000",
diff --git a/linux/pixmaps/st-undo.xpm b/linux/pixmaps/st-undo.xpm
index de76087..30fefaf 100644
--- a/linux/pixmaps/st-undo.xpm
+++ b/linux/pixmaps/st-undo.xpm
@@ -1,5 +1,5 @@
/* XPM */
-static char *st_undo[] = {
+static const char*st_undo[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c #00007f",
diff --git a/linux/system.cpp b/linux/system.cpp
index f7fcd2c..4a613a2 100644
--- a/linux/system.cpp
+++ b/linux/system.cpp
@@ -180,7 +180,7 @@ void SystemUpdateCategories(bool SearchOnly)
{
}
-static void create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
+static void create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const char **xpm)
{
int height, width, colors;
char pixmap_buffer [(32 * 32)/8];
@@ -241,7 +241,7 @@ void SystemUpdateAction(int new_action, int old_action)
return;
GtkWidget* button;
- char** xpm = NULL;
+ const char** xpm = NULL;
int x, y;
switch (new_action)
@@ -293,9 +293,9 @@ void SystemUpdateAction(int new_action, int old_action)
if (xpm != NULL)
{
- create_bitmap_and_mask_from_xpm (&bitmap, &mask, xpm);
- cursor = gdk_cursor_new_from_pixmap (bitmap, mask, &white, &black, x, y);
- gdk_window_set_cursor (drawing_area->window, cursor);
+ create_bitmap_and_mask_from_xpm(&bitmap, &mask, xpm);
+ cursor = gdk_cursor_new_from_pixmap(bitmap, mask, &white, &black, x, y);
+ gdk_window_set_cursor(drawing_area->window, cursor);
}
else
{