patches/flek-0.3.1.diff

   1 ôÏÌØËÏ × flek-0.3.1: config.log
   2 ôÏÌØËÏ × flek-0.3.1: config.status
   3 diff -ur flek-0.3/Flek/FJPEG.H flek-0.3.1/Flek/FJPEG.H
   4 --- flek-0.3/Flek/FJPEG.H       2001-05-15 20:18:25.000000000 +0300
   5 +++ flek-0.3.1/Flek/FJPEG.H     2007-08-26 13:35:06.000000000 +0300
   6 @@ -43,12 +43,12 @@
   7    /**
   8     * Read a JPEG from disk and return a new fImage object.
   9     */
  10 -  static FImage * read (char *filename);
  11 +  static FImage * read (const char *filename);
  12
  13    /**
  14     * Write a JPEG to disk from an fImage object.
  15     */
  16 -  static int write (char *filename, FImage* img, int qaulity);
  17 +  static int write (const char *filename, FImage* img, int qaulity);
  18
  19  };
  20
  21 diff -ur flek-0.3/Flek/Fl_Calendar.H flek-0.3.1/Flek/Fl_Calendar.H
  22 --- flek-0.3/Flek/Fl_Calendar.H 2001-05-15 20:18:25.000000000 +0300
  23 +++ flek-0.3.1/Flek/Fl_Calendar.H       2007-08-26 13:13:26.000000000 +0300
  24 @@ -172,7 +172,7 @@
  25     *
  26     * @return The selected day if the user has selected a day, 0 otherwise.
  27     */
  28 -  int selected_day(int d) {selected_day_ = d; if (d) day(d); }
  29 +  void  selected_day(int d) {selected_day_ = d; if (d) day(d); }
  30
  31   protected:
  32
  33 diff -ur flek-0.3/Flek/Fl_Dockable_Window.H flek-0.3.1/Flek/Fl_Dockable_Window.H
  34 --- flek-0.3/Flek/Fl_Dockable_Window.H  2001-05-15 20:18:25.000000000 +0300
  35 +++ flek-0.3.1/Flek/Fl_Dockable_Window.H        2007-08-26 13:12:18.000000000 +0300
  36 @@ -84,7 +84,7 @@
  37    short _docked;
  38    int uw_;
  39    int uh_;
  40 -  void Fl_Dockable_Window::create_dockable_window();
  41 +  void create_dockable_window();
  42
  43  public:
  44    static Fl_Dockable_Window* current;
  45 diff -ur flek-0.3/Flek/Fl_Toggle_Node.H flek-0.3.1/Flek/Fl_Toggle_Node.H
  46 --- flek-0.3/Flek/Fl_Toggle_Node.H      2001-05-15 20:18:25.000000000 +0300
  47 +++ flek-0.3.1/Flek/Fl_Toggle_Node.H    2007-08-26 13:27:19.000000000 +0300
  48 @@ -12,7 +12,7 @@
  49
  50  public:
  51
  52 -  Fl_Toggle_Node(char* label = 0, int can_open = 1, Fl_Pixmap* pixmap = 0,
  53 +  Fl_Toggle_Node(const char* label = 0, int can_open = 1, Fl_Pixmap* pixmap = 0,
  54                  void * d = 0) : Fl_Toggle_Node_Base() {
  55      vsub_ = 0;
  56      selected_ = 0;
  57 diff -ur flek-0.3/Flek/Fl_Toggle_Tree.H flek-0.3.1/Flek/Fl_Toggle_Tree.H
  58 --- flek-0.3/Flek/Fl_Toggle_Tree.H      2001-05-15 20:18:25.000000000 +0300
  59 +++ flek-0.3.1/Flek/Fl_Toggle_Tree.H    2007-08-26 13:29:47.000000000 +0300
  60 @@ -337,7 +337,7 @@
  61     * Performs a find() with the string c as it's argument and remove()s
  62     * the returned node if it exists.
  63     */
  64 -  int remove (char * a);
  65 +  int remove (const char * a);
  66
  67    /**
  68     * Sets the current pointer to t.
  69 @@ -392,13 +392,13 @@
  70     * Finds the first node in the tree whose data pointer is equal to
  71     * the pointer d. If no node matches d, then find returns 0.
  72     */
  73 -  Fl_Toggle_Node * find (char * a);
  74 +  Fl_Toggle_Node * find (const char * a);
  75
  76    /**
  77     * Inserts n as the next sub item after the current node. If the tree
  78     * is empty, then n becomes the first node of the toggle tree.
  79     */
  80 -  Fl_Toggle_Node * add_sub(char* label = 0, int can_open = 1,
  81 +  Fl_Toggle_Node * add_sub(const char* label = 0, int can_open = 1,
  82                            Fl_Pixmap* pixmap = 0, void * d = 0) {
  83      Fl_Toggle_Node * node;
  84      Fl_Toggle_Tree_Base::add_sub(node = new Fl_Toggle_Node(label, can_open, pixmap, d));
  85 @@ -409,7 +409,7 @@
  86     * Inserts n as the next item after the current node. If the tree
  87     * is empty, then n becomes the first node of the toggle tree.
  88     */
  89 -  Fl_Toggle_Node * add_next(char* label = 0, int can_open = 1,
  90 +  Fl_Toggle_Node * add_next(const char* label = 0, int can_open = 1,
  91                             Fl_Pixmap* pixmap = 0, void * d = 0) {
  92      Fl_Toggle_Node * node;
  93      Fl_Toggle_Tree_Base::add_next(node = new Fl_Toggle_Node(label, can_open, pixmap, d));
  94 @@ -508,21 +508,21 @@
  95  /**
  96   * A file (peice of paper) xpm image.
  97   */
  98 -extern char * tt_file_small_xpm[];
  99 +extern const char * tt_file_small_xpm[];
 100
 101  /**
 102   * A file folder xpm image.
 103   */
 104 -extern char * tt_folder_small_xpm[];
 105 +extern const char * tt_folder_small_xpm[];
 106
 107  /**
 108   * An open toggle xpm image.
 109   */
 110 -extern char * tt_open_icon_xpm[];
 111 +extern const char * tt_open_icon_xpm[];
 112
 113  /**
 114   * A closed toggle xpm image.
 115   */
 116 -extern char * tt_closed_icon_xpm[];
 117 +extern const char * tt_closed_icon_xpm[];
 118
 119  #endif
 120 diff -ur flek-0.3/Flek/iostream.H flek-0.3.1/Flek/iostream.H
 121 --- flek-0.3/Flek/iostream.H    2001-05-15 20:18:25.000000000 +0300
 122 +++ flek-0.3.1/Flek/iostream.H  2007-08-26 13:11:38.000000000 +0300
 123 @@ -5,8 +5,10 @@
 124
 125  // Miscellaneous functions for operating on IO streams in C++
 126
 127 -#include <iostream.h>
 128 -#include <iomanip.h>
 129 +#include <iostream>
 130 +#include <iomanip>
 131 +
 132 +using namespace std;
 133
 134  inline void remove_white_space(istream& i) {
 135    char c;
 136 diff -ur flek-0.3/flek-config flek-0.3.1/flek-config
 137 --- flek-0.3/flek-config        2002-05-24 12:24:57.000000000 +0300
 138 +++ flek-0.3.1/flek-config      2007-08-26 13:02:38.000000000 +0300
 139 @@ -18,7 +18,7 @@
 140  prefix=`echo "$0" | sed 's/\/bin\/flek-config//
 141  s/\/flek-config//'`
 142
 143 -#prefix=/usr
 144 +#prefix=/usr/local
 145  exec_prefix=${prefix}
 146  exec_prefix_set=no
 147  bindir=${exec_prefix}/bin
 148 @@ -32,8 +32,8 @@
 149  CC="gcc"
 150
 151  # flags for C++ compiler:
 152 -CFLAGS="-O2 -fPIC -fomit-frame-pointer -Wall   -I/usr/X11R6/include"
 153 -CXXFLAGS="-O2 -fPIC -fno-exceptions -fomit-frame-pointer -Wall -Wno-return-type   -I/usr/X11R6/include"
 154 +CFLAGS="-O2 -fPIC -fomit-frame-pointer -Wall -Wall -O2  -I/usr/X11R6/include"
 155 +CXXFLAGS="-O2 -fPIC -fno-exceptions -fomit-frame-pointer -Wall -Wno-return-type -Wall -O2  -I/usr/X11R6/include"
 156
 157  # flags for the linker
 158  LDFLAGS=""
 159 ôÏÌØËÏ × flek-0.3.1: makeinclude
 160 diff -ur flek-0.3/src/FDate.cxx flek-0.3.1/src/FDate.cxx
 161 --- flek-0.3/src/FDate.cxx      2001-05-15 20:18:25.000000000 +0300
 162 +++ flek-0.3.1/src/FDate.cxx    2007-08-26 13:03:00.000000000 +0300
 163 @@ -1,6 +1,6 @@
 164  #include <time.h>
 165  // Evil #include <iostream.h>
 166 -#include <iomanip.h>
 167 +#include <iomanip>
 168  #include <stdio.h>
 169  #include <string.h>
 170  #include <Flek/FDate.H>
 171 diff -ur flek-0.3/src/FFile.cxx flek-0.3.1/src/FFile.cxx
 172 --- flek-0.3/src/FFile.cxx      2001-05-15 20:18:25.000000000 +0300
 173 +++ flek-0.3.1/src/FFile.cxx    2007-08-26 13:10:07.000000000 +0300
 174 @@ -23,7 +23,7 @@
 175
 176  void FFile::open (char *filename, FFileMode mode)
 177  {
 178 -  char* m = 0;
 179 +  const char* m = 0;
 180
 181    switch (mode) {
 182     case FFileNull:
 183 diff -ur flek-0.3/src/FJPEG.cxx flek-0.3.1/src/FJPEG.cxx
 184 --- flek-0.3/src/FJPEG.cxx      2001-05-15 20:18:25.000000000 +0300
 185 +++ flek-0.3.1/src/FJPEG.cxx    2007-08-26 13:35:47.000000000 +0300
 186 @@ -12,7 +12,7 @@
 187   * libjpeg examples.
 188   */
 189
 190 -FImage* FJPEG::read (char *filename) {
 191 +FImage* FJPEG::read (const char *filename) {
 192
 193    struct jpeg_decompress_struct cinfo;
 194    struct jpeg_error_mgr jerr;
 195 @@ -56,7 +56,7 @@
 196    return rval;
 197  }
 198
 199 -int FJPEG::write (char *filename, FImage *data, int quality) {
 200 +int FJPEG::write (const char *filename, FImage *data, int quality) {
 201    struct jpeg_compress_struct cinfo;
 202    struct jpeg_error_mgr jerr;
 203
 204 diff -ur flek-0.3/src/Fl_Gl_Arcball_Window.cxx flek-0.3.1/src/Fl_Gl_Arcball_Window.cxx
 205 --- flek-0.3/src/Fl_Gl_Arcball_Window.cxx       2001-05-15 20:18:25.000000000 +0300
 206 +++ flek-0.3.1/src/Fl_Gl_Arcball_Window.cxx     2007-08-26 13:23:17.000000000 +0300
 207 @@ -46,7 +46,7 @@
 208  /*
 209   * Draw a circle with the given normal, center and radius
 210   */
 211 -static void drawCircle (const FVector3& center, const FVector3& normal, double radius)
 212 +/*static void drawCircle (const FVector3& center, const FVector3& normal, double radius)
 213  {
 214    // First find the coordinate axis centered at the circle center.
 215    // The normal will be the Z axis.
 216 @@ -79,7 +79,7 @@
 217        glVertex (pts[i]);
 218    }
 219    glEnd ();
 220 -}
 221 +}*/
 222
 223  /*
 224   * Halve arc between unit vectors v1 and v2.
 225 diff -ur flek-0.3/src/Fl_Toggle_Tree_Base.cxx flek-0.3.1/src/Fl_Toggle_Tree_Base.cxx
 226 --- flek-0.3/src/Fl_Toggle_Tree_Base.cxx        2001-05-15 20:18:25.000000000 +0300
 227 +++ flek-0.3.1/src/Fl_Toggle_Tree_Base.cxx      2007-08-26 15:09:01.000000000 +0300
 228 @@ -22,13 +22,11 @@
 229  Fl_Toggle_Node_Base* Fl_Toggle_Tree_Base::find(int fy, int& depth, int& ry) {
 230    int cy = parent()->y() + top_yoffset_;
 231    int ey = parent()->y() + parent()->h();
 232 -
 233    if (fy < cy) return 0;
 234
 235    depth = top_depth_;
 236    Fl_Toggle_Node_Base* node = top_;
 237    traverse_start(top_);
 238 -
 239    while (cy < ey && node) {
 240      ry = cy;
 241      cy += height(node);
 242 diff -ur flek-0.3/src/Fl_Toggle_Tree.cxx flek-0.3.1/src/Fl_Toggle_Tree.cxx
 243 --- flek-0.3/src/Fl_Toggle_Tree.cxx     2002-05-24 12:11:54.000000000 +0300
 244 +++ flek-0.3.1/src/Fl_Toggle_Tree.cxx   2007-08-26 14:46:47.000000000 +0300
 245 @@ -333,6 +333,8 @@
 246       int depth;
 247       int cy;
 248       Fl_Toggle_Node* tnode = (Fl_Toggle_Node*) Fl_Toggle_Tree_Base::find(Fl::event_y(), depth, cy);
 249 +       if (!tnode)
 250 +               return 0;
 251       if (Fl::event_x() < x() + depth*16 + 16) {
 252         if (tnode->opened_) {
 253          current_ = tnode;
 254 @@ -488,7 +490,7 @@
 255  }
 256
 257
 258 -int Fl_Toggle_Tree::remove (char * a) {
 259 +int Fl_Toggle_Tree::remove (const char * a) {
 260    Fl_Toggle_Node * curr;
 261
 262    curr = find(a);
 263 @@ -510,7 +512,7 @@
 264  }
 265
 266
 267 -Fl_Toggle_Node * Fl_Toggle_Tree::find (char * a) {
 268 +Fl_Toggle_Node * Fl_Toggle_Tree::find (const char * a) {
 269    Fl_Toggle_Node * curr = traverse_start();
 270
 271    while (curr) {
 272 diff -ur flek-0.3/src/FPNM.cxx flek-0.3.1/src/FPNM.cxx
 273 --- flek-0.3/src/FPNM.cxx       2001-05-15 20:18:25.000000000 +0300
 274 +++ flek-0.3.1/src/FPNM.cxx     2007-08-26 13:12:01.000000000 +0300
 275 @@ -3,8 +3,10 @@
 276  // CET - FIXME - this shouldn't use libstdc++ if it can be avoided- libstdc++
 277  // causes compatibility problems under linux.  Maybe should use the regular
 278  // stdio.h stuff?
 279 -#include <iostream.h>
 280 -#include <fstream.h>
 281 +#include <iostream>
 282 +#include <fstream>
 283 +
 284 +using namespace std;
 285
 286  static int skip_comments (ifstream& input)
 287  {
 288 diff -ur flek-0.3/src/FSocket_Posix.cxx flek-0.3.1/src/FSocket_Posix.cxx
 289 --- flek-0.3/src/FSocket_Posix.cxx      2001-05-15 20:18:25.000000000 +0300
 290 +++ flek-0.3.1/src/FSocket_Posix.cxx    2007-08-26 13:09:51.000000000 +0300
 291 @@ -38,7 +38,7 @@
 292
 293  #define MAX_HOST_NAME     256
 294
 295 -char* FSocket_Posix::unix_socket_dir = "/tmp/";
 296 +const char* FSocket_Posix::unix_socket_dir = "/tmp/";
 297
 298  class FSocket_Posix_library {
 299   public:
 300 @@ -117,7 +117,7 @@
 301  }
 302
 303  void FSocket_Posix::get_error_text(char* buf, size_t buf_size) {
 304 -  char* msg;
 305 +  const char* msg;
 306    switch(errcode) {
 307     case ok:
 308      msg = "ok";
 309 diff -ur flek-0.3/src/FSocket_Posix.H flek-0.3.1/src/FSocket_Posix.H
 310 --- flek-0.3/src/FSocket_Posix.H        2001-05-15 20:18:25.000000000 +0300
 311 +++ flek-0.3.1/src/FSocket_Posix.H      2007-08-26 13:09:38.000000000 +0300
 312 @@ -53,7 +53,7 @@
 313    // Directory for Unix Domain socket files. This directory should be
 314    // either empty or be terminated with "/". Dafault value is "/tmp/"
 315    //
 316 -  static char* unix_socket_dir;
 317 +  static const char* unix_socket_dir;
 318
 319    int open(int listen_queue_size);
 320    int connect(int max_attempts, time_t timeout);
 321 diff -ur flek-0.3/src/Makefile flek-0.3.1/src/Makefile
 322 --- flek-0.3/src/Makefile       2001-05-15 20:18:25.000000000 +0300
 323 +++ flek-0.3.1/src/Makefile     2007-08-26 14:18:27.000000000 +0300
 324 @@ -130,60 +130,65 @@
 325  ################################################################
 326
 327  LIB_FLEK_CORE = ../lib/$(LIB_NAME_FLEK_CORE)
 328 -DSO_FLEK_CORE = ../lib/$(DSO_NAME_FLEK_CORE)$(DSOEXT)
 329 +DSO_FLEK_CORE = $(DSO_NAME_FLEK_CORE)$(DSOEXT)
 330  OBJ_FLEK_CORE = $(CPP_FLEK_CORE:.cxx=.o)
 331  $(LIB_FLEK_CORE).a: $(OBJ_FLEK_CORE)
 332         rm -f $@
 333         mkdir -p ../lib
 334         $(LIB_COMMAND) $@ $(OBJ_FLEK_CORE)
 335         $(RANLIB) $@
 336 -../lib/libflek_core.so.1 ../lib/libflek_core.sl.1: $(OBJ_FLEK_CORE)
 337 -       $(DSO_COMMAND) ../lib/$@ $(OBJ_FLEK_CORE)
 338 -
 339 +libflek_core.so.1 libflek_core.sl.1: $(OBJ_FLEK_CORE)
 340 +       $(DSO_COMMAND) $@ $(OBJ_FLEK_CORE)
 341 +       ln -s ../src/$@ ../lib/$@
 342 +
 343  LIB_FLEK_UI = ../lib/$(LIB_NAME_FLEK_UI)
 344 -DSO_FLEK_UI = ../lib/$(DSO_NAME_FLEK_UI)$(DSOEXT)
 345 +DSO_FLEK_UI = $(DSO_NAME_FLEK_UI)$(DSOEXT)
 346  OBJ_FLEK_UI = $(CPP_FLEK_UI:.cxx=.o)
 347  $(LIB_FLEK_UI).a: $(OBJ_FLEK_UI)
 348         rm -f $@
 349         mkdir -p ../lib
 350         $(LIB_COMMAND) $@ $(OBJ_FLEK_UI)
 351         $(RANLIB) $@
 352 -../lib/libflek_ui.so.1 ../lib/libflek_ui.sl.1: $(OBJ_FLEK_UI)
 353 -       $(DSO_COMMAND) ../lib/$@ $(OBJ_FLEK_UI)
 354 -
 355 +libflek_ui.so.1 libflek_ui.sl.1: $(OBJ_FLEK_UI)
 356 +       $(DSO_COMMAND) $@ $(OBJ_FLEK_UI)
 357 +       ln -s ../src/$@ ../lib/$@
 358 +
 359  LIB_FLEK_GL = ../lib/$(LIB_NAME_FLEK_GL)
 360 -DSO_FLEK_GL = ../lib/$(DSO_NAME_FLEK_GL)$(DSOEXT)
 361 +DSO_FLEK_GL = $(DSO_NAME_FLEK_GL)$(DSOEXT)
 362  OBJ_FLEK_GL = $(CPP_FLEK_GL:.cxx=.o)
 363  $(LIB_FLEK_GL).a: $(OBJ_FLEK_GL)
 364         rm -f $@
 365         mkdir -p ../lib
 366         $(LIB_COMMAND) $@ $(OBJ_FLEK_GL)
 367         $(RANLIB) $@
 368 -../lib/libflek_gl.so.1 ../lib/libflek_gl.sl.1: $(OBJ_FLEK_GL)
 369 -       $(DSO_COMMAND) ../lib/$@ $(OBJ_FLEK_GL)
 370 -
 371 +libflek_gl.so.1 libflek_gl.sl.1: $(OBJ_FLEK_GL)
 372 +       $(DSO_COMMAND) $@ $(OBJ_FLEK_GL)
 373 +       ln -s ../src/$@ ../lib/$@
 374 +
 375  LIB_FLEK_XML = ../lib/$(LIB_NAME_FLEK_XML)
 376 -DSO_FLEK_XML = ../lib/$(DSO_NAME_FLEK_XML)$(DSOEXT)
 377 +DSO_FLEK_XML = $(DSO_NAME_FLEK_XML)$(DSOEXT)
 378  OBJ_FLEK_XML = $(CPP_FLEK_XML:.cxx=.o)
 379  $(LIB_FLEK_XML).a: $(OBJ_FLEK_XML)
 380         rm -f $@
 381         mkdir -p ../lib
 382         $(LIB_COMMAND) ../lib/$@ $(OBJ_FLEK_XML)
 383         $(RANLIB) $@
 384 -../lib/libflek_xml.so.1 ../lib/libflek_xml.sl.1: $(OBJ_FLEK_XML)
 385 -       $(DSO_COMMAND) ../lib/$@ $(OBJ_FLEK_XML)
 386 -
 387 +libflek_xml.so.1 libflek_xml.sl.1: $(OBJ_FLEK_XML)
 388 +       $(DSO_COMMAND) $@ $(OBJ_FLEK_XML)
 389 +       ln -s ../src/$@ ../lib/$@
 390 +
 391  LIB_FLEK_JPEG = ../lib/$(LIB_NAME_FLEK_JPEG)
 392 -DSO_FLEK_JPEG = ../lib/$(DSO_NAME_FLEK_JPEG)$(DSOEXT)
 393 +DSO_FLEK_JPEG = $(DSO_NAME_FLEK_JPEG)$(DSOEXT)
 394  OBJ_FLEK_JPEG = $(CPP_FLEK_JPEG:.cxx=.o)
 395  $(LIB_FLEK_JPEG).a: $(OBJ_FLEK_JPEG)
 396         rm -f $@
 397         mkdir -p ../lib
 398         $(LIB_COMMAND) ../lib/$@ $(OBJ_FLEK_JPEG)
 399         $(RANLIB) $@
 400 -../lib/libflek_jpeg.so.1 ../lib/libflek_jpeg.sl.1: $(OBJ_FLEK_JPEG)
 401 -       $(DSO_COMMAND) ../lib/$@ $(OBJ_FLEK_JPEG)
 402 -
 403 +libflek_jpeg.so.1 libflek_jpeg.sl.1: $(OBJ_FLEK_JPEG)
 404 +       $(DSO_COMMAND) $@ $(OBJ_FLEK_JPEG)
 405 +       ln -s ../src/$@ ../lib/$@
 406 +
 407  flek-core: $(LIB_FLEK_CORE).a $(DSO_FLEK_CORE)
 408  flek-ui: $(LIB_FLEK_UI).a $(DSO_FLEK_UI)
 409  flek-gl: $(LIB_FLEK_GL).a $(DSO_FLEK_GL)
 410 @@ -195,14 +200,14 @@
 411  .SUFFIXES:     .cxx .h .o
 412
 413  .cxx.o :
 414 -       $(CXX) -I.. $(XML_INC) $(JPEG_INC) $(GL_INC) $(FLTK_INC) $(CXXFLAGS) -c $< -o $(<:.cxx=.o)
 415 +       $(CXX) -Werror -g3 -I.. $(XML_INC) $(JPEG_INC) $(GL_INC) $(FLTK_INC) $(CXXFLAGS) -c $< -o $(<:.cxx=.o)
 416  .c.o :
 417         $(CC) -I. $(CFLAGS) -c -o $@ $<
 418
 419  ################################################################
 420
 421  clean :
 422 -       -@ rm -f *.o *.do *~ ../include/*~ makedepend o
 423 +       -@ rm -f *.a *.so *.so.* *.o *.do *~ ../include/*~ makedepend o
 424         -@ rm -f ../lib/*.a
 425         -@ if [ -n "$(DSOEXT)" ]; then rm -f ../lib/*$(DSOEXT) ; fi
 426
 427 @@ -222,7 +227,7 @@
 428         @-chmod 644 $(libdir)/$(LIB_NAME_FLEK_CORE).a
 429         @if test -n "$(DSOEXT)"; then \
 430                 echo "Installing libflek_core DSO library."; \
 431 -               if test $(DSO_FLEK_CORE) = ../lib/$(DSO_NAME_FLEK_CORE).so.1; then ext=.so; else ext=.s1; fi; \
 432 +               if test $(DSO_FLEK_CORE) = $(DSO_NAME_FLEK_CORE).so.1; then ext=.so; else ext=.s1; fi; \
 433                 rm -f $(libdir)/$(DSO_NAME_FLEK_CORE)$$ext.1;\
 434                 rm -f $(libdir)/$(DSO_NAME_FLEK_CORE)$$ext;\
 435                 cp $(DSO_FLEK_CORE) $(libdir); \
 436 @@ -247,7 +252,7 @@
 437         @-chmod 644 $(libdir)/$(LIB_NAME_FLEK_UI).a
 438         @if test -n "$(DSOEXT)"; then \
 439                 echo "Installing libflek_ui DSO library."; \
 440 -               if test $(DSO_FLEK_UI) = ../lib/$(DSO_NAME_FLEK_UI).so.1; then ext=.so; else ext=.s1; fi; \
 441 +               if test $(DSO_FLEK_UI) = $(DSO_NAME_FLEK_UI).so.1; then ext=.so; else ext=.s1; fi; \
 442                 rm -f $(libdir)/$(DSO_NAME_FLEK_UI)$$ext.1;\
 443                 rm -f $(libdir)/$(DSO_NAME_FLEK_UI)$$ext;\
 444                 cp $(DSO_FLEK_UI) $(libdir); \
 445 @@ -269,7 +274,7 @@
 446         @-chmod 644 $(libdir)/$(LIB_NAME_FLEK_GL).a
 447         @if test -n "$(DSOEXT)"; then \
 448                 echo "Installing libflek_gl DSO library."; \
 449 -               if test $(DSO_FLEK_GL) = ../lib/$(DSO_NAME_FLEK_GL).so.1; then ext=.so; else ext=.s1; fi; \
 450 +               if test $(DSO_FLEK_GL) = $(DSO_NAME_FLEK_GL).so.1; then ext=.so; else ext=.s1; fi; \
 451                 rm -f $(libdir)/$(DSO_NAME_FLEK_GL)$$ext.1;\
 452                 rm -f $(libdir)/$(DSO_NAME_FLEK_GL)$$ext;\
 453                 cp $(DSO_FLEK_GL) $(libdir); \
 454 @@ -291,7 +296,7 @@
 455         @-chmod 644 $(libdir)/$(LIB_NAME_FLEK_XML).a
 456         @if test -n "$(DSOEXT)"; then \
 457                 echo "Installing libflek_xml DSO library."; \
 458 -               if test $(DSO_FLEK_XML) = ../lib/$(DSO_NAME_FLEK_XML).so.1; then ext=.so; else ext=.s1; fi; \
 459 +               if test $(DSO_FLEK_XML) = $(DSO_NAME_FLEK_XML).so.1; then ext=.so; else ext=.s1; fi; \
 460                 rm -f $(libdir)/$(DSO_NAME_FLEK_XML)$$ext.1;\
 461                 rm -f $(libdir)/$(DSO_NAME_FLEK_XML)$$ext;\
 462                 cp $(DSO_FLEK_XML) $(libdir); \
 463 @@ -313,7 +318,7 @@
 464         @-chmod 644 $(libdir)/$(LIB_NAME_FLEK_JPEG).a
 465         @if test -n "$(DSOEXT)"; then \
 466                 echo "Installing libflek_jpeg DSO library."; \
 467 -               if test $(DSO_FLEK_JPEG) = ../lib/$(DSO_NAME_FLEK_JPEG).so.1; then ext=.so; else ext=.s1; fi; \
 468 +               if test $(DSO_FLEK_JPEG) = $(DSO_NAME_FLEK_JPEG).so.1; then ext=.so; else ext=.s1; fi; \
 469                 rm -f $(libdir)/$(DSO_NAME_FLEK_JPEG)$$ext.1;\
 470                 rm -f $(libdir)/$(DSO_NAME_FLEK_JPEG)$$ext;\
 471                 cp $(DSO_FLEK_JPEG) $(libdir); \
 472 diff -ur flek-0.3/src/pixmaps/calendar.xpm flek-0.3.1/src/pixmaps/calendar.xpm
 473 --- flek-0.3/src/pixmaps/calendar.xpm   2001-05-15 20:18:25.000000000 +0300
 474 +++ flek-0.3.1/src/pixmaps/calendar.xpm 2007-08-26 13:20:33.000000000 +0300
 475 @@ -1,5 +1,5 @@
 476  /* XPM */
 477 -static char * calendar_xpm[] = {
 478 +static const char * calendar_xpm[] = {
 479  "16 16 2 1",
 480  "      c None",
 481  ".     c #000000",
 482 diff -ur flek-0.3/src/pixmaps/dock_grip_tile.xpm flek-0.3.1/src/pixmaps/dock_grip_tile.xpm
 483 --- flek-0.3/src/pixmaps/dock_grip_tile.xpm     2001-05-15 20:18:25.000000000 +0300
 484 +++ flek-0.3.1/src/pixmaps/dock_grip_tile.xpm   2007-08-26 13:20:33.000000000 +0300
 485 @@ -1,5 +1,5 @@
 486  /* XPM */
 487 -static char * grip_tile_xpm[] = {
 488 +static const char * grip_tile_xpm[] = {
 489  "6 6 4 1",
 490  "      c None",
 491  ".     c #FCFEFC",
 492 diff -ur flek-0.3/src/pixmaps/stock_add.xpm flek-0.3.1/src/pixmaps/stock_add.xpm
 493 --- flek-0.3/src/pixmaps/stock_add.xpm  2001-05-15 20:18:25.000000000 +0300
 494 +++ flek-0.3.1/src/pixmaps/stock_add.xpm        2007-08-26 13:20:33.000000000 +0300
 495 @@ -1,5 +1,5 @@
 496  /* XPM */
 497 -static char *stock_add_xpm[] = {
 498 +static const char *stock_add_xpm[] = {
 499  /* columns rows colors chars-per-pixel */
 500  "24 24 29 1",
 501  "  c Gray0",
 502 diff -ur flek-0.3/src/pixmaps/stock_align_center.xpm flek-0.3.1/src/pixmaps/stock_align_center.xpm
 503 --- flek-0.3/src/pixmaps/stock_align_center.xpm 2001-05-15 20:18:25.000000000 +0300
 504 +++ flek-0.3.1/src/pixmaps/stock_align_center.xpm       2007-08-26 13:20:33.000000000 +0300
 505 @@ -1,5 +1,5 @@
 506  /* XPM */
 507 -static char *stock_align_center_xpm[] = {
 508 +static const char *stock_align_center_xpm[] = {
 509  /* columns rows colors chars-per-pixel */
 510  "24 24 2 1",
 511  "  c Gray0",
 512 diff -ur flek-0.3/src/pixmaps/stock_align_justify.xpm flek-0.3.1/src/pixmaps/stock_align_justify.xpm
 513 --- flek-0.3/src/pixmaps/stock_align_justify.xpm        2001-05-15 20:18:25.000000000 +0300
 514 +++ flek-0.3.1/src/pixmaps/stock_align_justify.xpm      2007-08-26 13:20:33.000000000 +0300
 515 @@ -1,5 +1,5 @@
 516  /* XPM */
 517 -static char *stock_align_justify_xpm[] = {
 518 +static const char *stock_align_justify_xpm[] = {
 519  /* columns rows colors chars-per-pixel */
 520  "24 24 2 1",
 521  "  c Gray0",
 522 diff -ur flek-0.3/src/pixmaps/stock_align_left.xpm flek-0.3.1/src/pixmaps/stock_align_left.xpm
 523 --- flek-0.3/src/pixmaps/stock_align_left.xpm   2001-05-15 20:18:25.000000000 +0300
 524 +++ flek-0.3.1/src/pixmaps/stock_align_left.xpm 2007-08-26 13:20:33.000000000 +0300
 525 @@ -1,5 +1,5 @@
 526  /* XPM */
 527 -static char *stock_align_left_xpm[] = {
 528 +static const char *stock_align_left_xpm[] = {
 529  /* columns rows colors chars-per-pixel */
 530  "24 24 2 1",
 531  "  c Gray0",
 532 diff -ur flek-0.3/src/pixmaps/stock_align_right.xpm flek-0.3.1/src/pixmaps/stock_align_right.xpm
 533 --- flek-0.3/src/pixmaps/stock_align_right.xpm  2001-05-15 20:18:25.000000000 +0300
 534 +++ flek-0.3.1/src/pixmaps/stock_align_right.xpm        2007-08-26 13:20:33.000000000 +0300
 535 @@ -1,5 +1,5 @@
 536  /* XPM */
 537 -static char *stock_align_right_xpm[] = {
 538 +static const char *stock_align_right_xpm[] = {
 539  /* columns rows colors chars-per-pixel */
 540  "24 24 2 1",
 541  "  c Gray0",
 542 diff -ur flek-0.3/src/pixmaps/stock_attach.xpm flek-0.3.1/src/pixmaps/stock_attach.xpm
 543 --- flek-0.3/src/pixmaps/stock_attach.xpm       2001-05-15 20:18:25.000000000 +0300
 544 +++ flek-0.3.1/src/pixmaps/stock_attach.xpm     2007-08-26 13:20:33.000000000 +0300
 545 @@ -1,5 +1,5 @@
 546  /* XPM */
 547 -static char *stock_attach_xpm[] = {
 548 +static const char *stock_attach_xpm[] = {
 549  /* columns rows colors chars-per-pixel */
 550  "24 24 3 1",
 551  "  c Gray0",
 552 diff -ur flek-0.3/src/pixmaps/stock_book_blue.xpm flek-0.3.1/src/pixmaps/stock_book_blue.xpm
 553 --- flek-0.3/src/pixmaps/stock_book_blue.xpm    2001-05-15 20:18:25.000000000 +0300
 554 +++ flek-0.3.1/src/pixmaps/stock_book_blue.xpm  2007-08-26 13:20:33.000000000 +0300
 555 @@ -1,5 +1,5 @@
 556  /* XPM */
 557 -static char *stock_book_blue_xpm[] = {
 558 +static const char *stock_book_blue_xpm[] = {
 559  /* columns rows colors chars-per-pixel */
 560  "24 24 28 1",
 561  "  c Gray0",
 562 diff -ur flek-0.3/src/pixmaps/stock_book_green.xpm flek-0.3.1/src/pixmaps/stock_book_green.xpm
 563 --- flek-0.3/src/pixmaps/stock_book_green.xpm   2001-05-15 20:18:25.000000000 +0300
 564 +++ flek-0.3.1/src/pixmaps/stock_book_green.xpm 2007-08-26 13:20:33.000000000 +0300
 565 @@ -1,5 +1,5 @@
 566  /* XPM */
 567 -static char *stock_book_green_xpm[] = {
 568 +static const char *stock_book_green_xpm[] = {
 569  /* columns rows colors chars-per-pixel */
 570  "24 24 28 1",
 571  "  c Gray0",
 572 diff -ur flek-0.3/src/pixmaps/stock_book_open.xpm flek-0.3.1/src/pixmaps/stock_book_open.xpm
 573 --- flek-0.3/src/pixmaps/stock_book_open.xpm    2001-05-15 20:18:25.000000000 +0300
 574 +++ flek-0.3.1/src/pixmaps/stock_book_open.xpm  2007-08-26 13:20:33.000000000 +0300
 575 @@ -1,5 +1,5 @@
 576  /* XPM */
 577 -static char *stock_book_open_xpm[] = {
 578 +static const char *stock_book_open_xpm[] = {
 579  /* columns rows colors chars-per-pixel */
 580  "24 24 64 1",
 581  "  c Gray0",
 582 diff -ur flek-0.3/src/pixmaps/stock_book_red.xpm flek-0.3.1/src/pixmaps/stock_book_red.xpm
 583 --- flek-0.3/src/pixmaps/stock_book_red.xpm     2001-05-15 20:18:25.000000000 +0300
 584 +++ flek-0.3.1/src/pixmaps/stock_book_red.xpm   2007-08-26 13:20:33.000000000 +0300
 585 @@ -1,5 +1,5 @@
 586  /* XPM */
 587 -static char *stock_book_red_xpm[] = {
 588 +static const char *stock_book_red_xpm[] = {
 589  /* columns rows colors chars-per-pixel */
 590  "24 24 28 1",
 591  "  c Gray0",
 592 diff -ur flek-0.3/src/pixmaps/stock_book_yellow.xpm flek-0.3.1/src/pixmaps/stock_book_yellow.xpm
 593 --- flek-0.3/src/pixmaps/stock_book_yellow.xpm  2001-05-15 20:18:25.000000000 +0300
 594 +++ flek-0.3.1/src/pixmaps/stock_book_yellow.xpm        2007-08-26 13:20:33.000000000 +0300
 595 @@ -1,5 +1,5 @@
 596  /* XPM */
 597 -static char *stock_book_yellow_xpm[] = {
 598 +static const char *stock_book_yellow_xpm[] = {
 599  /* columns rows colors chars-per-pixel */
 600  "24 24 28 1",
 601  "  c Gray0",
 602 diff -ur flek-0.3/src/pixmaps/stock_bottom.xpm flek-0.3.1/src/pixmaps/stock_bottom.xpm
 603 --- flek-0.3/src/pixmaps/stock_bottom.xpm       2001-05-15 20:18:25.000000000 +0300
 604 +++ flek-0.3.1/src/pixmaps/stock_bottom.xpm     2007-08-26 13:20:33.000000000 +0300
 605 @@ -1,5 +1,5 @@
 606  /* XPM */
 607 -static char *stock_bottom_xpm[] = {
 608 +static const char *stock_bottom_xpm[] = {
 609  /* columns rows colors chars-per-pixel */
 610  "24 24 91 1",
 611  "  c Gray0",
 612 diff -ur flek-0.3/src/pixmaps/stock_button_apply.xpm flek-0.3.1/src/pixmaps/stock_button_apply.xpm
 613 --- flek-0.3/src/pixmaps/stock_button_apply.xpm 2001-05-15 20:18:25.000000000 +0300
 614 +++ flek-0.3.1/src/pixmaps/stock_button_apply.xpm       2007-08-26 13:20:33.000000000 +0300
 615 @@ -1,5 +1,5 @@
 616  /* XPM */
 617 -static char *stock_button_apply_xpm[] = {
 618 +static const char *stock_button_apply_xpm[] = {
 619  /* columns rows colors chars-per-pixel */
 620  "20 20 18 1",
 621  "  c Gray0",
 622 diff -ur flek-0.3/src/pixmaps/stock_button_cancel.xpm flek-0.3.1/src/pixmaps/stock_button_cancel.xpm
 623 --- flek-0.3/src/pixmaps/stock_button_cancel.xpm        2001-05-15 20:18:25.000000000 +0300
 624 +++ flek-0.3.1/src/pixmaps/stock_button_cancel.xpm      2007-08-26 13:20:33.000000000 +0300
 625 @@ -1,5 +1,5 @@
 626  /* XPM */
 627 -static char *stock_button_cancel_xpm[] = {
 628 +static const char *stock_button_cancel_xpm[] = {
 629  /* columns rows colors chars-per-pixel */
 630  "20 20 8 1",
 631  "  c Gray0",
 632 diff -ur flek-0.3/src/pixmaps/stock_button_close.xpm flek-0.3.1/src/pixmaps/stock_button_close.xpm
 633 --- flek-0.3/src/pixmaps/stock_button_close.xpm 2001-05-15 20:18:25.000000000 +0300
 634 +++ flek-0.3.1/src/pixmaps/stock_button_close.xpm       2007-08-26 13:20:33.000000000 +0300
 635 @@ -1,5 +1,5 @@
 636  /* XPM */
 637 -static char *stock_button_close_xpm[] = {
 638 +static const char *stock_button_close_xpm[] = {
 639  /* columns rows colors chars-per-pixel */
 640  "20 20 2 1",
 641  "  c Gray0",
 642 diff -ur flek-0.3/src/pixmaps/stock_button_no.xpm flek-0.3.1/src/pixmaps/stock_button_no.xpm
 643 --- flek-0.3/src/pixmaps/stock_button_no.xpm    2001-05-15 20:18:25.000000000 +0300
 644 +++ flek-0.3.1/src/pixmaps/stock_button_no.xpm  2007-08-26 13:20:33.000000000 +0300
 645 @@ -1,5 +1,5 @@
 646  /* XPM */
 647 -static char *stock_button_no_xpm[] = {
 648 +static const char *stock_button_no_xpm[] = {
 649  /* columns rows colors chars-per-pixel */
 650  "20 20 187 2",
 651  "   c Gray0",
 652 diff -ur flek-0.3/src/pixmaps/stock_button_ok.xpm flek-0.3.1/src/pixmaps/stock_button_ok.xpm
 653 --- flek-0.3/src/pixmaps/stock_button_ok.xpm    2001-05-15 20:18:25.000000000 +0300
 654 +++ flek-0.3.1/src/pixmaps/stock_button_ok.xpm  2007-08-26 13:20:33.000000000 +0300
 655 @@ -1,5 +1,5 @@
 656  /* XPM */
 657 -static char *stock_button_ok_xpm[] = {
 658 +static const char *stock_button_ok_xpm[] = {
 659  /* columns rows colors chars-per-pixel */
 660  "20 20 47 1",
 661  "  c Gray0",
 662 diff -ur flek-0.3/src/pixmaps/stock_button_yes.xpm flek-0.3.1/src/pixmaps/stock_button_yes.xpm
 663 --- flek-0.3/src/pixmaps/stock_button_yes.xpm   2001-05-15 20:18:25.000000000 +0300
 664 +++ flek-0.3.1/src/pixmaps/stock_button_yes.xpm 2007-08-26 13:20:33.000000000 +0300
 665 @@ -1,5 +1,5 @@
 666  /* XPM */
 667 -static char *stock_button_yes_xpm[] = {
 668 +static const char *stock_button_yes_xpm[] = {
 669  /* columns rows colors chars-per-pixel */
 670  "20 20 188 2",
 671  "   c Gray0",
 672 diff -ur flek-0.3/src/pixmaps/stock_cdrom.xpm flek-0.3.1/src/pixmaps/stock_cdrom.xpm
 673 --- flek-0.3/src/pixmaps/stock_cdrom.xpm        2001-05-15 20:18:25.000000000 +0300
 674 +++ flek-0.3.1/src/pixmaps/stock_cdrom.xpm      2007-08-26 13:20:33.000000000 +0300
 675 @@ -1,5 +1,5 @@
 676  /* XPM */
 677 -static char *stock_cdrom_xpm[] = {
 678 +static const char *stock_cdrom_xpm[] = {
 679  /* columns rows colors chars-per-pixel */
 680  "24 24 138 2",
 681  "   c Gray0",
 682 diff -ur flek-0.3/src/pixmaps/stock_clear.xpm flek-0.3.1/src/pixmaps/stock_clear.xpm
 683 --- flek-0.3/src/pixmaps/stock_clear.xpm        2001-05-15 20:18:25.000000000 +0300
 684 +++ flek-0.3.1/src/pixmaps/stock_clear.xpm      2007-08-26 13:20:33.000000000 +0300
 685 @@ -1,5 +1,5 @@
 686  /* XPM */
 687 -static char *stock_clear_xpm[] = {
 688 +static const char *stock_clear_xpm[] = {
 689  /* columns rows colors chars-per-pixel */
 690  "24 24 87 1",
 691  "  c Gray0",
 692 diff -ur flek-0.3/src/pixmaps/stock_close.xpm flek-0.3.1/src/pixmaps/stock_close.xpm
 693 --- flek-0.3/src/pixmaps/stock_close.xpm        2001-05-15 20:18:25.000000000 +0300
 694 +++ flek-0.3.1/src/pixmaps/stock_close.xpm      2007-08-26 13:20:33.000000000 +0300
 695 @@ -1,5 +1,5 @@
 696  /* XPM */
 697 -static char *stock_close_xpm[] = {
 698 +static const char *stock_close_xpm[] = {
 699  /* columns rows colors chars-per-pixel */
 700  "24 24 2 1",
 701  "  c Gray0",
 702 diff -ur flek-0.3/src/pixmaps/stock_colorselector.xpm flek-0.3.1/src/pixmaps/stock_colorselector.xpm
 703 --- flek-0.3/src/pixmaps/stock_colorselector.xpm        2001-05-15 20:18:25.000000000 +0300
 704 +++ flek-0.3.1/src/pixmaps/stock_colorselector.xpm      2007-08-26 13:20:33.000000000 +0300
 705 @@ -1,5 +1,5 @@
 706  /* XPM */
 707 -static char *stock_colorselector_xpm[] = {
 708 +static const char *stock_colorselector_xpm[] = {
 709  /* columns rows colors chars-per-pixel */
 710  "24 24 25 1",
 711  "  c Gray0",
 712 diff -ur flek-0.3/src/pixmaps/stock_convert.xpm flek-0.3.1/src/pixmaps/stock_convert.xpm
 713 --- flek-0.3/src/pixmaps/stock_convert.xpm      2001-05-15 20:18:25.000000000 +0300
 714 +++ flek-0.3.1/src/pixmaps/stock_convert.xpm    2007-08-26 13:20:33.000000000 +0300
 715 @@ -1,5 +1,5 @@
 716  /* XPM */
 717 -static char *stock_convert_xpm[] = {
 718 +static const char *stock_convert_xpm[] = {
 719  /* columns rows colors chars-per-pixel */
 720  "24 24 27 1",
 721  "  c Gray0",
 722 diff -ur flek-0.3/src/pixmaps/stock_copy.xpm flek-0.3.1/src/pixmaps/stock_copy.xpm
 723 --- flek-0.3/src/pixmaps/stock_copy.xpm 2001-05-15 20:18:25.000000000 +0300
 724 +++ flek-0.3.1/src/pixmaps/stock_copy.xpm       2007-08-26 13:20:33.000000000 +0300
 725 @@ -1,5 +1,5 @@
 726  /* XPM */
 727 -static char *stock_copy_xpm[] = {
 728 +static const char *stock_copy_xpm[] = {
 729  /* columns rows colors chars-per-pixel */
 730  "24 24 54 1",
 731  "  c Gray0",
 732 diff -ur flek-0.3/src/pixmaps/stock_cut.xpm flek-0.3.1/src/pixmaps/stock_cut.xpm
 733 --- flek-0.3/src/pixmaps/stock_cut.xpm  2001-05-15 20:18:25.000000000 +0300
 734 +++ flek-0.3.1/src/pixmaps/stock_cut.xpm        2007-08-26 13:20:33.000000000 +0300
 735 @@ -1,5 +1,5 @@
 736  /* XPM */
 737 -static char *stock_cut_xpm[] = {
 738 +static const char *stock_cut_xpm[] = {
 739  /* columns rows colors chars-per-pixel */
 740  "24 24 2 1",
 741  "  c Gray0",
 742 diff -ur flek-0.3/src/pixmaps/stock_down_arrow.xpm flek-0.3.1/src/pixmaps/stock_down_arrow.xpm
 743 --- flek-0.3/src/pixmaps/stock_down_arrow.xpm   2001-05-15 20:18:25.000000000 +0300
 744 +++ flek-0.3.1/src/pixmaps/stock_down_arrow.xpm 2007-08-26 13:20:33.000000000 +0300
 745 @@ -1,5 +1,5 @@
 746  /* XPM */
 747 -static char *stock_down_arrow_xpm[] = {
 748 +static const char *stock_down_arrow_xpm[] = {
 749  /* columns rows colors chars-per-pixel */
 750  "24 24 72 1",
 751  "  c Gray0",
 752 diff -ur flek-0.3/src/pixmaps/stock_exec.xpm flek-0.3.1/src/pixmaps/stock_exec.xpm
 753 --- flek-0.3/src/pixmaps/stock_exec.xpm 2001-05-15 20:18:25.000000000 +0300
 754 +++ flek-0.3.1/src/pixmaps/stock_exec.xpm       2007-08-26 13:20:33.000000000 +0300
 755 @@ -1,5 +1,5 @@
 756  /* XPM */
 757 -static char *stock_exec_xpm[] = {
 758 +static const char *stock_exec_xpm[] = {
 759  /* columns rows colors chars-per-pixel */
 760  "24 24 81 1",
 761  "  c Gray0",
 762 diff -ur flek-0.3/src/pixmaps/stock_exit.xpm flek-0.3.1/src/pixmaps/stock_exit.xpm
 763 --- flek-0.3/src/pixmaps/stock_exit.xpm 2001-05-15 20:18:25.000000000 +0300
 764 +++ flek-0.3.1/src/pixmaps/stock_exit.xpm       2007-08-26 13:20:34.000000000 +0300
 765 @@ -1,5 +1,5 @@
 766  /* XPM */
 767 -static char *stock_exit_xpm[] = {
 768 +static const char *stock_exit_xpm[] = {
 769  /* columns rows colors chars-per-pixel */
 770  "20 20 13 1",
 771  "  c Gray0",
 772 diff -ur flek-0.3/src/pixmaps/stock_first.xpm flek-0.3.1/src/pixmaps/stock_first.xpm
 773 --- flek-0.3/src/pixmaps/stock_first.xpm        2001-05-15 20:18:25.000000000 +0300
 774 +++ flek-0.3.1/src/pixmaps/stock_first.xpm      2007-08-26 13:20:34.000000000 +0300
 775 @@ -1,5 +1,5 @@
 776  /* XPM */
 777 -static char *stock_first_xpm[] = {
 778 +static const char *stock_first_xpm[] = {
 779  /* columns rows colors chars-per-pixel */
 780  "24 24 41 1",
 781  "  c Gray0",
 782 diff -ur flek-0.3/src/pixmaps/stock_font.xpm flek-0.3.1/src/pixmaps/stock_font.xpm
 783 --- flek-0.3/src/pixmaps/stock_font.xpm 2001-05-15 20:18:25.000000000 +0300
 784 +++ flek-0.3.1/src/pixmaps/stock_font.xpm       2007-08-26 13:20:34.000000000 +0300
 785 @@ -1,5 +1,5 @@
 786  /* XPM */
 787 -static char *stock_font_xpm[] = {
 788 +static const char *stock_font_xpm[] = {
 789  /* columns rows colors chars-per-pixel */
 790  "24 24 26 1",
 791  "  c Gray0",
 792 diff -ur flek-0.3/src/pixmaps/stock_help.xpm flek-0.3.1/src/pixmaps/stock_help.xpm
 793 --- flek-0.3/src/pixmaps/stock_help.xpm 2001-05-15 20:18:25.000000000 +0300
 794 +++ flek-0.3.1/src/pixmaps/stock_help.xpm       2007-08-26 13:20:34.000000000 +0300
 795 @@ -1,5 +1,5 @@
 796  /* XPM */
 797 -static char *stock_help_xpm[] = {
 798 +static const char *stock_help_xpm[] = {
 799  /* columns rows colors chars-per-pixel */
 800  "24 24 20 1",
 801  "  c Gray0",
 802 diff -ur flek-0.3/src/pixmaps/stock_home.xpm flek-0.3.1/src/pixmaps/stock_home.xpm
 803 --- flek-0.3/src/pixmaps/stock_home.xpm 2001-05-15 20:18:25.000000000 +0300
 804 +++ flek-0.3.1/src/pixmaps/stock_home.xpm       2007-08-26 13:20:34.000000000 +0300
 805 @@ -1,5 +1,5 @@
 806  /* XPM */
 807 -static char *stock_home_xpm[] = {
 808 +static const char *stock_home_xpm[] = {
 809  /* columns rows colors chars-per-pixel */
 810  "24 24 27 1",
 811  "  c Gray0",
 812 diff -ur flek-0.3/src/pixmaps/stock_index.xpm flek-0.3.1/src/pixmaps/stock_index.xpm
 813 --- flek-0.3/src/pixmaps/stock_index.xpm        2001-05-15 20:18:25.000000000 +0300
 814 +++ flek-0.3.1/src/pixmaps/stock_index.xpm      2007-08-26 13:20:34.000000000 +0300
 815 @@ -1,5 +1,5 @@
 816  /* XPM */
 817 -static char *stock_index_xpm[] = {
 818 +static const char *stock_index_xpm[] = {
 819  /* columns rows colors chars-per-pixel */
 820  "24 24 21 1",
 821  "  c Gray0",
 822 diff -ur flek-0.3/src/pixmaps/stock_jump_to.xpm flek-0.3.1/src/pixmaps/stock_jump_to.xpm
 823 --- flek-0.3/src/pixmaps/stock_jump_to.xpm      2001-05-15 20:18:25.000000000 +0300
 824 +++ flek-0.3.1/src/pixmaps/stock_jump_to.xpm    2007-08-26 13:20:34.000000000 +0300
 825 @@ -1,5 +1,5 @@
 826  /* XPM */
 827 -static char *stock_jump_to_xpm[] = {
 828 +static const char *stock_jump_to_xpm[] = {
 829  /* columns rows colors chars-per-pixel */
 830  "24 24 41 1",
 831  "  c Gray0",
 832 diff -ur flek-0.3/src/pixmaps/stock_last.xpm flek-0.3.1/src/pixmaps/stock_last.xpm
 833 --- flek-0.3/src/pixmaps/stock_last.xpm 2001-05-15 20:18:25.000000000 +0300
 834 +++ flek-0.3.1/src/pixmaps/stock_last.xpm       2007-08-26 13:20:34.000000000 +0300
 835 @@ -1,5 +1,5 @@
 836  /* XPM */
 837 -static char *stock_last_xpm[] = {
 838 +static const char *stock_last_xpm[] = {
 839  /* columns rows colors chars-per-pixel */
 840  "24 24 48 1",
 841  "  c Gray0",
 842 diff -ur flek-0.3/src/pixmaps/stock_left_arrow.xpm flek-0.3.1/src/pixmaps/stock_left_arrow.xpm
 843 --- flek-0.3/src/pixmaps/stock_left_arrow.xpm   2001-05-15 20:18:25.000000000 +0300
 844 +++ flek-0.3.1/src/pixmaps/stock_left_arrow.xpm 2007-08-26 13:20:34.000000000 +0300
 845 @@ -1,5 +1,5 @@
 846  /* XPM */
 847 -static char *stock_left_arrow_xpm[] = {
 848 +static const char *stock_left_arrow_xpm[] = {
 849  /* columns rows colors chars-per-pixel */
 850  "24 25 42 1",
 851  "  c Gray0",
 852 diff -ur flek-0.3/src/pixmaps/stock_line_in.xpm flek-0.3.1/src/pixmaps/stock_line_in.xpm
 853 --- flek-0.3/src/pixmaps/stock_line_in.xpm      2001-05-15 20:18:25.000000000 +0300
 854 +++ flek-0.3.1/src/pixmaps/stock_line_in.xpm    2007-08-26 13:20:34.000000000 +0300
 855 @@ -1,5 +1,5 @@
 856  /* XPM */
 857 -static char *stock_line_in_xpm[] = {
 858 +static const char *stock_line_in_xpm[] = {
 859  /* columns rows colors chars-per-pixel */
 860  "24 24 16 1",
 861  "  c Gray0",
 862 diff -ur flek-0.3/src/pixmaps/stock_mail_compose.xpm flek-0.3.1/src/pixmaps/stock_mail_compose.xpm
 863 --- flek-0.3/src/pixmaps/stock_mail_compose.xpm 2001-05-15 20:18:25.000000000 +0300
 864 +++ flek-0.3.1/src/pixmaps/stock_mail_compose.xpm       2007-08-26 13:20:34.000000000 +0300
 865 @@ -1,5 +1,5 @@
 866  /* XPM */
 867 -static char *stock_mail_compose_xpm[] = {
 868 +static const char *stock_mail_compose_xpm[] = {
 869  /* columns rows colors chars-per-pixel */
 870  "24 24 117 2",
 871  "   c Gray0",
 872 diff -ur flek-0.3/src/pixmaps/stock_mail_forward.xpm flek-0.3.1/src/pixmaps/stock_mail_forward.xpm
 873 --- flek-0.3/src/pixmaps/stock_mail_forward.xpm 2001-05-15 20:18:25.000000000 +0300
 874 +++ flek-0.3.1/src/pixmaps/stock_mail_forward.xpm       2007-08-26 13:20:34.000000000 +0300
 875 @@ -1,5 +1,5 @@
 876  /* XPM */
 877 -static char *stock_mail_forward_xpm[] = {
 878 +static const char *stock_mail_forward_xpm[] = {
 879  /* columns rows colors chars-per-pixel */
 880  "24 24 126 2",
 881  "   c Gray0",
 882 diff -ur flek-0.3/src/pixmaps/stock_mail_receive.xpm flek-0.3.1/src/pixmaps/stock_mail_receive.xpm
 883 --- flek-0.3/src/pixmaps/stock_mail_receive.xpm 2001-05-15 20:18:25.000000000 +0300
 884 +++ flek-0.3.1/src/pixmaps/stock_mail_receive.xpm       2007-08-26 13:20:34.000000000 +0300
 885 @@ -1,5 +1,5 @@
 886  /* XPM */
 887 -static char *stock_mail_receive_xpm[] = {
 888 +static const char *stock_mail_receive_xpm[] = {
 889  /* columns rows colors chars-per-pixel */
 890  "24 24 148 2",
 891  "   c Gray0",
 892 diff -ur flek-0.3/src/pixmaps/stock_mail_reply.xpm flek-0.3.1/src/pixmaps/stock_mail_reply.xpm
 893 --- flek-0.3/src/pixmaps/stock_mail_reply.xpm   2001-05-15 20:18:25.000000000 +0300
 894 +++ flek-0.3.1/src/pixmaps/stock_mail_reply.xpm 2007-08-26 13:20:34.000000000 +0300
 895 @@ -1,5 +1,5 @@
 896  /* XPM */
 897 -static char *stock_mail_reply_xpm[] = {
 898 +static const char *stock_mail_reply_xpm[] = {
 899  /* columns rows colors chars-per-pixel */
 900  "24 24 127 2",
 901  "   c Gray0",
 902 diff -ur flek-0.3/src/pixmaps/stock_mail_send.xpm flek-0.3.1/src/pixmaps/stock_mail_send.xpm
 903 --- flek-0.3/src/pixmaps/stock_mail_send.xpm    2001-05-15 20:18:25.000000000 +0300
 904 +++ flek-0.3.1/src/pixmaps/stock_mail_send.xpm  2007-08-26 13:20:34.000000000 +0300
 905 @@ -1,5 +1,5 @@
 906  /* XPM */
 907 -static char *stock_mail_send_xpm[] = {
 908 +static const char *stock_mail_send_xpm[] = {
 909  /* columns rows colors chars-per-pixel */
 910  "24 24 135 2",
 911  "   c Gray0",
 912 diff -ur flek-0.3/src/pixmaps/stock_mail.xpm flek-0.3.1/src/pixmaps/stock_mail.xpm
 913 --- flek-0.3/src/pixmaps/stock_mail.xpm 2001-05-15 20:18:25.000000000 +0300
 914 +++ flek-0.3.1/src/pixmaps/stock_mail.xpm       2007-08-26 13:20:34.000000000 +0300
 915 @@ -1,5 +1,5 @@
 916  /* XPM */
 917 -static char *stock_mail_xpm[] = {
 918 +static const char *stock_mail_xpm[] = {
 919  /* columns rows colors chars-per-pixel */
 920  "24 24 116 2",
 921  "   c Gray0",
 922 diff -ur flek-0.3/src/pixmaps/stock_menu_about.xpm flek-0.3.1/src/pixmaps/stock_menu_about.xpm
 923 --- flek-0.3/src/pixmaps/stock_menu_about.xpm   2001-05-15 20:18:25.000000000 +0300
 924 +++ flek-0.3.1/src/pixmaps/stock_menu_about.xpm 2007-08-26 13:20:34.000000000 +0300
 925 @@ -1,5 +1,5 @@
 926  /* XPM */
 927 -static char *stock_menu_about_xpm[] = {
 928 +static const char *stock_menu_about_xpm[] = {
 929  /* columns rows colors chars-per-pixel */
 930  "16 16 53 1",
 931  "  c Gray0",
 932 diff -ur flek-0.3/src/pixmaps/stock_menu_blank.xpm flek-0.3.1/src/pixmaps/stock_menu_blank.xpm
 933 --- flek-0.3/src/pixmaps/stock_menu_blank.xpm   2001-05-15 20:18:25.000000000 +0300
 934 +++ flek-0.3.1/src/pixmaps/stock_menu_blank.xpm 2007-08-26 13:20:34.000000000 +0300
 935 @@ -1,5 +1,5 @@
 936  /* XPM */
 937 -static char *stock_menu_blank_xpm[] = {
 938 +static const char *stock_menu_blank_xpm[] = {
 939  /* columns rows colors chars-per-pixel */
 940  "16 16 2 1",
 941  "  c Gray0",
 942 diff -ur flek-0.3/src/pixmaps/stock_menu_scores.xpm flek-0.3.1/src/pixmaps/stock_menu_scores.xpm
 943 --- flek-0.3/src/pixmaps/stock_menu_scores.xpm  2001-05-15 20:18:25.000000000 +0300
 944 +++ flek-0.3.1/src/pixmaps/stock_menu_scores.xpm        2007-08-26 13:20:34.000000000 +0300
 945 @@ -1,5 +1,5 @@
 946  /* XPM */
 947 -static char *stock_menu_scores_xpm[] = {
 948 +static const char *stock_menu_scores_xpm[] = {
 949  /* columns rows colors chars-per-pixel */
 950  "20 20 3 1",
 951  "  c Gray0",
 952 diff -ur flek-0.3/src/pixmaps/stock_mic.xpm flek-0.3.1/src/pixmaps/stock_mic.xpm
 953 --- flek-0.3/src/pixmaps/stock_mic.xpm  2001-05-15 20:18:25.000000000 +0300
 954 +++ flek-0.3.1/src/pixmaps/stock_mic.xpm        2007-08-26 13:20:34.000000000 +0300
 955 @@ -1,5 +1,5 @@
 956  /* XPM */
 957 -static char *stock_mic_xpm[] = {
 958 +static const char *stock_mic_xpm[] = {
 959  /* columns rows colors chars-per-pixel */
 960  "24 24 28 1",
 961  "  c Gray0",
 962 diff -ur flek-0.3/src/pixmaps/stock_midi.xpm flek-0.3.1/src/pixmaps/stock_midi.xpm
 963 --- flek-0.3/src/pixmaps/stock_midi.xpm 2001-05-15 20:18:25.000000000 +0300
 964 +++ flek-0.3.1/src/pixmaps/stock_midi.xpm       2007-08-26 13:20:34.000000000 +0300
 965 @@ -1,5 +1,5 @@
 966  /* XPM */
 967 -static char *stock_midi_xpm[] = {
 968 +static const char *stock_midi_xpm[] = {
 969  /* columns rows colors chars-per-pixel */
 970  "24 24 25 1",
 971  "  c Gray0",
 972 diff -ur flek-0.3/src/pixmaps/stock_multiple_file.xpm flek-0.3.1/src/pixmaps/stock_multiple_file.xpm
 973 --- flek-0.3/src/pixmaps/stock_multiple_file.xpm        2001-05-15 20:18:25.000000000 +0300
 974 +++ flek-0.3.1/src/pixmaps/stock_multiple_file.xpm      2007-08-26 13:20:34.000000000 +0300
 975 @@ -1,5 +1,5 @@
 976  /* XPM */
 977 -static char *stock_multiple_file_xpm[] = {
 978 +static const char *stock_multiple_file_xpm[] = {
 979  /* columns rows colors chars-per-pixel */
 980  "32 32 246 2",
 981  "   c Gray0",
 982 diff -ur flek-0.3/src/pixmaps/stock_new.xpm flek-0.3.1/src/pixmaps/stock_new.xpm
 983 --- flek-0.3/src/pixmaps/stock_new.xpm  2001-05-15 20:18:25.000000000 +0300
 984 +++ flek-0.3.1/src/pixmaps/stock_new.xpm        2007-08-26 13:20:34.000000000 +0300
 985 @@ -1,5 +1,5 @@
 986  /* XPM */
 987 -static char *stock_new_xpm[] = {
 988 +static const char *stock_new_xpm[] = {
 989  /* columns rows colors chars-per-pixel */
 990  "24 24 89 1",
 991  "  c Gray0",
 992 diff -ur flek-0.3/src/pixmaps/stock_not.xpm flek-0.3.1/src/pixmaps/stock_not.xpm
 993 --- flek-0.3/src/pixmaps/stock_not.xpm  2001-05-15 20:18:25.000000000 +0300
 994 +++ flek-0.3.1/src/pixmaps/stock_not.xpm        2007-08-26 13:20:34.000000000 +0300
 995 @@ -1,5 +1,5 @@
 996  /* XPM */
 997 -static char *stock_not_xpm[] = {
 998 +static const char *stock_not_xpm[] = {
 999  /* columns rows colors chars-per-pixel */
1000  "20 20 3 1",
1001  "  c Gray0",
1002 diff -ur flek-0.3/src/pixmaps/stock_open.xpm flek-0.3.1/src/pixmaps/stock_open.xpm
1003 --- flek-0.3/src/pixmaps/stock_open.xpm 2001-05-15 20:18:25.000000000 +0300
1004 +++ flek-0.3.1/src/pixmaps/stock_open.xpm       2007-08-26 13:20:34.000000000 +0300
1005 @@ -1,5 +1,5 @@
1006  /* XPM */
1007 -static char *stock_open_xpm[] = {
1008 +static const char *stock_open_xpm[] = {
1009  /* columns rows colors chars-per-pixel */
1010  "24 24 5 1",
1011  "  c Gray0",
1012 diff -ur flek-0.3/src/pixmaps/stock_paste.xpm flek-0.3.1/src/pixmaps/stock_paste.xpm
1013 --- flek-0.3/src/pixmaps/stock_paste.xpm        2001-05-15 20:18:25.000000000 +0300
1014 +++ flek-0.3.1/src/pixmaps/stock_paste.xpm      2007-08-26 13:20:34.000000000 +0300
1015 @@ -1,5 +1,5 @@
1016  /* XPM */
1017 -static char *stock_paste_xpm[] = {
1018 +static const char *stock_paste_xpm[] = {
1019  /* columns rows colors chars-per-pixel */
1020  "24 24 105 2",
1021  "   c Gray0",
1022 diff -ur flek-0.3/src/pixmaps/stock_preferences.xpm flek-0.3.1/src/pixmaps/stock_preferences.xpm
1023 --- flek-0.3/src/pixmaps/stock_preferences.xpm  2001-05-15 20:18:25.000000000 +0300
1024 +++ flek-0.3.1/src/pixmaps/stock_preferences.xpm        2007-08-26 13:20:34.000000000 +0300
1025 @@ -1,5 +1,5 @@
1026  /* XPM */
1027 -static char *stock_preferences_xpm[] = {
1028 +static const char *stock_preferences_xpm[] = {
1029  /* columns rows colors chars-per-pixel */
1030  "24 24 53 1",
1031  "  c Gray0",
1032 diff -ur flek-0.3/src/pixmaps/stock_print.xpm flek-0.3.1/src/pixmaps/stock_print.xpm
1033 --- flek-0.3/src/pixmaps/stock_print.xpm        2001-05-15 20:18:25.000000000 +0300
1034 +++ flek-0.3.1/src/pixmaps/stock_print.xpm      2007-08-26 13:20:34.000000000 +0300
1035 @@ -1,5 +1,5 @@
1036  /* XPM */
1037 -static char *stock_print_xpm[] = {
1038 +static const char *stock_print_xpm[] = {
1039  /* columns rows colors chars-per-pixel */
1040  "24 24 153 2",
1041  "   c Gray0",
1042 diff -ur flek-0.3/src/pixmaps/stock_properties.xpm flek-0.3.1/src/pixmaps/stock_properties.xpm
1043 --- flek-0.3/src/pixmaps/stock_properties.xpm   2001-05-15 20:18:25.000000000 +0300
1044 +++ flek-0.3.1/src/pixmaps/stock_properties.xpm 2007-08-26 13:20:34.000000000 +0300
1045 @@ -1,5 +1,5 @@
1046  /* XPM */
1047 -static char *stock_properties_xpm[] = {
1048 +static const char *stock_properties_xpm[] = {
1049  /* columns rows colors chars-per-pixel */
1050  "24 24 113 2",
1051  "   c Gray0",
1052 diff -ur flek-0.3/src/pixmaps/stock_redo.xpm flek-0.3.1/src/pixmaps/stock_redo.xpm
1053 --- flek-0.3/src/pixmaps/stock_redo.xpm 2001-05-15 20:18:25.000000000 +0300
1054 +++ flek-0.3.1/src/pixmaps/stock_redo.xpm       2007-08-26 13:20:34.000000000 +0300
1055 @@ -1,5 +1,5 @@
1056  /* XPM */
1057 -static char *stock_redo_xpm[] = {
1058 +static const char *stock_redo_xpm[] = {
1059  /* columns rows colors chars-per-pixel */
1060  "24 24 8 1",
1061  "  c Gray0",
1062 diff -ur flek-0.3/src/pixmaps/stock_refresh.xpm flek-0.3.1/src/pixmaps/stock_refresh.xpm
1063 --- flek-0.3/src/pixmaps/stock_refresh.xpm      2001-05-15 20:18:25.000000000 +0300
1064 +++ flek-0.3.1/src/pixmaps/stock_refresh.xpm    2007-08-26 13:20:34.000000000 +0300
1065 @@ -1,5 +1,5 @@
1066  /* XPM */
1067 -static char *stock_refresh_xpm[] = {
1068 +static const char *stock_refresh_xpm[] = {
1069  /* columns rows colors chars-per-pixel */
1070  "24 24 11 1",
1071  "  c Gray0",
1072 diff -ur flek-0.3/src/pixmaps/stock_remove.xpm flek-0.3.1/src/pixmaps/stock_remove.xpm
1073 --- flek-0.3/src/pixmaps/stock_remove.xpm       2001-05-15 20:18:25.000000000 +0300
1074 +++ flek-0.3.1/src/pixmaps/stock_remove.xpm     2007-08-26 13:20:34.000000000 +0300
1075 @@ -1,5 +1,5 @@
1076  /* XPM */
1077 -static char *stock_remove_xpm[] = {
1078 +static const char *stock_remove_xpm[] = {
1079  /* columns rows colors chars-per-pixel */
1080  "24 24 30 1",
1081  "  c Gray0",
1082 diff -ur flek-0.3/src/pixmaps/stock_revert.xpm flek-0.3.1/src/pixmaps/stock_revert.xpm
1083 --- flek-0.3/src/pixmaps/stock_revert.xpm       2001-05-15 20:18:25.000000000 +0300
1084 +++ flek-0.3.1/src/pixmaps/stock_revert.xpm     2007-08-26 13:20:34.000000000 +0300
1085 @@ -1,5 +1,5 @@
1086  /* XPM */
1087 -static char *stock_revert_xpm[] = {
1088 +static const char *stock_revert_xpm[] = {
1089  /* columns rows colors chars-per-pixel */
1090  "24 24 62 1",
1091  "  c Gray0",
1092 diff -ur flek-0.3/src/pixmaps/stock_right_arrow.xpm flek-0.3.1/src/pixmaps/stock_right_arrow.xpm
1093 --- flek-0.3/src/pixmaps/stock_right_arrow.xpm  2001-05-15 20:18:25.000000000 +0300
1094 +++ flek-0.3.1/src/pixmaps/stock_right_arrow.xpm        2007-08-26 13:20:34.000000000 +0300
1095 @@ -1,5 +1,5 @@
1096  /* XPM */
1097 -static char *stock_right_arrow_xpm[] = {
1098 +static const char *stock_right_arrow_xpm[] = {
1099  /* columns rows colors chars-per-pixel */
1100  "24 24 49 1",
1101  "  c Gray0",
1102 diff -ur flek-0.3/src/pixmaps/stock_save_as.xpm flek-0.3.1/src/pixmaps/stock_save_as.xpm
1103 --- flek-0.3/src/pixmaps/stock_save_as.xpm      2001-05-15 20:18:25.000000000 +0300
1104 +++ flek-0.3.1/src/pixmaps/stock_save_as.xpm    2007-08-26 13:20:34.000000000 +0300
1105 @@ -1,5 +1,5 @@
1106  /* XPM */
1107 -static char *stock_save_as_xpm[] = {
1108 +static const char *stock_save_as_xpm[] = {
1109  /* columns rows colors chars-per-pixel */
1110  "24 24 66 1",
1111  "  c Gray0",
1112 diff -ur flek-0.3/src/pixmaps/stock_save.xpm flek-0.3.1/src/pixmaps/stock_save.xpm
1113 --- flek-0.3/src/pixmaps/stock_save.xpm 2001-05-15 20:18:25.000000000 +0300
1114 +++ flek-0.3.1/src/pixmaps/stock_save.xpm       2007-08-26 13:20:34.000000000 +0300
1115 @@ -1,5 +1,5 @@
1116  /* XPM */
1117 -static char *stock_save_xpm[] = {
1118 +static const char *stock_save_xpm[] = {
1119  /* columns rows colors chars-per-pixel */
1120  "24 24 64 1",
1121  "  c Gray0",
1122 diff -ur flek-0.3/src/pixmaps/stock_scores.xpm flek-0.3.1/src/pixmaps/stock_scores.xpm
1123 --- flek-0.3/src/pixmaps/stock_scores.xpm       2001-05-15 20:18:25.000000000 +0300
1124 +++ flek-0.3.1/src/pixmaps/stock_scores.xpm     2007-08-26 13:20:34.000000000 +0300
1125 @@ -1,5 +1,5 @@
1126  /* XPM */
1127 -static char *stock_scores_xpm[] = {
1128 +static const char *stock_scores_xpm[] = {
1129  /* columns rows colors chars-per-pixel */
1130  "20 20 3 1",
1131  "  c Gray0",
1132 diff -ur flek-0.3/src/pixmaps/stock_search_replace.xpm flek-0.3.1/src/pixmaps/stock_search_replace.xpm
1133 --- flek-0.3/src/pixmaps/stock_search_replace.xpm       2001-05-15 20:18:25.000000000 +0300
1134 +++ flek-0.3.1/src/pixmaps/stock_search_replace.xpm     2007-08-26 13:20:34.000000000 +0300
1135 @@ -1,5 +1,5 @@
1136  /* XPM */
1137 -static char *stock_search_replace_xpm[] = {
1138 +static const char *stock_search_replace_xpm[] = {
1139  /* columns rows colors chars-per-pixel */
1140  "24 24 126 2",
1141  "   c Gray0",
1142 diff -ur flek-0.3/src/pixmaps/stock_search.xpm flek-0.3.1/src/pixmaps/stock_search.xpm
1143 --- flek-0.3/src/pixmaps/stock_search.xpm       2001-05-15 20:18:25.000000000 +0300
1144 +++ flek-0.3.1/src/pixmaps/stock_search.xpm     2007-08-26 13:20:34.000000000 +0300
1145 @@ -1,5 +1,5 @@
1146  /* XPM */
1147 -static char *stock_search_xpm[] = {
1148 +static const char *stock_search_xpm[] = {
1149  /* columns rows colors chars-per-pixel */
1150  "24 24 128 2",
1151  "   c Gray0",
1152 diff -ur flek-0.3/src/pixmaps/stock_spellcheck.xpm flek-0.3.1/src/pixmaps/stock_spellcheck.xpm
1153 --- flek-0.3/src/pixmaps/stock_spellcheck.xpm   2001-05-15 20:18:25.000000000 +0300
1154 +++ flek-0.3.1/src/pixmaps/stock_spellcheck.xpm 2007-08-26 13:20:34.000000000 +0300
1155 @@ -1,5 +1,5 @@
1156  /* XPM */
1157 -static char *stock_spellcheck_xpm[] = {
1158 +static const char *stock_spellcheck_xpm[] = {
1159  /* columns rows colors chars-per-pixel */
1160  "24 24 10 1",
1161  "  c Gray0",
1162 diff -ur flek-0.3/src/pixmaps/stock_stop.xpm flek-0.3.1/src/pixmaps/stock_stop.xpm
1163 --- flek-0.3/src/pixmaps/stock_stop.xpm 2001-05-15 20:18:25.000000000 +0300
1164 +++ flek-0.3.1/src/pixmaps/stock_stop.xpm       2007-08-26 13:20:34.000000000 +0300
1165 @@ -1,5 +1,5 @@
1166  /* XPM */
1167 -static char *stock_stop_xpm[] = {
1168 +static const char *stock_stop_xpm[] = {
1169  /* columns rows colors chars-per-pixel */
1170  "24 24 167 2",
1171  "   c Gray0",
1172 diff -ur flek-0.3/src/pixmaps/stock_table_borders.xpm flek-0.3.1/src/pixmaps/stock_table_borders.xpm
1173 --- flek-0.3/src/pixmaps/stock_table_borders.xpm        2001-05-15 20:18:25.000000000 +0300
1174 +++ flek-0.3.1/src/pixmaps/stock_table_borders.xpm      2007-08-26 13:20:34.000000000 +0300
1175 @@ -1,5 +1,5 @@
1176  /* XPM */
1177 -static char *stock_table_borders_xpm[] = {
1178 +static const char *stock_table_borders_xpm[] = {
1179  /* columns rows colors chars-per-pixel */
1180  "24 24 2 1",
1181  "  c Gray0",
1182 diff -ur flek-0.3/src/pixmaps/stock_table_fill.xpm flek-0.3.1/src/pixmaps/stock_table_fill.xpm
1183 --- flek-0.3/src/pixmaps/stock_table_fill.xpm   2001-05-15 20:18:25.000000000 +0300
1184 +++ flek-0.3.1/src/pixmaps/stock_table_fill.xpm 2007-08-26 13:20:34.000000000 +0300
1185 @@ -1,5 +1,5 @@
1186  /* XPM */
1187 -static char *stock_table_fill_xpm[] = {
1188 +static const char *stock_table_fill_xpm[] = {
1189  /* columns rows colors chars-per-pixel */
1190  "24 24 51 1",
1191  "  c Gray0",
1192 diff -ur flek-0.3/src/pixmaps/stock_text_bold.xpm flek-0.3.1/src/pixmaps/stock_text_bold.xpm
1193 --- flek-0.3/src/pixmaps/stock_text_bold.xpm    2001-05-15 20:18:25.000000000 +0300
1194 +++ flek-0.3.1/src/pixmaps/stock_text_bold.xpm  2007-08-26 13:20:34.000000000 +0300
1195 @@ -1,5 +1,5 @@
1196  /* XPM */
1197 -static char *stock_text_bold_xpm[] = {
1198 +static const char *stock_text_bold_xpm[] = {
1199  /* columns rows colors chars-per-pixel */
1200  "24 24 2 1",
1201  "  c Gray0",
1202 diff -ur flek-0.3/src/pixmaps/stock_text_bulleted_list.xpm flek-0.3.1/src/pixmaps/stock_text_bulleted_list.xpm
1203 --- flek-0.3/src/pixmaps/stock_text_bulleted_list.xpm   2001-05-15 20:18:25.000000000 +0300
1204 +++ flek-0.3.1/src/pixmaps/stock_text_bulleted_list.xpm 2007-08-26 13:20:34.000000000 +0300
1205 @@ -1,5 +1,5 @@
1206  /* XPM */
1207 -static char *stock_text_bulleted_list_xpm[] = {
1208 +static const char *stock_text_bulleted_list_xpm[] = {
1209  /* columns rows colors chars-per-pixel */
1210  "24 24 2 1",
1211  "  c Gray0",
1212 diff -ur flek-0.3/src/pixmaps/stock_text_indent.xpm flek-0.3.1/src/pixmaps/stock_text_indent.xpm
1213 --- flek-0.3/src/pixmaps/stock_text_indent.xpm  2001-05-15 20:18:25.000000000 +0300
1214 +++ flek-0.3.1/src/pixmaps/stock_text_indent.xpm        2007-08-26 13:20:34.000000000 +0300
1215 @@ -1,5 +1,5 @@
1216  /* XPM */
1217 -static char *stock_text_indent_xpm[] = {
1218 +static const char *stock_text_indent_xpm[] = {
1219  /* columns rows colors chars-per-pixel */
1220  "24 24 2 1",
1221  "  c Gray0",
1222 diff -ur flek-0.3/src/pixmaps/stock_text_italic.xpm flek-0.3.1/src/pixmaps/stock_text_italic.xpm
1223 --- flek-0.3/src/pixmaps/stock_text_italic.xpm  2001-05-15 20:18:25.000000000 +0300
1224 +++ flek-0.3.1/src/pixmaps/stock_text_italic.xpm        2007-08-26 13:20:34.000000000 +0300
1225 @@ -1,5 +1,5 @@
1226  /* XPM */
1227 -static char *stock_text_italic_xpm[] = {
1228 +static const char *stock_text_italic_xpm[] = {
1229  /* columns rows colors chars-per-pixel */
1230  "24 24 2 1",
1231  "  c Gray0",
1232 diff -ur flek-0.3/src/pixmaps/stock_text_numbered_list.xpm flek-0.3.1/src/pixmaps/stock_text_numbered_list.xpm
1233 --- flek-0.3/src/pixmaps/stock_text_numbered_list.xpm   2001-05-15 20:18:25.000000000 +0300
1234 +++ flek-0.3.1/src/pixmaps/stock_text_numbered_list.xpm 2007-08-26 13:20:34.000000000 +0300
1235 @@ -1,5 +1,5 @@
1236  /* XPM */
1237 -static char *stock_text_numbered_list_xpm[] = {
1238 +static const char *stock_text_numbered_list_xpm[] = {
1239  /* columns rows colors chars-per-pixel */
1240  "24 24 2 1",
1241  "  c Gray0",
1242 diff -ur flek-0.3/src/pixmaps/stock_text_strikeout.xpm flek-0.3.1/src/pixmaps/stock_text_strikeout.xpm
1243 --- flek-0.3/src/pixmaps/stock_text_strikeout.xpm       2001-05-15 20:18:25.000000000 +0300
1244 +++ flek-0.3.1/src/pixmaps/stock_text_strikeout.xpm     2007-08-26 13:20:34.000000000 +0300
1245 @@ -1,5 +1,5 @@
1246  /* XPM */
1247 -static char *stock_text_strikeout_xpm[] = {
1248 +static const char *stock_text_strikeout_xpm[] = {
1249  /* columns rows colors chars-per-pixel */
1250  "24 24 2 1",
1251  "  c Gray0",
1252 diff -ur flek-0.3/src/pixmaps/stock_text_underline.xpm flek-0.3.1/src/pixmaps/stock_text_underline.xpm
1253 --- flek-0.3/src/pixmaps/stock_text_underline.xpm       2001-05-15 20:18:25.000000000 +0300
1254 +++ flek-0.3.1/src/pixmaps/stock_text_underline.xpm     2007-08-26 13:20:34.000000000 +0300
1255 @@ -1,5 +1,5 @@
1256  /* XPM */
1257 -static char *stock_text_underline_xpm[] = {
1258 +static const char *stock_text_underline_xpm[] = {
1259  /* columns rows colors chars-per-pixel */
1260  "24 24 2 1",
1261  "  c Gray0",
1262 diff -ur flek-0.3/src/pixmaps/stock_text_unindent.xpm flek-0.3.1/src/pixmaps/stock_text_unindent.xpm
1263 --- flek-0.3/src/pixmaps/stock_text_unindent.xpm        2001-05-15 20:18:25.000000000 +0300
1264 +++ flek-0.3.1/src/pixmaps/stock_text_unindent.xpm      2007-08-26 13:20:34.000000000 +0300
1265 @@ -1,5 +1,5 @@
1266  /* XPM */
1267 -static char *stock_text_unindent_xpm[] = {
1268 +static const char *stock_text_unindent_xpm[] = {
1269  /* columns rows colors chars-per-pixel */
1270  "24 24 2 1",
1271  "  c Gray0",
1272 diff -ur flek-0.3/src/pixmaps/stock_timer_stopped.xpm flek-0.3.1/src/pixmaps/stock_timer_stopped.xpm
1273 --- flek-0.3/src/pixmaps/stock_timer_stopped.xpm        2001-05-15 20:18:25.000000000 +0300
1274 +++ flek-0.3.1/src/pixmaps/stock_timer_stopped.xpm      2007-08-26 13:20:34.000000000 +0300
1275 @@ -1,5 +1,5 @@
1276  /* XPM */
1277 -static char *stock_timer_stopped_xpm[] = {
1278 +static const char *stock_timer_stopped_xpm[] = {
1279  /* columns rows colors chars-per-pixel */
1280  "24 24 106 2",
1281  "   c Gray0",
1282 diff -ur flek-0.3/src/pixmaps/stock_timer.xpm flek-0.3.1/src/pixmaps/stock_timer.xpm
1283 --- flek-0.3/src/pixmaps/stock_timer.xpm        2001-05-15 20:18:25.000000000 +0300
1284 +++ flek-0.3.1/src/pixmaps/stock_timer.xpm      2007-08-26 13:20:34.000000000 +0300
1285 @@ -1,5 +1,5 @@
1286  /* XPM */
1287 -static char *stock_timer_xpm[] = {
1288 +static const char *stock_timer_xpm[] = {
1289  /* columns rows colors chars-per-pixel */
1290  "24 24 97 2",
1291  "   c Gray0",
1292 diff -ur flek-0.3/src/pixmaps/stock_top.xpm flek-0.3.1/src/pixmaps/stock_top.xpm
1293 --- flek-0.3/src/pixmaps/stock_top.xpm  2001-05-15 20:18:25.000000000 +0300
1294 +++ flek-0.3.1/src/pixmaps/stock_top.xpm        2007-08-26 13:20:34.000000000 +0300
1295 @@ -1,5 +1,5 @@
1296  /* XPM */
1297 -static char *stock_top_xpm[] = {
1298 +static const char *stock_top_xpm[] = {
1299  /* columns rows colors chars-per-pixel */
1300  "24 24 89 1",
1301  "  c Gray0",
1302 diff -ur flek-0.3/src/pixmaps/stock_trash_full.xpm flek-0.3.1/src/pixmaps/stock_trash_full.xpm
1303 --- flek-0.3/src/pixmaps/stock_trash_full.xpm   2001-05-15 20:18:25.000000000 +0300
1304 +++ flek-0.3.1/src/pixmaps/stock_trash_full.xpm 2007-08-26 13:20:34.000000000 +0300
1305 @@ -1,5 +1,5 @@
1306  /* XPM */
1307 -static char *stock_trash_full_xpm[] = {
1308 +static const char *stock_trash_full_xpm[] = {
1309  /* columns rows colors chars-per-pixel */
1310  "24 24 106 2",
1311  "   c Gray0",
1312 diff -ur flek-0.3/src/pixmaps/stock_trash.xpm flek-0.3.1/src/pixmaps/stock_trash.xpm
1313 --- flek-0.3/src/pixmaps/stock_trash.xpm        2001-05-15 20:18:25.000000000 +0300
1314 +++ flek-0.3.1/src/pixmaps/stock_trash.xpm      2007-08-26 13:20:34.000000000 +0300
1315 @@ -1,5 +1,5 @@
1316  /* XPM */
1317 -static char *stock_trash_xpm[] = {
1318 +static const char *stock_trash_xpm[] = {
1319  /* columns rows colors chars-per-pixel */
1320  "24 24 85 1",
1321  "  c Gray0",
1322 diff -ur flek-0.3/src/pixmaps/stock_undelete.xpm flek-0.3.1/src/pixmaps/stock_undelete.xpm
1323 --- flek-0.3/src/pixmaps/stock_undelete.xpm     2001-05-15 20:18:25.000000000 +0300
1324 +++ flek-0.3.1/src/pixmaps/stock_undelete.xpm   2007-08-26 13:20:34.000000000 +0300
1325 @@ -1,5 +1,5 @@
1326  /* XPM */
1327 -static char *stock_undelete_xpm[] = {
1328 +static const char *stock_undelete_xpm[] = {
1329  /* columns rows colors chars-per-pixel */
1330  "24 24 95 2",
1331  "   c Gray0",
1332 diff -ur flek-0.3/src/pixmaps/stock_undo.xpm flek-0.3.1/src/pixmaps/stock_undo.xpm
1333 --- flek-0.3/src/pixmaps/stock_undo.xpm 2001-05-15 20:18:25.000000000 +0300
1334 +++ flek-0.3.1/src/pixmaps/stock_undo.xpm       2007-08-26 13:20:34.000000000 +0300
1335 @@ -1,5 +1,5 @@
1336  /* XPM */
1337 -static char *stock_undo_xpm[] = {
1338 +static const char *stock_undo_xpm[] = {
1339  /* columns rows colors chars-per-pixel */
1340  "24 24 8 1",
1341  "  c Gray0",
1342 diff -ur flek-0.3/src/pixmaps/stock_up_arrow.xpm flek-0.3.1/src/pixmaps/stock_up_arrow.xpm
1343 --- flek-0.3/src/pixmaps/stock_up_arrow.xpm     2001-05-15 20:18:25.000000000 +0300
1344 +++ flek-0.3.1/src/pixmaps/stock_up_arrow.xpm   2007-08-26 13:20:34.000000000 +0300
1345 @@ -1,5 +1,5 @@
1346  /* XPM */
1347 -static char *stock_up_arrow_xpm[] = {
1348 +static const char *stock_up_arrow_xpm[] = {
1349  /* columns rows colors chars-per-pixel */
1350  "24 24 73 1",
1351  "  c Gray0",
1352 diff -ur flek-0.3/src/pixmaps/stock_volume.xpm flek-0.3.1/src/pixmaps/stock_volume.xpm
1353 --- flek-0.3/src/pixmaps/stock_volume.xpm       2001-05-15 20:18:25.000000000 +0300
1354 +++ flek-0.3.1/src/pixmaps/stock_volume.xpm     2007-08-26 13:20:34.000000000 +0300
1355 @@ -1,5 +1,5 @@
1356  /* XPM */
1357 -static char *stock_volume_xpm[] = {
1358 +static const char *stock_volume_xpm[] = {
1359  /* columns rows colors chars-per-pixel */
1360  "24 24 17 1",
1361  "  c Gray0",
1362 diff -ur flek-0.3/src/pixmaps/tt_closed_icon.xpm flek-0.3.1/src/pixmaps/tt_closed_icon.xpm
1363 --- flek-0.3/src/pixmaps/tt_closed_icon.xpm     2001-05-15 20:18:25.000000000 +0300
1364 +++ flek-0.3.1/src/pixmaps/tt_closed_icon.xpm   2007-08-26 13:21:48.000000000 +0300
1365 @@ -1,5 +1,5 @@
1366  /* XPM */
1367 -char *tt_closed_icon_xpm[] = {
1368 +const char *tt_closed_icon_xpm[] = {
1369  /* width height num_colors chars_per_pixel */
1370  "     16     16        3            1",
1371  /* colors */
1372 diff -ur flek-0.3/src/pixmaps/tt_file_small.xpm flek-0.3.1/src/pixmaps/tt_file_small.xpm
1373 --- flek-0.3/src/pixmaps/tt_file_small.xpm      2001-05-15 20:18:25.000000000 +0300
1374 +++ flek-0.3.1/src/pixmaps/tt_file_small.xpm    2007-08-26 13:21:24.000000000 +0300
1375 @@ -1,5 +1,5 @@
1376  /* XPM */
1377 -char * tt_file_small_xpm[] = {
1378 +const char * tt_file_small_xpm[] = {
1379  "16 16 7 1",
1380  "      c None",
1381  ".     c #000000000000",
1382 diff -ur flek-0.3/src/pixmaps/tt_folder_small.xpm flek-0.3.1/src/pixmaps/tt_folder_small.xpm
1383 --- flek-0.3/src/pixmaps/tt_folder_small.xpm    2001-05-15 20:18:25.000000000 +0300
1384 +++ flek-0.3.1/src/pixmaps/tt_folder_small.xpm  2007-08-26 13:21:15.000000000 +0300
1385 @@ -1,5 +1,5 @@
1386  /* XPM */
1387 -char * tt_folder_small_xpm[] = {
1388 +const char * tt_folder_small_xpm[] = {
1389  "16 16 23 1",
1390  "      c None",
1391  ".     c #000000000000",
1392 diff -ur flek-0.3/src/pixmaps/tt_open_icon.xpm flek-0.3.1/src/pixmaps/tt_open_icon.xpm
1393 --- flek-0.3/src/pixmaps/tt_open_icon.xpm       2001-05-15 20:18:25.000000000 +0300
1394 +++ flek-0.3.1/src/pixmaps/tt_open_icon.xpm     2007-08-26 13:21:56.000000000 +0300
1395 @@ -1,5 +1,5 @@
1396  /* XPM */
1397 -char *tt_open_icon_xpm[] = {
1398 +const char *tt_open_icon_xpm[] = {
1399  /* width height num_colors chars_per_pixel */
1400  "     16     16        3            1",
1401  /* colors */
1402 diff -ur flek-0.3/test/basiclist.cxx flek-0.3.1/test/basiclist.cxx
1403 --- flek-0.3/test/basiclist.cxx 2001-05-15 20:18:25.000000000 +0300
1404 +++ flek-0.3.1/test/basiclist.cxx       2007-08-26 13:31:51.000000000 +0300
1405 @@ -3,7 +3,7 @@
1406  #include <FL/fl_draw.H>
1407
1408  // These will be the 10 values we display in the list
1409 -char *values[] = {"1","2","3","4","5","6","7","8","9","10" };
1410 +const char *values[] = {"1","2","3","4","5","6","7","8","9","10" };
1411
1412  class My_Flv_List : public Flv_List
1413  {
1414 diff -ur flek-0.3/test/docking.cxx flek-0.3.1/test/docking.cxx
1415 --- flek-0.3/test/docking.cxx   2001-05-15 20:18:25.000000000 +0300
1416 +++ flek-0.3.1/test/docking.cxx 2007-08-26 13:23:48.000000000 +0300
1417 @@ -34,7 +34,7 @@
1418    application_window->add_dockable(dw);
1419  }
1420
1421 -void main() {
1422 +int main() {
1423    // Create an application window.
1424    application_window = new Fl_App_Window(200, 200, "Application Window");
1425
1426 @@ -111,5 +111,5 @@
1427    print_children(application_window->contents());
1428    print_children(application_window->tpack());
1429
1430 -  Fl::run();
1431 +  return Fl::run();
1432  }
1433 diff -ur flek-0.3/test/image.cxx flek-0.3.1/test/image.cxx
1434 --- flek-0.3/test/image.cxx     2001-05-15 20:18:26.000000000 +0300
1435 +++ flek-0.3.1/test/image.cxx   2007-08-26 13:34:44.000000000 +0300
1436 @@ -6,7 +6,7 @@
1437
1438  #define TEST
1439
1440 -void main ()
1441 +int main ()
1442  {
1443    FImage *imgA, *imgB;
1444
1445 @@ -32,4 +32,5 @@
1446    FJPEG::write ("image_scale.jpg", imgA, 90);
1447    delete imgA;
1448    delete imgB;
1449 +  return 0;
1450  }
1451 diff -ur flek-0.3/test/Makefile flek-0.3.1/test/Makefile
1452 --- flek-0.3/test/Makefile      2001-05-15 20:18:25.000000000 +0300
1453 +++ flek-0.3.1/test/Makefile    2007-08-26 13:33:53.000000000 +0300
1454 @@ -15,17 +15,17 @@
1455
1456  all: $(ALL)
1457
1458 -CORECOMPILE=`../flek-config --use-core --cxxflags` -g3
1459 +CORECOMPILE=`../flek-config --use-core --cxxflags` -g3 -Werror
1460  CORELINK=`../flek-config --use-core --ldflags`
1461
1462 -UICOMPILE=`../flek-config --use-ui --cxxflags` -g3
1463 +UICOMPILE=`../flek-config --use-ui --cxxflags` -g3 -Werror
1464  UILINK=`../flek-config --use-ui --ldflags`
1465
1466 -IMGCOMPILE=`../flek-config --use-ui --use-jpeg --cxxflags` -g3
1467 +IMGCOMPILE=`../flek-config --use-ui --use-jpeg --cxxflags` -g3 -Werror
1468  IMGLINK=`../flek-config --use-ui --use-jpeg --ldflags`
1469
1470 -GLCOMPILE=`../flek-config --use-gl --cxxflags`
1471 -GLLINK=`../flek-config --use-gl --ldflags`
1472 +GLCOMPILE=`../flek-config --use-gl --cxxflags` -Werror
1473 +GLLINK=`../flek-config --use-gl --ldflags` -lfltk_gl
1474
1475  arcball: arcball.cxx
1476         $(CXX) $(GLCOMPILE) $@.cxx $(GLLINK) -o $@
1477 diff -ur flek-0.3/test/stock_buttons.cxx flek-0.3.1/test/stock_buttons.cxx
1478 --- flek-0.3/test/stock_buttons.cxx     2001-05-15 20:18:26.000000000 +0300
1479 +++ flek-0.3.1/test/stock_buttons.cxx   2007-08-26 13:23:34.000000000 +0300
1480 @@ -5,8 +5,8 @@
1481
1482  #include <stdio.h>
1483
1484 -void
1485 -main ()
1486 +
1487 +int main ()
1488  {
1489    Fl_Window *W = new Fl_Window (358, 100, "Stock Buttons Demo");
1490
1491 @@ -19,7 +19,7 @@
1492
1493    W->show ();
1494
1495 -  Fl::run();
1496 +  return Fl::run();
1497  }
1498
1499
1500 diff -ur flek-0.3/test/testtable2.cxx flek-0.3.1/test/testtable2.cxx
1501 --- flek-0.3/test/testtable2.cxx        2001-05-15 20:18:26.000000000 +0300
1502 +++ flek-0.3.1/test/testtable2.cxx      2007-08-26 13:31:35.000000000 +0300
1503 @@ -28,7 +28,7 @@
1504         virtual int col_width( int C );
1505  };
1506
1507 -char *val[12][5] =
1508 +const char *val[12][5] =
1509  {
1510         { "",                                                                   "",                             "",                                     "Total",                "$213.23"       },
1511         { "Name",                                                       "Male",         "Phone",                "Meet",                         "Due"   },
1512 @@ -44,7 +44,7 @@
1513         {       "Simpson, Bart",                "Male",         "928-1342", "07/23/1999", "$72.32" }
1514  };
1515
1516 -char *get_value( int R, int C )
1517 +const char *get_value( int R, int C )
1518  {
1519         return val[R+2][C];
1520  }
1521 ä×ÏÉÞÎÙÅ ÆÁÊÌÙ flek-0.3/test/time É flek-0.3.1/test/time ÒÁÚÌÉÞÁÀÔÓÑ
1522 diff -ur flek-0.3/test/toggle_tree.cxx flek-0.3.1/test/toggle_tree.cxx
1523 --- flek-0.3/test/toggle_tree.cxx       2001-05-15 20:18:26.000000000 +0300
1524 +++ flek-0.3.1/test/toggle_tree.cxx     2007-08-26 13:27:39.000000000 +0300
1525 @@ -140,7 +140,7 @@
1526    tree->redraw();
1527  }
1528
1529 -main() {
1530 +int main() {
1531    Fl_Window win(240, 304, "Tree Example");
1532    Fl_Button remove_button(10, 200, 100, 22, "Remove");
1533    Fl_Button add_paper_button(10, 224, 100, 22, "Add Paper");
1534 @@ -256,7 +256,7 @@
1535
1536    win.show();
1537
1538 -  Fl::run();
1539 +  return Fl::run();
1540  }
1541
1542