Author: matt
Date: 2011-06-19 15:09:36 -0700 (Sun, 19 Jun 2011)
New Revision: 8828
Log:
123: added wrapper support for all(?) draw() methods. FLTK1 tests compile all 
the way to colbrowser.

Modified:
   branches/branch-3.0/FL/Fl_Preferences.H
   branches/branch-3.0/FL/Fl_Tiled_Image.H
   branches/branch-3.0/FL/Fl_Value_Output.H
   branches/branch-3.0/FL/fl_draw.H
   branches/branch-3.0/fltk3/CairoWindow.h
   branches/branch-3.0/fltk3/ValueOutput.h
   branches/branch-3.0/src/Fl_Adjuster.cxx
   branches/branch-3.0/src/makedepend
   branches/branch-3.0/test1/checkers.cxx
   branches/branch-3.0/test1/makedepend

Modified: branches/branch-3.0/FL/Fl_Preferences.H
===================================================================
--- branches/branch-3.0/FL/Fl_Preferences.H     2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/FL/Fl_Preferences.H     2011-06-19 22:09:36 UTC (rev 
8828)
@@ -1,10 +1,10 @@
-#error header has not been ported to 3.0 yet
 //
 // "$Id$"
 //
 // Preferences .
 //
-// Copyright 2002-2010 by Matthias Melcher.
+// Copyright 2002-2011 by Matthias Melcher.
+// FLTK 123 wrapper finished
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -26,248 +26,58 @@
 //     http://www.fltk.org/str.php
 //
 
-/* \file
-   Fl_Preferences class . */
-
 #ifndef Fl_Preferences_H
-#  define Fl_Preferences_H
+#define Fl_Preferences_H
 
-#  include <stdio.h>
-#  include "Fl_Export.H" 
+#include <fltk3/Preferences.h>
+#include <stdio.h>
+#include "Fl_Export.H" 
 
-/**
-   \brief Fl_Preferences provides methods to store user
-   settings between application starts. 
 
-   It is similar to the
-   Registry on WIN32 and Preferences on MacOS, and provides a
-   simple configuration mechanism for UNIX.
-   
-   Fl_Preferences uses a hierarchy to store data. It
-   bundles similar data into groups and manages entries into those
-   groups as name/value pairs.
-   
-   Preferences are stored in text files that can be edited
-   manually. The file format is easy to read and relatively
-   forgiving. Preferences files are the same on all platforms. User
-   comments in preference files are preserved. Filenames are unique
-   for each application by using a vendor/application naming
-   scheme. The user must provide default values for all entries to
-   ensure proper operation should preferences be corrupted or not
-   yet exist.
-   
-   Entries can be of any length. However, the size of each
-   preferences file should be kept small for performance
-   reasons. One application can have multiple preferences files.
-   Extensive binary data however should be stored in separate
-   files: see getUserdataPath().
- 
-   \note Starting with FLTK 1.3, preference databases are expected to 
-   be in utf8 encoding. Previous databases were stored in the 
-   current chracter set or code page which renders them incompatible
-   for text entries using international characters.
- */
-class FL_EXPORT Fl_Preferences {
+class FL_EXPORT Fl_Preferences : public fltk3::Preferences {
 
 public: 
-  /**
-     Define the scope of the preferences.
-   */
-  enum Root { 
-    SYSTEM=0,   ///< Preferences are used system-wide
-    USER        ///< Preferences apply only to the current user
-  };
-  
-  /**
-   Every Fl_Preferences-Group has a uniqe ID.
-   
-   ID's can be retrieved from an Fl_Preferences-Group and can then be used
-   to create more Fl_Preference references to the same data set, as long as 
the 
-   database remains open.
-   */
-  typedef void *ID;
-  
-  static const char *newUUID();
 
-  Fl_Preferences( Root root, const char *vendor, const char *application );
-  Fl_Preferences( const char *path, const char *vendor, const char 
*application );
-  Fl_Preferences( Fl_Preferences &parent, const char *group );
-  Fl_Preferences( Fl_Preferences *parent, const char *group );
-  Fl_Preferences( Fl_Preferences &parent, int groupIndex );
-  Fl_Preferences( Fl_Preferences *parent, int groupIndex );
-  Fl_Preferences(const Fl_Preferences&);
-  Fl_Preferences( ID id );
-  virtual ~Fl_Preferences();
+  Fl_Preferences( Root root, const char *vendor, const char *application ) 
+  : fltk3::Preferences(root, vendor, application)
+  {
+  }
   
-  /** Return an ID that can later be reused to open more references to this 
dataset.
-   */
-  ID id() { return (ID)node; }
+  Fl_Preferences( const char *path, const char *vendor, const char 
*application ) 
+  : fltk3::Preferences(path, vendor, application)
+  {
+  }
   
-  /** Remove the group with this ID from a database.
-   */
-  static char remove(ID id_) { return ((Node*)id_)->remove(); }
-
-  /** Return the name of this entry.
-   */
-  const char *name() { return node->name(); }
+  Fl_Preferences( Fl_Preferences &parent, const char *group ) 
+  : fltk3::Preferences(parent, group)
+  {
+  }
   
-  /** Return the the full path to this entry.
-   */
-  const char *path() { return node->path(); }
+  Fl_Preferences( Fl_Preferences *parent, const char *group ) 
+  : fltk3::Preferences(parent, group)  
+  {
+  }
   
-  int groups();
-  const char *group( int num_group );
-  char groupExists( const char *key );
-  char deleteGroup( const char *group );
-  char deleteAllGroups();
-
-  int entries();
-  const char *entry( int index );
-  char entryExists( const char *key );
-  char deleteEntry( const char *entry );
-  char deleteAllEntries();
+  Fl_Preferences( Fl_Preferences &parent, int groupIndex ) 
+  : fltk3::Preferences(parent, groupIndex)
+  {
+  }
   
-  char clear();
-
-  char set( const char *entry, int value );
-  char set( const char *entry, float value );
-  char set( const char *entry, float value, int precision );
-  char set( const char *entry, double value );
-  char set( const char *entry, double value, int precision );
-  char set( const char *entry, const char *value );
-  char set( const char *entry, const void *value, int size ); 
+  Fl_Preferences( Fl_Preferences *parent, int groupIndex ) 
+  : fltk3::Preferences(parent, groupIndex)
+  {
+  }
   
-  char get( const char *entry, int &value, int defaultValue );
-  char get( const char *entry, float &value,  float defaultValue );
-  char get( const char *entry, double &value, double defaultValue );
-  char get( const char *entry, char *&value,  const char *defaultValue );
-  char get( const char *entry, char *value,   const char *defaultValue, int 
maxSize );
-  char get( const char *entry, void *&value,  const void *defaultValue, int 
defaultSize );
-  char get( const char *entry, void *value,   const void *defaultValue, int 
defaultSize, int maxSize );
-
-  int size( const char *entry );
-
-  char getUserdataPath( char *path, int pathlen );
-
-  void flush();
-
-  // char export( const char *filename, Type fileFormat );
-  // char import( const char *filename );
+  Fl_Preferences(const Fl_Preferences &p)
+  : fltk3::Preferences(p)
+  {
+  }
   
-  /**
-     'Name' provides a simple method to create numerical or more complex 
-     procedural names for entries and groups on the fly.
-     
-     Example: prefs.set(Fl_Preferences::Name("File%d",i),file[i]);. 
-    
-     See test/preferences.cxx as a sample for writing arrays into 
preferences.<p>
-     'Name' is actually implemented as a class inside Fl_Preferences. It casts
-     into const char* and gets automatically destroyed after the enclosing call
-     ends.
-   */
-  class FL_EXPORT Name {
-
-    char *data_;
-
-  public: 
-    Name( unsigned int n );
-    Name( const char *format, ... );
-
-    /**
-       Return the Name as a "C" string.
-       \internal
-     */
-    operator const char *() { return data_; }
-    ~Name();
-  };
-
-  /** \internal An entry associates a preference name to its corresponding 
value */
-  struct Entry {
-    char *name, *value;
-  };
-
-private: 
-  Fl_Preferences() : node(0), rootNode(0) { }
-  Fl_Preferences &operator=(const Fl_Preferences&);
-
-  static char nameBuffer[128];
-  static char uuidBuffer[40];
-  static Fl_Preferences *runtimePrefs;
-
-  class RootNode;
+  Fl_Preferences( ID id ) 
+  : fltk3::Preferences(id)
+  {
+  }
   
-  class FL_EXPORT Node {       // a node contains a list to all its entries 
-                               // and all means to manage the tree structure
-    Node *child_, *next_;
-    union {                    // these two are mutually exclusive
-      Node *parent_;                   // top_ bit clear
-      RootNode *root_;                 // top_ bit set
-    };
-    char *path_;
-    Entry *entry_;
-    int nEntry_, NEntry_;
-    unsigned char dirty_:1;
-    unsigned char top_:1;
-    unsigned char indexed_:1;
-    // indexing routines
-    Node **index_;
-    int nIndex_, NIndex_;
-    void createIndex();
-    void updateIndex();
-    void deleteIndex();
-  public:
-    static int lastEntrySet;
-  public:
-    Node( const char *path );
-    ~Node();
-    // node methods
-    int write( FILE *f );
-    const char *name();
-    const char *path() { return path_; }
-    Node *find( const char *path );
-    Node *search( const char *path, int offset=0 );
-    Node *childNode( int ix );
-    Node *addChild( const char *path );
-    void setParent( Node *parent );
-    Node *parent() { return top_?0L:parent_; }
-    void setRoot(RootNode *r) { root_ = r; top_ = 1; }
-    RootNode *findRoot();
-    char remove();
-    char dirty();
-    void deleteAllChildren();
-    // entry methods
-    int nChildren();
-    const char *child( int ix );
-    void set( const char *name, const char *value );
-    void set( const char *line );
-    void add( const char *line );
-    const char *get( const char *name );
-    int getEntry( const char *name );
-    char deleteEntry( const char *name );
-    void deleteAllEntries();
-    int nEntry() { return nEntry_; }
-    Entry &entry(int i) { return entry_[i]; }
-  };
-  friend class Node;
-
-  class FL_EXPORT RootNode {           // the root node manages file paths and 
basic reading and writing
-    Fl_Preferences *prefs_;
-    char *filename_;
-    char *vendor_, *application_;
-  public:
-    RootNode( Fl_Preferences *, Root root, const char *vendor, const char 
*application );
-    RootNode( Fl_Preferences *, const char *path, const char *vendor, const 
char *application );
-    RootNode( Fl_Preferences * );
-    ~RootNode();
-    int read();
-    int write();
-    char getPath( char *path, int pathlen );
-  };
-  friend class RootNode;
-
-protected:
-  Node *node;
-  RootNode *rootNode;
 };
 
 #endif // !Fl_Preferences_H

Modified: branches/branch-3.0/FL/Fl_Tiled_Image.H
===================================================================
--- branches/branch-3.0/FL/Fl_Tiled_Image.H     2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/FL/Fl_Tiled_Image.H     2011-06-19 22:09:36 UTC (rev 
8828)
@@ -1,10 +1,11 @@
-#error header has not been ported to 3.0 yet
 //
 // "$Id$"
 //
 // Tiled image header file for the Fast Light Tool Kit (FLTK).
+// FLTK 123 wrapper started
+//  - TODO: 123 - virtual setup of images not yet done
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2011 by Bill Spitzak and others.
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -26,34 +27,22 @@
 //     http://www.fltk.org/str.php
 //
 
-/* \file
-   Fl_Tiled_Image widget . */
-
 #ifndef Fl_Tiled_Image_H
-#  define Fl_Tiled_Image_H
+#define Fl_Tiled_Image_H
 
-#  include "Fl_Image.H"
+#include <fltk3/TiledImage.h>
+#include "Fl_Image.H"
 
-
-/**
-  This class supports tiling of images
-  over a specified area. The source (tile) image is <B>not</B>
-  copied unless you call the color_average(),
-  desaturate(),
-  or inactive()
-  methods.
-*/
 class FL_EXPORT Fl_Tiled_Image : public Fl_Image {
-  protected:
 
-  Fl_Image     *image_;                // The image that is shared
-  int          alloc_image_;           // Did we allocate this image?
+public:
 
-  public:
-
-  Fl_Tiled_Image(Fl_Image *i, int W = 0, int H = 0);
-  virtual ~Fl_Tiled_Image();
-
+  Fl_Tiled_Image(Fl_Image *i, int W = 0, int H = 0) {
+    _p = new fltk3::TiledImage(fltk3::_1to3_image(i), W, H);
+    _p->wrapper(this);
+  }
+  
+#if 0
   virtual Fl_Image *copy(int W, int H);
   Fl_Image *copy() { return copy(w(), h()); }
   virtual void color_average(Fl_Color c, float i);
@@ -62,6 +51,8 @@
   void draw(int X, int Y) { draw(X, Y, w(), h(), 0, 0); }
   /** Gets The image that is shared */ 
   Fl_Image *image() { return image_; }
+#endif
+  
 };
 
 #endif // !Fl_Tiled_Image_H

Modified: branches/branch-3.0/FL/Fl_Value_Output.H
===================================================================
--- branches/branch-3.0/FL/Fl_Value_Output.H    2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/FL/Fl_Value_Output.H    2011-06-19 22:09:36 UTC (rev 
8828)
@@ -61,7 +61,7 @@
   }
   
   void textfont(Fl_Font font) { 
-    ((fltk3::ValueOutput*)_p)->font( fltk3::_1to3_font(font) );
+    ((fltk3::ValueOutput*)_p)->textfont( fltk3::_1to3_font(font) );
   }
   
   Fl_Fontsize textsize() const { 
@@ -69,7 +69,7 @@
   }
   
   void textsize(Fl_Fontsize size) {
-    ((fltk3::ValueOutput*)_p)->textsize( fltk3::_1to3_fontsize(size); )
+    ((fltk3::ValueOutput*)_p)->textsize( fltk3::_1to3_fontsize(size) );
   }
   
   Fl_Color textcolor() const { 

Modified: branches/branch-3.0/FL/fl_draw.H
===================================================================
--- branches/branch-3.0/FL/fl_draw.H    2011-06-19 21:28:45 UTC (rev 8827)
+++ branches/branch-3.0/FL/fl_draw.H    2011-06-19 22:09:36 UTC (rev 8828)
@@ -384,27 +384,31 @@
   fltk3::measure(str, x, y, draw_symbols);
 }
 
-
-#if 0 // FIXME: 123
-
 inline void fl_draw(const char* str, int x, int y, int w, int h, Fl_Align 
align, Fl_Image* img=0, int draw_symbols = 1) {
+  fltk3::draw(str, x, y, w, h, fltk3::_1to3_align(align), 
fltk3::_1to3_image(img), draw_symbols);
 }
 
+#if 0 // FIXME: 123
 inline void fl_draw(const char* str, int x, int y, int w, int h,
                        Fl_Align align,
                        void (*callthis)(const char *,int,int,int),
                     Fl_Image* img=0, int draw_symbols = 1) {
 }
 
-FL_EXPORT void fl_frame(const char* s, int x, int y, int w, int h);
+#endif
 
-FL_EXPORT void fl_frame2(const char* s, int x, int y, int w, int h);
+inline void fl_frame(const char* s, int x, int y, int w, int h) {
+  fltk3::frame(s, x, y, w, h);
+}
 
-FL_EXPORT void fl_draw_box(Fl_Boxtype, int x, int y, int w, int h, Fl_Color);
+inline void fl_frame2(const char* s, int x, int y, int w, int h) {
+  fltk3::frame2(s, x, y, w, h);
+}
 
-#endif
+inline void fl_draw_box(Fl_Boxtype b, int x, int y, int w, int h, Fl_Color c) {
+  fltk3::draw_box(fltk3::_1to3_boxtype(b), x, y, w, h, fltk3::_1to3_color(c));
+}
 
-
 inline void fl_draw_image(const uchar* buf, int X,int Y,int W,int H, int D=3, 
int L=0) { 
   fltk3::draw_image(buf, X, Y, W, H, D, L); 
 }

Modified: branches/branch-3.0/fltk3/CairoWindow.h
===================================================================
--- branches/branch-3.0/fltk3/CairoWindow.h     2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/fltk3/CairoWindow.h     2011-06-19 22:09:36 UTC (rev 
8828)
@@ -62,6 +62,7 @@
 protected:
   /** Overloaded to provide cairo callback support */
   void draw() {
+    FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
     fltk3::DoubleWindow::draw();
     // manual method ? if yes explicitly get a cairo_context here
     if (!fltk3::cairo_autolink_context()) 

Modified: branches/branch-3.0/fltk3/ValueOutput.h
===================================================================
--- branches/branch-3.0/fltk3/ValueOutput.h     2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/fltk3/ValueOutput.h     2011-06-19 22:09:36 UTC (rev 
8828)
@@ -33,6 +33,10 @@
 
 #include "Valuator.h"
 
+
+class Fl_Value_Output;
+
+
 namespace fltk3 {
   
   /**
@@ -48,6 +52,9 @@
    \image latex  fltk3::ValueOutput.png "fltk3::ValueOutput" width=4cm
    */
   class FLTK3_EXPORT ValueOutput : public fltk3::Valuator {
+
+    friend class ::Fl_Value_Output;
+
     fltk3::Font textfont_;
     fltk3::Fontsize textsize_;
     uchar soft_;

Modified: branches/branch-3.0/src/Fl_Adjuster.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Adjuster.cxx     2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/src/Fl_Adjuster.cxx     2011-06-19 22:09:36 UTC (rev 
8828)
@@ -29,6 +29,7 @@
 #include <fltk3/Adjuster.h>
 #include <fltk3/Bitmap.h>
 #include <fltk3/draw.h>
+#include <fltk3/Wrapper.h>
 
 #include "fastarrow.h"
 static fltk3::Bitmap fastarrow(fastarrow_bits, fastarrow_width, 
fastarrow_height);
@@ -41,6 +42,7 @@
 void fltk3::Adjuster::value_damage() {}
 
 void fltk3::Adjuster::draw() {
+  FLTK3_OBJECT_VCALLS_WRAPPER(draw(), Draw)
   int dx, dy, W, H;
   if (w()>=h()) {
     dx = W = w()/3;

Modified: branches/branch-3.0/src/makedepend
===================================================================
--- branches/branch-3.0/src/makedepend  2011-06-19 21:28:45 UTC (rev 8827)
+++ branches/branch-3.0/src/makedepend  2011-06-19 22:09:36 UTC (rev 8828)
@@ -17,8 +17,8 @@
 Fl_Adjuster.o: ../fltk3/Window.h ../fltk3/enumerations.h ../fltk3/Window.h
 Fl_Adjuster.o: ../fltk3/Group.h ../fltk3/Device.h ../fltk3/Object.h
 Fl_Adjuster.o: ../fltk3/Plugin.h ../fltk3/Preferences.h ../fltk3/Image.h
-Fl_Adjuster.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h fastarrow.h
-Fl_Adjuster.o: mediumarrow.h slowarrow.h
+Fl_Adjuster.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/Wrapper.h
+Fl_Adjuster.o: fastarrow.h mediumarrow.h slowarrow.h
 Fl_Bitmap.o: ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 Fl_Bitmap.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
 Fl_Bitmap.o: ../fltk3/x.h ../fltk3/Window.h ../fltk3/draw.h

Modified: branches/branch-3.0/test1/checkers.cxx
===================================================================
--- branches/branch-3.0/test1/checkers.cxx      2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/test1/checkers.cxx      2011-06-19 22:09:36 UTC (rev 
8828)
@@ -148,13 +148,13 @@
 typedef char piece;
 
 // Piece values so that BLACK and WHITE are bit flags:
-#define EMPTY 0
-#define BLACK 1
-#define WHITE 2
-#define KING 4
-#define BLACKKING 5
-#define WHITEKING 6
-#define BLUE 8
+const char EMPTY = 0;
+const char BLACK = 1;
+const char WHITE = 2;
+const char KING = 4;
+const char BLACKKING = 5;
+const char WHITEKING = 6;
+const char BLUE = 8;
 
 const piece flip[9] = {
   EMPTY, WHITE, BLACK, 0, 0, WHITEKING, BLACKKING, 0, BLUE};

Modified: branches/branch-3.0/test1/makedepend
===================================================================
--- branches/branch-3.0/test1/makedepend        2011-06-19 21:28:45 UTC (rev 
8827)
+++ branches/branch-3.0/test1/makedepend        2011-06-19 22:09:36 UTC (rev 
8828)
@@ -18,23 +18,25 @@
 unittests.o: ../fltk3/Valuator.h ../FL/Fl.H ../FL/Fl_Help_View.H
 unittests.o: ../fltk3/HelpView.h ../fltk3/run.h ../fltk3/draw.h ../fltk3/x.h
 unittests.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Plugin.h
-unittests.o: Preferences.h ../FL/Fl_Preferences.H ../fltk3/Button.h
-unittests.o: ../fltk3/Group.h ../fltk3/Input.h ../fltk3/Input_.h
-unittests.o: ../fltk3/Choice.h ../fltk3/Menu_.h ../fltk3/MenuItem.h
-unittests.o: ../fltk3/RoundButton.h ../fltk3/LightButton.h ../fltk3/Button.h
-unittests.o: ../fltk3/Box.h ../fltk3/CheckButton.h ../fltk3/IntInput.h
-unittests.o: ../fltk3/Input.h ../fltk3/ValueSlider.h ../fltk3/Bitmap.h
-unittests.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/SharedImage.h
-unittests.o: ../fltk3/filename.h ../FL/fl_draw.H ../fltk3/draw.h ../FL/x.H
-unittests.o: ../FL/Enumerations.H ../FL/Fl_Window.H ../FL/Fl_Device.H
-unittests.o: ../FL/Fl_Shared_Image.H ../fltk3/SharedImage.h ../FL/filename.H
-unittests.o: ../fltk3/filename.h ../FL/Fl_Group.H ../FL/Fl_Box.H
-unittests.o: ../FL/fl_draw.H unittest_about.cxx unittest_points.cxx
-unittests.o: unittest_lines.cxx unittest_rects.cxx unittest_circles.cxx
-unittests.o: unittest_text.cxx unittest_images.cxx unittest_viewport.cxx
+unittests.o: Preferences.h ../FL/Fl_Preferences.H ../fltk3/Preferences.h
+unittests.o: ../fltk3/Button.h ../fltk3/Group.h ../fltk3/Input.h
+unittests.o: ../fltk3/Input_.h ../fltk3/Choice.h ../fltk3/Menu_.h
+unittests.o: ../fltk3/MenuItem.h ../fltk3/RoundButton.h
+unittests.o: ../fltk3/LightButton.h ../fltk3/Button.h ../fltk3/Box.h
+unittests.o: ../fltk3/CheckButton.h ../fltk3/IntInput.h ../fltk3/Input.h
+unittests.o: ../fltk3/ValueSlider.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
+unittests.o: ../fltk3/RGBImage.h ../fltk3/SharedImage.h ../fltk3/filename.h
+unittests.o: ../FL/fl_draw.H ../fltk3/draw.h ../FL/x.H ../FL/Enumerations.H
+unittests.o: ../FL/Fl_Window.H ../FL/Fl_Device.H ../FL/Fl_Shared_Image.H
+unittests.o: ../fltk3/SharedImage.h ../FL/filename.H ../fltk3/filename.h
+unittests.o: ../FL/Fl_Group.H ../FL/Fl_Box.H ../FL/fl_draw.H
+unittests.o: unittest_about.cxx unittest_points.cxx unittest_lines.cxx
+unittests.o: unittest_rects.cxx unittest_circles.cxx unittest_text.cxx
+unittests.o: unittest_images.cxx unittest_viewport.cxx
 unittests.o: unittest_scrollbarsize.cxx ../FL/Fl_Browser.H ../FL/Fl_Tree.H
-unittests.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Tree_Item.H ../FL/Fl_Widget.H
-unittests.o: ../FL/Fl_Image.H ../FL/Fl_Tree_Item_Array.H
+unittests.o: ../fltk3/Tree.h ../fltk3/TreeItem.h ../fltk3/TreeItemArray.h
+unittests.o: ../fltk3/TreePrefs.h ../FL/Fl_Scrollbar.H ../FL/Fl_Tree_Item.H
+unittests.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/Fl_Tree_Item_Array.H
 unittests.o: ../FL/Fl_Tree_Prefs.H ../FL/Fl_Value_Slider.H
 adjuster.o: ../FL/Fl.H ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 adjuster.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
@@ -97,16 +99,17 @@
 blocks.o: ../fltk3/Wrapper.h ../fltk3/Window.h ../FL/Fl_Group.H
 blocks.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../fltk3/Image.h
 blocks.o: ../FL/Fl_Button.H ../fltk3/Button.h ../FL/Fl_Preferences.H
-blocks.o: ../FL/Fl_XPM_Image.H ../fltk3/XPMImage.h ../fltk3/Pixmap.h
-blocks.o: ../fltk3/Image.h ../FL/Fl_Pixmap.H ../fltk3/Pixmap.h
-blocks.o: ../FL/Fl_XBM_Image.H ../fltk3/XBMImage.h ../fltk3/Bitmap.h
-blocks.o: ../FL/Fl_Bitmap.H ../fltk3/Bitmap.h ../FL/Fl_Tiled_Image.H
-blocks.o: ../FL/fl_draw.H ../FL/x.H ../fltk3/x.h ../config.h
-blocks.o: pixmaps/blast.xpm pixmaps/red.xpm pixmaps/red_bomb.xpm
-blocks.o: pixmaps/green.xpm pixmaps/green_bomb.xpm pixmaps/blue.xpm
-blocks.o: pixmaps/blue_bomb.xpm pixmaps/yellow.xpm pixmaps/yellow_bomb.xpm
-blocks.o: pixmaps/cyan.xpm pixmaps/cyan_bomb.xpm pixmaps/magenta.xpm
-blocks.o: pixmaps/magenta_bomb.xpm pixmaps/gray.xpm pixmaps/gray_bomb.xpm
+blocks.o: ../fltk3/Preferences.h ../FL/Fl_XPM_Image.H ../fltk3/XPMImage.h
+blocks.o: ../fltk3/Pixmap.h ../fltk3/Image.h ../FL/Fl_Pixmap.H
+blocks.o: ../fltk3/Pixmap.h ../FL/Fl_XBM_Image.H ../fltk3/XBMImage.h
+blocks.o: ../fltk3/Bitmap.h ../FL/Fl_Bitmap.H ../fltk3/Bitmap.h
+blocks.o: ../FL/Fl_Tiled_Image.H ../fltk3/TiledImage.h ../FL/fl_draw.H
+blocks.o: ../FL/x.H ../fltk3/x.h ../config.h pixmaps/blast.xpm
+blocks.o: pixmaps/red.xpm pixmaps/red_bomb.xpm pixmaps/green.xpm
+blocks.o: pixmaps/green_bomb.xpm pixmaps/blue.xpm pixmaps/blue_bomb.xpm
+blocks.o: pixmaps/yellow.xpm pixmaps/yellow_bomb.xpm pixmaps/cyan.xpm
+blocks.o: pixmaps/cyan_bomb.xpm pixmaps/magenta.xpm pixmaps/magenta_bomb.xpm
+blocks.o: pixmaps/gray.xpm pixmaps/gray_bomb.xpm
 boxtype.o: ../FL/Fl.H ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 boxtype.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
 boxtype.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
@@ -262,8 +265,8 @@
 cube.o: ../FL/Fl_Menu_Item.H ../fltk3/MenuItem.h ../FL/x.H ../fltk3/x.h
 cube.o: ../FL/Fl_Printer.H ../fltk3/Printer.h ../fltk3/PagedDevice.h
 cube.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Plugin.h Preferences.h
-cube.o: ../FL/Fl_Preferences.H ../fltk3/DoubleWindow.h ../fltk3/Group.h
-cube.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/Choice.h
+cube.o: ../FL/Fl_Preferences.H ../fltk3/Preferences.h ../fltk3/DoubleWindow.h
+cube.o: ../fltk3/Group.h ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/Choice.h
 cube.o: ../fltk3/RoundButton.h ../fltk3/CheckButton.h ../fltk3/IntInput.h
 cube.o: ../fltk3/Input.h ../fltk3/ValueSlider.h ../fltk3/Slider.h
 cube.o: ../fltk3/Valuator.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
@@ -276,17 +279,7 @@
 CubeMain.o: ../fltk3/enumerations.h ../fltk3/Widget.h ../fltk3/Rectangle.h
 CubeMain.o: ../fltk3/Object.h ../FL/fl_utf8.h ../FL/Enumerations.H
 CubeMain.o: ../fltk3/enumerations.h ../FL/Fl_Export.H ../FL/fl_types.h
-CubeMain.o: ../fltk3/types.h CubeViewUI.h ../FL/Fl_Double_Window.H
-CubeMain.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-CubeMain.o: ../fltk3/Widget.h ../FL/Fl_Window.H ../fltk3/Wrapper.h
-CubeMain.o: ../fltk3/Window.h ../FL/Fl_Group.H ../FL/Fl_Widget.H
-CubeMain.o: ../FL/Fl_Image.H ../fltk3/Image.h ../FL/Fl_Group.H
-CubeMain.o: ../FL/Fl_Roller.H ../fltk3/Roller.h ../fltk3/Valuator.h
-CubeMain.o: ../FL/Fl_Valuator.H ../fltk3/Valuator.h ../FL/Fl_Slider.H
-CubeMain.o: ../fltk3/Slider.h ../FL/Fl_Box.H ../fltk3/Box.h CubeView.h
-CubeMain.o: ../FL/Fl_Gl_Window.H ../fltk3/GlWindow.h ../FL/gl.h ../fltk3/gl.h
-CubeMain.o: ../FL/Fl_Value_Slider.H ../fltk3/ValueSlider.h ../fltk3/Slider.h
-CubeMain.o: ../FL/Fl_Slider.H
+CubeMain.o: ../fltk3/types.h
 CubeView.o: CubeView.h ../config.h ../FL/Fl.H ../fltk3/run.h ../fltk3/utf8.h
 CubeView.o: ../fltk3/Export.h ../fltk3/types.h ../fltk3/Xutf8.h
 CubeView.o: ../fltk3/enumerations.h ../fltk3/Widget.h ../fltk3/Rectangle.h
@@ -362,30 +355,30 @@
 device.o: ../FL/Fl_Printer.H ../fltk3/Printer.h ../fltk3/x.h
 device.o: ../fltk3/PagedDevice.h ../fltk3/Device.h ../fltk3/Object.h
 device.o: ../fltk3/Plugin.h Preferences.h ../FL/Fl_Preferences.H
-device.o: ../fltk3/Button.h ../fltk3/Group.h ../fltk3/Input.h
-device.o: ../fltk3/Input_.h ../fltk3/Choice.h ../fltk3/Menu_.h
-device.o: ../fltk3/MenuItem.h ../fltk3/Box.h ../fltk3/CheckButton.h
-device.o: ../fltk3/IntInput.h ../fltk3/Input.h ../fltk3/ValueSlider.h
-device.o: ../fltk3/Slider.h ../fltk3/Valuator.h ../fltk3/RGBImage.h
-device.o: ../fltk3/draw.h ../fltk3/PostScript.h ../FL/x.H
+device.o: ../fltk3/Preferences.h ../fltk3/Button.h ../fltk3/Group.h
+device.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/Choice.h
+device.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Box.h
+device.o: ../fltk3/CheckButton.h ../fltk3/IntInput.h ../fltk3/Input.h
+device.o: ../fltk3/ValueSlider.h ../fltk3/Slider.h ../fltk3/Valuator.h
+device.o: ../fltk3/RGBImage.h ../fltk3/draw.h ../fltk3/PostScript.h ../FL/x.H
 device.o: ../FL/Fl_Paged_Device.H ../FL/Fl_Device.H ../FL/Fl_Window.H
 device.o: ../FL/Fl_RGB_Image.H ../FL/Fl_PostScript.H ../FL/Fl_File_Chooser.H
-device.o: ../fltk3/FileChooser.h ../fltk3/MenuButton.h ../fltk3/Preferences.h
-device.o: ../fltk3/TiledGroup.h ../fltk3/FileBrowser.h ../fltk3/Browser.h
-device.o: ../fltk3/Browser_.h ../fltk3/Scrollbar.h ../fltk3/FileIcon.h
-device.o: ../fltk3/run.h ../fltk3/filename.h ../fltk3/FileInput.h
-device.o: ../fltk3/ReturnButton.h ../fltk3/ask.h ../FL/Fl_Double_Window.H
-device.o: ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
-device.o: ../fltk3/Menu_.h ../FL/Fl_Menu_Item.H ../fltk3/MenuItem.h
-device.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H ../FL/Fl_Tile.H
-device.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../fltk3/Browser.h
-device.o: ../FL/Fl_Browser_.H ../fltk3/Browser_.h ../FL/Fl_Scrollbar.H
-device.o: ../fltk3/Scrollbar.h ../FL/Fl_Slider.H ../fltk3/Slider.h
-device.o: ../FL/Fl_Valuator.H ../fltk3/Valuator.h ../FL/Fl.H
-device.o: ../FL/Fl_File_Icon.H ../fltk3/FileIcon.h ../FL/filename.H
-device.o: ../fltk3/filename.h ../FL/Fl_Box.H ../FL/Fl_Check_Button.H
-device.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-device.o: ../fltk3/Input_.h ../FL/Fl_Return_Button.H ../FL/fl_ask.H
+device.o: ../fltk3/FileChooser.h ../fltk3/MenuButton.h ../fltk3/TiledGroup.h
+device.o: ../fltk3/FileBrowser.h ../fltk3/Browser.h ../fltk3/Browser_.h
+device.o: ../fltk3/Scrollbar.h ../fltk3/FileIcon.h ../fltk3/run.h
+device.o: ../fltk3/filename.h ../fltk3/FileInput.h ../fltk3/ReturnButton.h
+device.o: ../fltk3/ask.h ../FL/Fl_Double_Window.H ../FL/Fl_Group.H
+device.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../fltk3/Menu_.h
+device.o: ../FL/Fl_Menu_Item.H ../fltk3/MenuItem.h ../FL/Fl_Menu_Button.H
+device.o: ../FL/Fl_Button.H ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H
+device.o: ../FL/Fl_Browser.H ../fltk3/Browser.h ../FL/Fl_Browser_.H
+device.o: ../fltk3/Browser_.h ../FL/Fl_Scrollbar.H ../fltk3/Scrollbar.h
+device.o: ../FL/Fl_Slider.H ../fltk3/Slider.h ../FL/Fl_Valuator.H
+device.o: ../fltk3/Valuator.h ../FL/Fl.H ../FL/Fl_File_Icon.H
+device.o: ../fltk3/FileIcon.h ../FL/filename.H ../fltk3/filename.h
+device.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H ../FL/Fl_File_Input.H
+device.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../fltk3/Input_.h
+device.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H
 doublebuffer.o: ../FL/Fl.H ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 doublebuffer.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
 doublebuffer.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
@@ -509,19 +502,20 @@
 forms.o: ../fltk3/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Window.H
 forms.o: ../FL/Fl_Device.H ../fltk3/Device.h ../fltk3/Object.h
 forms.o: ../fltk3/Plugin.h Preferences.h ../fltk3/run.h ../fltk3/utf8.h
-forms.o: ../FL/Fl_Preferences.H ../fltk3/DoubleWindow.h ../fltk3/Button.h
-forms.o: ../fltk3/Group.h ../fltk3/Input.h ../fltk3/Input_.h
-forms.o: ../fltk3/Choice.h ../fltk3/Menu_.h ../fltk3/MenuItem.h
-forms.o: ../fltk3/Image.h ../fltk3/RoundButton.h ../fltk3/LightButton.h
-forms.o: ../fltk3/Button.h ../fltk3/Box.h ../fltk3/CheckButton.h
-forms.o: ../fltk3/IntInput.h ../fltk3/Input.h ../fltk3/ValueSlider.h
-forms.o: ../fltk3/Slider.h ../fltk3/Valuator.h ../fltk3/Bitmap.h
-forms.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../FL/Fl_FormsBitmap.H
-forms.o: ../FL/Fl_FormsPixmap.H ../FL/Fl_Box.H ../FL/Fl_Browser.H
-forms.o: ../fltk3/Browser.h ../FL/Fl_Browser_.H ../fltk3/Browser_.h
-forms.o: ../FL/Fl_Scrollbar.H ../fltk3/Scrollbar.h ../FL/Fl_Slider.H
-forms.o: ../fltk3/Slider.h ../FL/Fl_Valuator.H ../fltk3/Valuator.h
-forms.o: ../FL/Fl_Button.H ../FL/Fl_Light_Button.H ../fltk3/LightButton.h
+forms.o: ../FL/Fl_Preferences.H ../fltk3/Preferences.h
+forms.o: ../fltk3/DoubleWindow.h ../fltk3/Button.h ../fltk3/Group.h
+forms.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/Choice.h
+forms.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Image.h
+forms.o: ../fltk3/RoundButton.h ../fltk3/LightButton.h ../fltk3/Button.h
+forms.o: ../fltk3/Box.h ../fltk3/CheckButton.h ../fltk3/IntInput.h
+forms.o: ../fltk3/Input.h ../fltk3/ValueSlider.h ../fltk3/Slider.h
+forms.o: ../fltk3/Valuator.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
+forms.o: ../fltk3/RGBImage.h ../FL/Fl_FormsBitmap.H ../FL/Fl_FormsPixmap.H
+forms.o: ../FL/Fl_Box.H ../FL/Fl_Browser.H ../fltk3/Browser.h
+forms.o: ../FL/Fl_Browser_.H ../fltk3/Browser_.h ../FL/Fl_Scrollbar.H
+forms.o: ../fltk3/Scrollbar.h ../FL/Fl_Slider.H ../fltk3/Slider.h
+forms.o: ../FL/Fl_Valuator.H ../fltk3/Valuator.h ../FL/Fl_Button.H
+forms.o: ../FL/Fl_Light_Button.H ../fltk3/LightButton.h
 forms.o: ../FL/Fl_Round_Button.H ../FL/Fl_Check_Button.H ../FL/Fl_Chart.H
 forms.o: ../fltk3/Chart.h ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../fltk3/Menu_.h
 forms.o: ../FL/Fl_Menu_Item.H ../fltk3/MenuItem.h ../FL/Fl_Clock.H
@@ -529,11 +523,11 @@
 forms.o: ../fltk3/Dial.h ../FL/Fl_Free.H ../FL/fl_ask.H ../fltk3/ask.h
 forms.o: ../FL/fl_show_colormap.H ../fltk3/show_colormap.h ../FL/filename.H
 forms.o: ../fltk3/filename.h ../FL/Fl_File_Chooser.H ../fltk3/FileChooser.h
-forms.o: ../fltk3/MenuButton.h ../fltk3/Preferences.h ../fltk3/TiledGroup.h
-forms.o: ../fltk3/FileBrowser.h ../fltk3/Browser.h ../fltk3/Browser_.h
-forms.o: ../fltk3/Scrollbar.h ../fltk3/FileIcon.h ../fltk3/run.h
-forms.o: ../fltk3/filename.h ../fltk3/FileInput.h ../fltk3/ReturnButton.h
-forms.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Double_Window.H ../FL/Fl_Group.H
+forms.o: ../fltk3/MenuButton.h ../fltk3/TiledGroup.h ../fltk3/FileBrowser.h
+forms.o: ../fltk3/Browser.h ../fltk3/Browser_.h ../fltk3/Scrollbar.h
+forms.o: ../fltk3/FileIcon.h ../fltk3/run.h ../fltk3/filename.h
+forms.o: ../fltk3/FileInput.h ../fltk3/ReturnButton.h ../FL/Fl.H
+forms.o: ../FL/fl_utf8.h ../FL/Fl_Double_Window.H ../FL/Fl_Group.H
 forms.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H
 forms.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H ../FL/Fl_File_Icon.H
 forms.o: ../fltk3/FileIcon.h ../FL/Fl_Box.H ../FL/Fl_Check_Button.H
@@ -619,18 +613,18 @@
 help.o: ../fltk3/HelpView.h ../fltk3/run.h ../fltk3/Scrollbar.h
 help.o: ../fltk3/Slider.h ../fltk3/Valuator.h ../fltk3/draw.h ../fltk3/x.h
 help.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Plugin.h Preferences.h
-help.o: ../FL/Fl_Preferences.H ../fltk3/Group.h ../fltk3/Choice.h
-help.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Image.h
-help.o: ../fltk3/RoundButton.h ../fltk3/LightButton.h ../fltk3/Button.h
-help.o: ../fltk3/CheckButton.h ../fltk3/IntInput.h ../fltk3/Input.h
-help.o: ../fltk3/ValueSlider.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
-help.o: ../fltk3/RGBImage.h ../fltk3/SharedImage.h ../fltk3/filename.h
-help.o: ../FL/Fl.H ../FL/Fl_Scrollbar.H ../fltk3/Scrollbar.h
-help.o: ../FL/Fl_Slider.H ../fltk3/Slider.h ../FL/Fl_Valuator.H
-help.o: ../fltk3/Valuator.h ../FL/fl_draw.H ../fltk3/draw.h ../FL/x.H
-help.o: ../FL/Enumerations.H ../FL/Fl_Window.H ../FL/Fl_Device.H
-help.o: ../FL/Fl_Shared_Image.H ../fltk3/SharedImage.h ../FL/filename.H
-help.o: ../fltk3/filename.h
+help.o: ../FL/Fl_Preferences.H ../fltk3/Preferences.h ../fltk3/Group.h
+help.o: ../fltk3/Choice.h ../fltk3/Menu_.h ../fltk3/MenuItem.h
+help.o: ../fltk3/Image.h ../fltk3/RoundButton.h ../fltk3/LightButton.h
+help.o: ../fltk3/Button.h ../fltk3/CheckButton.h ../fltk3/IntInput.h
+help.o: ../fltk3/Input.h ../fltk3/ValueSlider.h ../fltk3/Bitmap.h
+help.o: ../fltk3/Pixmap.h ../fltk3/RGBImage.h ../fltk3/SharedImage.h
+help.o: ../fltk3/filename.h ../FL/Fl.H ../FL/Fl_Scrollbar.H
+help.o: ../fltk3/Scrollbar.h ../FL/Fl_Slider.H ../fltk3/Slider.h
+help.o: ../FL/Fl_Valuator.H ../fltk3/Valuator.h ../FL/fl_draw.H
+help.o: ../fltk3/draw.h ../FL/x.H ../FL/Enumerations.H ../FL/Fl_Window.H
+help.o: ../FL/Fl_Device.H ../FL/Fl_Shared_Image.H ../fltk3/SharedImage.h
+help.o: ../FL/filename.H ../fltk3/filename.h
 iconize.o: ../FL/Fl.H ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 iconize.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
 iconize.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
@@ -756,17 +750,18 @@
 mandelbrot.o: ../fltk3/Group.h ../fltk3/Xutf8.h ../fltk3/PagedDevice.h
 mandelbrot.o: ../fltk3/Device.h ../fltk3/Object.h ../fltk3/Plugin.h
 mandelbrot.o: Preferences.h ../fltk3/run.h ../fltk3/utf8.h
-mandelbrot.o: ../FL/Fl_Preferences.H ../fltk3/DoubleWindow.h ../fltk3/Group.h
-mandelbrot.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/Choice.h
-mandelbrot.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Image.h
-mandelbrot.o: ../fltk3/RoundButton.h ../fltk3/LightButton.h ../fltk3/Button.h
-mandelbrot.o: ../fltk3/Box.h ../fltk3/CheckButton.h ../fltk3/IntInput.h
-mandelbrot.o: ../fltk3/Input.h ../fltk3/ValueSlider.h ../fltk3/Slider.h
-mandelbrot.o: ../fltk3/Valuator.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
-mandelbrot.o: ../fltk3/RGBImage.h ../fltk3/draw.h ../fltk3/PostScript.h
-mandelbrot.o: ../FL/x.H ../FL/Fl_Paged_Device.H ../FL/Fl_Device.H
-mandelbrot.o: ../FL/Fl_Window.H ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H
-mandelbrot.o: ../FL/Fl_Bitmap.H ../FL/Fl_PostScript.H
+mandelbrot.o: ../FL/Fl_Preferences.H ../fltk3/Preferences.h
+mandelbrot.o: ../fltk3/DoubleWindow.h ../fltk3/Group.h ../fltk3/Input.h
+mandelbrot.o: ../fltk3/Input_.h ../fltk3/Choice.h ../fltk3/Menu_.h
+mandelbrot.o: ../fltk3/MenuItem.h ../fltk3/Image.h ../fltk3/RoundButton.h
+mandelbrot.o: ../fltk3/LightButton.h ../fltk3/Button.h ../fltk3/Box.h
+mandelbrot.o: ../fltk3/CheckButton.h ../fltk3/IntInput.h ../fltk3/Input.h
+mandelbrot.o: ../fltk3/ValueSlider.h ../fltk3/Slider.h ../fltk3/Valuator.h
+mandelbrot.o: ../fltk3/Bitmap.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
+mandelbrot.o: ../fltk3/draw.h ../fltk3/PostScript.h ../FL/x.H
+mandelbrot.o: ../FL/Fl_Paged_Device.H ../FL/Fl_Device.H ../FL/Fl_Window.H
+mandelbrot.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Bitmap.H
+mandelbrot.o: ../FL/Fl_PostScript.H
 menubar.o: ../FL/Fl.H ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 menubar.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
 menubar.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
@@ -952,12 +947,12 @@
 pixmap.o: ../FL/Fl_Button.H ../FL/Fl_Multi_Label.H ../fltk3/MultiLabel.h
 preferences.o: preferences.h ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 preferences.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
-preferences.o: ../FL/Fl_Preferences.H ../FL/Fl_Export.H
-preferences.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
-preferences.o: ../fltk3/Widget.h ../fltk3/Button.h ../fltk3/Group.h
-preferences.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/Choice.h
-preferences.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Image.h
-preferences.o: ../fltk3/RoundButton.h ../fltk3/LightButton.h
+preferences.o: ../FL/Fl_Preferences.H ../fltk3/Preferences.h
+preferences.o: ../FL/Fl_Export.H ../fltk3/DoubleWindow.h ../fltk3/Window.h
+preferences.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Button.h
+preferences.o: ../fltk3/Group.h ../fltk3/Input.h ../fltk3/Input_.h
+preferences.o: ../fltk3/Choice.h ../fltk3/Menu_.h ../fltk3/MenuItem.h
+preferences.o: ../fltk3/Image.h ../fltk3/RoundButton.h ../fltk3/LightButton.h
 preferences.o: ../fltk3/Button.h ../fltk3/Box.h ../fltk3/CheckButton.h
 preferences.o: ../fltk3/IntInput.h ../fltk3/Input.h ../fltk3/ValueSlider.h
 preferences.o: ../fltk3/Slider.h ../fltk3/Valuator.h ../FL/filename.H
@@ -983,30 +978,30 @@
 device.o: ../FL/Fl_Printer.H ../fltk3/Printer.h ../fltk3/x.h
 device.o: ../fltk3/PagedDevice.h ../fltk3/Device.h ../fltk3/Object.h
 device.o: ../fltk3/Plugin.h Preferences.h ../FL/Fl_Preferences.H
-device.o: ../fltk3/Button.h ../fltk3/Group.h ../fltk3/Input.h
-device.o: ../fltk3/Input_.h ../fltk3/Choice.h ../fltk3/Menu_.h
-device.o: ../fltk3/MenuItem.h ../fltk3/Box.h ../fltk3/CheckButton.h
-device.o: ../fltk3/IntInput.h ../fltk3/Input.h ../fltk3/ValueSlider.h
-device.o: ../fltk3/Slider.h ../fltk3/Valuator.h ../fltk3/RGBImage.h
-device.o: ../fltk3/draw.h ../fltk3/PostScript.h ../FL/x.H
+device.o: ../fltk3/Preferences.h ../fltk3/Button.h ../fltk3/Group.h
+device.o: ../fltk3/Input.h ../fltk3/Input_.h ../fltk3/Choice.h
+device.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Box.h
+device.o: ../fltk3/CheckButton.h ../fltk3/IntInput.h ../fltk3/Input.h
+device.o: ../fltk3/ValueSlider.h ../fltk3/Slider.h ../fltk3/Valuator.h
+device.o: ../fltk3/RGBImage.h ../fltk3/draw.h ../fltk3/PostScript.h ../FL/x.H
 device.o: ../FL/Fl_Paged_Device.H ../FL/Fl_Device.H ../FL/Fl_Window.H
 device.o: ../FL/Fl_RGB_Image.H ../FL/Fl_PostScript.H ../FL/Fl_File_Chooser.H
-device.o: ../fltk3/FileChooser.h ../fltk3/MenuButton.h ../fltk3/Preferences.h
-device.o: ../fltk3/TiledGroup.h ../fltk3/FileBrowser.h ../fltk3/Browser.h
-device.o: ../fltk3/Browser_.h ../fltk3/Scrollbar.h ../fltk3/FileIcon.h
-device.o: ../fltk3/run.h ../fltk3/filename.h ../fltk3/FileInput.h
-device.o: ../fltk3/ReturnButton.h ../fltk3/ask.h ../FL/Fl_Double_Window.H
-device.o: ../FL/Fl_Group.H ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
-device.o: ../fltk3/Menu_.h ../FL/Fl_Menu_Item.H ../fltk3/MenuItem.h
-device.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H ../FL/Fl_Tile.H
-device.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H ../fltk3/Browser.h
-device.o: ../FL/Fl_Browser_.H ../fltk3/Browser_.h ../FL/Fl_Scrollbar.H
-device.o: ../fltk3/Scrollbar.h ../FL/Fl_Slider.H ../fltk3/Slider.h
-device.o: ../FL/Fl_Valuator.H ../fltk3/Valuator.h ../FL/Fl.H
-device.o: ../FL/Fl_File_Icon.H ../fltk3/FileIcon.h ../FL/filename.H
-device.o: ../fltk3/filename.h ../FL/Fl_Box.H ../FL/Fl_Check_Button.H
-device.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H ../FL/Fl_Input_.H
-device.o: ../fltk3/Input_.h ../FL/Fl_Return_Button.H ../FL/fl_ask.H
+device.o: ../fltk3/FileChooser.h ../fltk3/MenuButton.h ../fltk3/TiledGroup.h
+device.o: ../fltk3/FileBrowser.h ../fltk3/Browser.h ../fltk3/Browser_.h
+device.o: ../fltk3/Scrollbar.h ../fltk3/FileIcon.h ../fltk3/run.h
+device.o: ../fltk3/filename.h ../fltk3/FileInput.h ../fltk3/ReturnButton.h
+device.o: ../fltk3/ask.h ../FL/Fl_Double_Window.H ../FL/Fl_Group.H
+device.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H ../fltk3/Menu_.h
+device.o: ../FL/Fl_Menu_Item.H ../fltk3/MenuItem.h ../FL/Fl_Menu_Button.H
+device.o: ../FL/Fl_Button.H ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H
+device.o: ../FL/Fl_Browser.H ../fltk3/Browser.h ../FL/Fl_Browser_.H
+device.o: ../fltk3/Browser_.h ../FL/Fl_Scrollbar.H ../fltk3/Scrollbar.h
+device.o: ../FL/Fl_Slider.H ../fltk3/Slider.h ../FL/Fl_Valuator.H
+device.o: ../fltk3/Valuator.h ../FL/Fl.H ../FL/Fl_File_Icon.H
+device.o: ../fltk3/FileIcon.h ../FL/filename.H ../fltk3/filename.h
+device.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H ../FL/Fl_File_Input.H
+device.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../fltk3/Input_.h
+device.o: ../FL/Fl_Return_Button.H ../FL/fl_ask.H
 radio.o: radio.h ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 radio.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
 radio.o: ../fltk3/DoubleWindow.h ../fltk3/Window.h ../fltk3/Group.h
@@ -1116,21 +1111,22 @@
 sudoku.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
 sudoku.o: ../fltk3/draw.h ../fltk3/x.h ../fltk3/Device.h ../fltk3/Object.h
 sudoku.o: ../fltk3/Plugin.h Preferences.h ../FL/Fl_Preferences.H
-sudoku.o: ../fltk3/Group.h ../fltk3/Choice.h ../fltk3/Menu_.h
-sudoku.o: ../fltk3/MenuItem.h ../fltk3/Image.h ../fltk3/RoundButton.h
-sudoku.o: ../fltk3/LightButton.h ../fltk3/Button.h ../fltk3/CheckButton.h
-sudoku.o: ../fltk3/IntInput.h ../fltk3/Input.h ../fltk3/ValueSlider.h
-sudoku.o: ../fltk3/Bitmap.h ../fltk3/Pixmap.h ../fltk3/RGBImage.h
-sudoku.o: ../fltk3/SharedImage.h ../fltk3/filename.h ../FL/Fl.H
-sudoku.o: ../FL/Fl_Scrollbar.H ../fltk3/Scrollbar.h ../FL/Fl_Slider.H
-sudoku.o: ../fltk3/Slider.h ../FL/Fl_Valuator.H ../fltk3/Valuator.h
-sudoku.o: ../FL/fl_draw.H ../fltk3/draw.h ../FL/x.H ../FL/Fl_Window.H
-sudoku.o: ../FL/Fl_Device.H ../FL/Fl_Shared_Image.H ../fltk3/SharedImage.h
-sudoku.o: ../FL/filename.H ../fltk3/filename.h ../FL/Fl_Sys_Menu_Bar.H
-sudoku.o: ../fltk3/SysMenuBar.h ../fltk3/MenuBar.h ../fltk3/x.h
-sudoku.o: ../FL/Fl_Menu_Bar.H ../fltk3/MenuBar.h ../FL/Fl_Menu_.H
-sudoku.o: ../fltk3/Menu_.h ../FL/Fl_Menu_Item.H ../fltk3/MenuItem.h ../FL/x.H
-sudoku.o: ../FL/math.h ../fltk3/math.h pixmaps/sudoku.xbm ../config.h
+sudoku.o: ../fltk3/Preferences.h ../fltk3/Group.h ../fltk3/Choice.h
+sudoku.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/Image.h
+sudoku.o: ../fltk3/RoundButton.h ../fltk3/LightButton.h ../fltk3/Button.h
+sudoku.o: ../fltk3/CheckButton.h ../fltk3/IntInput.h ../fltk3/Input.h
+sudoku.o: ../fltk3/ValueSlider.h ../fltk3/Bitmap.h ../fltk3/Pixmap.h
+sudoku.o: ../fltk3/RGBImage.h ../fltk3/SharedImage.h ../fltk3/filename.h
+sudoku.o: ../FL/Fl.H ../FL/Fl_Scrollbar.H ../fltk3/Scrollbar.h
+sudoku.o: ../FL/Fl_Slider.H ../fltk3/Slider.h ../FL/Fl_Valuator.H
+sudoku.o: ../fltk3/Valuator.h ../FL/fl_draw.H ../fltk3/draw.h ../FL/x.H
+sudoku.o: ../FL/Fl_Window.H ../FL/Fl_Device.H ../FL/Fl_Shared_Image.H
+sudoku.o: ../fltk3/SharedImage.h ../FL/filename.H ../fltk3/filename.h
+sudoku.o: ../FL/Fl_Sys_Menu_Bar.H ../fltk3/SysMenuBar.h ../fltk3/MenuBar.h
+sudoku.o: ../fltk3/x.h ../FL/Fl_Menu_Bar.H ../fltk3/MenuBar.h
+sudoku.o: ../FL/Fl_Menu_.H ../fltk3/Menu_.h ../FL/Fl_Menu_Item.H
+sudoku.o: ../fltk3/MenuItem.h ../FL/x.H ../FL/math.h ../fltk3/math.h
+sudoku.o: pixmaps/sudoku.xbm ../config.h
 symbols.o: ../FL/Fl.H ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 symbols.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h
 symbols.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
@@ -1207,8 +1203,8 @@
 tiled_image.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Image.H
 tiled_image.o: ../fltk3/Image.h ../FL/Fl_Button.H ../fltk3/Button.h
 tiled_image.o: ../FL/Fl_Pixmap.H ../fltk3/Pixmap.h ../fltk3/Image.h
-tiled_image.o: ../FL/Fl_Tiled_Image.H pixmaps/tile.xpm ../FL/x.H ../fltk3/x.h
-tiled_image.o: list_visuals.cxx ../config.h
+tiled_image.o: ../FL/Fl_Tiled_Image.H ../fltk3/TiledImage.h pixmaps/tile.xpm
+tiled_image.o: ../FL/x.H ../fltk3/x.h list_visuals.cxx ../config.h
 tree.o: tree.h ../fltk3/run.h ../fltk3/utf8.h ../fltk3/Export.h
 tree.o: ../fltk3/types.h ../fltk3/Xutf8.h ../fltk3/enumerations.h ../FL/Fl.H
 tree.o: ../fltk3/Widget.h ../fltk3/Rectangle.h ../fltk3/Object.h
@@ -1216,17 +1212,19 @@
 tree.o: ../FL/Fl_Export.H ../FL/fl_types.h ../fltk3/types.h ../FL/Fl_Pixmap.H
 tree.o: ../fltk3/Pixmap.h ../fltk3/Image.h ../FL/Fl_Image.H ../fltk3/Image.h
 tree.o: ../fltk3/Wrapper.h ../fltk3/Window.h ../FL/Fl_Group.H ../FL/Fl_Tree.H
+tree.o: ../fltk3/Tree.h ../fltk3/Group.h ../fltk3/Scrollbar.h ../fltk3/draw.h
+tree.o: ../fltk3/TreeItem.h ../fltk3/TreeItemArray.h ../fltk3/TreePrefs.h
 tree.o: ../FL/Fl_Scrollbar.H ../FL/fl_draw.H ../FL/Fl_Tree_Item.H
 tree.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/Fl_Tree_Item_Array.H
 tree.o: ../FL/Fl_Tree_Prefs.H ../FL/fl_ask.H ../fltk3/ask.h
 tree.o: ../FL/fl_message.H ../FL/fl_ask.H ../FL/Fl_File_Chooser.H
 tree.o: ../fltk3/FileChooser.h ../fltk3/DoubleWindow.h ../fltk3/Window.h
-tree.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Group.h ../fltk3/Choice.h
-tree.o: ../fltk3/Menu_.h ../fltk3/MenuItem.h ../fltk3/MenuButton.h
-tree.o: ../fltk3/Button.h ../fltk3/Preferences.h ../fltk3/TiledGroup.h
-tree.o: ../fltk3/FileBrowser.h ../fltk3/Browser.h ../fltk3/Browser_.h
-tree.o: ../fltk3/Scrollbar.h ../fltk3/Slider.h ../fltk3/Valuator.h
-tree.o: ../fltk3/FileIcon.h ../fltk3/run.h ../fltk3/filename.h ../fltk3/Box.h
+tree.o: ../fltk3/Group.h ../fltk3/Widget.h ../fltk3/Choice.h ../fltk3/Menu_.h
+tree.o: ../fltk3/MenuItem.h ../fltk3/MenuButton.h ../fltk3/Button.h
+tree.o: ../fltk3/Preferences.h ../fltk3/TiledGroup.h ../fltk3/FileBrowser.h
+tree.o: ../fltk3/Browser.h ../fltk3/Browser_.h ../fltk3/Scrollbar.h
+tree.o: ../fltk3/Slider.h ../fltk3/Valuator.h ../fltk3/FileIcon.h
+tree.o: ../fltk3/run.h ../fltk3/filename.h ../fltk3/Box.h
 tree.o: ../fltk3/CheckButton.h ../fltk3/LightButton.h ../fltk3/Button.h
 tree.o: ../fltk3/FileInput.h ../fltk3/Input.h ../fltk3/Input_.h
 tree.o: ../fltk3/ReturnButton.h ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
@@ -1235,8 +1233,8 @@
 tree.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Button.H ../FL/Fl_Preferences.H
 tree.o: ../FL/Fl_Tile.H ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H
 tree.o: ../fltk3/Browser.h ../FL/Fl_Browser_.H ../fltk3/Browser_.h
-tree.o: ../FL/Fl_Scrollbar.H ../fltk3/Scrollbar.h ../FL/Fl_Slider.H
-tree.o: ../fltk3/Slider.h ../FL/Fl_Valuator.H ../fltk3/Valuator.h ../FL/Fl.H
+tree.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../fltk3/Slider.h
+tree.o: ../FL/Fl_Valuator.H ../fltk3/Valuator.h ../FL/Fl.H
 tree.o: ../FL/Fl_File_Icon.H ../fltk3/FileIcon.h ../FL/filename.H
 tree.o: ../fltk3/filename.h ../FL/Fl_Box.H ../FL/Fl_Check_Button.H
 tree.o: ../FL/Fl_Light_Button.H ../fltk3/LightButton.h ../FL/Fl_Button.H

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to