DLL changes (still some more to go...)

Move BMP, GIF, and PNM image loaders to fltkimages project.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2583 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-08-14 16:19:48 +00:00
parent 019f933251
commit 1aecada52c
13 changed files with 165 additions and 161 deletions

12
FL/Fl.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl.H,v 1.8.2.11.2.20 2002/08/09 01:09:48 easysw Exp $"
// "$Id: Fl.H,v 1.8.2.11.2.21 2002/08/14 16:19:47 easysw Exp $"
//
// Main header file for the Fast Light Tool Kit (FLTK).
//
@ -51,8 +51,12 @@ class FL_EXPORT Fl {
public: // should be private!
static int e_number;
static int e_x,e_y,e_x_root,e_y_root;
static int e_dx, e_dy;
static int e_x;
static int e_y;
static int e_x_root;
static int e_y_root;
static int e_dx;
static int e_dy;
static int e_state;
static int e_clicks;
static int e_is_click;
@ -258,5 +262,5 @@ public:
#endif // !Fl_H
//
// End of "$Id: Fl.H,v 1.8.2.11.2.20 2002/08/09 01:09:48 easysw Exp $".
// End of "$Id: Fl.H,v 1.8.2.11.2.21 2002/08/14 16:19:47 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Group.H,v 1.6.2.4.2.5 2002/07/14 19:08:25 easysw Exp $"
// "$Id: Fl_Group.H,v 1.6.2.4.2.6 2002/08/14 16:19:48 easysw Exp $"
//
// Group header file for the Fast Light Tool Kit (FLTK).
//
@ -43,11 +43,11 @@ class FL_EXPORT Fl_Group : public Fl_Widget {
protected:
FL_EXPORT void draw();
FL_EXPORT void draw_child(Fl_Widget&) const;
FL_EXPORT void update_child(Fl_Widget&) const;
FL_EXPORT void draw_outside_label(const Fl_Widget&) const ;
FL_EXPORT short* sizes();
void draw();
void draw_child(Fl_Widget&) const;
void update_child(Fl_Widget&) const;
void draw_outside_label(const Fl_Widget&) const ;
short* sizes();
public:
@ -88,7 +88,7 @@ public:
// dummy class used to end child groups in constructors for complex
// subclasses of Fl_Group:
class Fl_End {
class FL_EXPORT Fl_End {
public:
Fl_End() {Fl_Group::current()->end();}
};
@ -96,5 +96,5 @@ public:
#endif
//
// End of "$Id: Fl_Group.H,v 1.6.2.4.2.5 2002/07/14 19:08:25 easysw Exp $".
// End of "$Id: Fl_Group.H,v 1.6.2.4.2.6 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Image.H,v 1.5.2.3.2.14 2002/08/05 17:50:23 easysw Exp $"
// "$Id: Fl_Image.H,v 1.5.2.3.2.15 2002/08/14 16:19:48 easysw Exp $"
//
// Image header file for the Fast Light Tool Kit (FLTK).
//
@ -46,10 +46,10 @@ class FL_EXPORT Fl_Image {
void d(int D) {d_ = D;}
void ld(int LD) {ld_ = LD;}
void data(const char * const *p, int c) {data_ = p; count_ = c;}
FL_EXPORT void draw_empty(int X, int Y);
void draw_empty(int X, int Y);
FL_EXPORT static void labeltype(const Fl_Label *lo, int lx, int ly, int lw, int lh, Fl_Align la);
FL_EXPORT static void measure(const Fl_Label *lo, int &lw, int &lh);
static void labeltype(const Fl_Label *lo, int lx, int ly, int lw, int lh, Fl_Align la);
static void measure(const Fl_Label *lo, int &lw, int &lh);
public:
@ -100,5 +100,5 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image {
#endif
//
// End of "$Id: Fl_Image.H,v 1.5.2.3.2.14 2002/08/05 17:50:23 easysw Exp $".
// End of "$Id: Fl_Image.H,v 1.5.2.3.2.15 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Preferences.H,v 1.1.2.8 2002/05/31 19:27:56 easysw Exp $"
// "$Id: Fl_Preferences.H,v 1.1.2.9 2002/08/14 16:19:48 easysw Exp $"
//
// Preferences definitions for the Fast Light Tool Kit (FLTK).
//
@ -30,14 +30,14 @@
# include <windows.h>
# endif // WIN32
#include <stdio.h>
# include <stdio.h>
# include "Fl_Export.H"
/**
* Preferences are a data tree containing a root, branches and leafs
*/
class Fl_Preferences
class FL_EXPORT Fl_Preferences
{
public:
@ -45,50 +45,50 @@ public:
enum Root { SYSTEM=0, USER };
// enum Type { win32, macos, fltk };
FL_EXPORT Fl_Preferences( Root root, const char *vendor, const char *application );
FL_EXPORT Fl_Preferences( Fl_Preferences&, const char *group );
FL_EXPORT Fl_Preferences( Fl_Preferences*, const char *group );
FL_EXPORT ~Fl_Preferences();
Fl_Preferences( Root root, const char *vendor, const char *application );
Fl_Preferences( Fl_Preferences&, const char *group );
Fl_Preferences( Fl_Preferences*, const char *group );
~Fl_Preferences();
FL_EXPORT int groups();
FL_EXPORT const char *group( int );
FL_EXPORT char groupExists( const char *group );
FL_EXPORT char deleteGroup( const char *group );
int groups();
const char *group( int );
char groupExists( const char *group );
char deleteGroup( const char *group );
FL_EXPORT int entries();
FL_EXPORT const char *entry( int );
FL_EXPORT char entryExists( const char *entry );
FL_EXPORT char deleteEntry( const char *entry );
int entries();
const char *entry( int );
char entryExists( const char *entry );
char deleteEntry( const char *entry );
FL_EXPORT char set( const char *entry, int value );
FL_EXPORT char set( const char *entry, float value );
FL_EXPORT char set( const char *entry, double value );
FL_EXPORT char set( const char *entry, const char *value );
FL_EXPORT char set( const char *entry, const void *value, int size );
char set( const char *entry, int value );
char set( const char *entry, float value );
char set( const char *entry, double value );
char set( const char *entry, const char *value );
char set( const char *entry, const void *value, int size );
FL_EXPORT char get( const char *entry, int &value, int defaultValue );
FL_EXPORT char get( const char *entry, float &value, float defaultValue );
FL_EXPORT char get( const char *entry, double &value, double defaultValue );
FL_EXPORT char get( const char *entry, char *&value, const char *defaultValue );
FL_EXPORT char get( const char *entry, char *value, const char *defaultValue, int maxSize );
FL_EXPORT char get( const char *entry, void *&value, const void *defaultValue, int defaultSize );
FL_EXPORT char get( const char *entry, void *value, const void *defaultValue, int defaultSize, int maxSize );
FL_EXPORT int size( const char *entry );
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 );
FL_EXPORT char getUserdataPath( char *path, int pathlen );
char getUserdataPath( char *path, int pathlen );
FL_EXPORT void flush();
void flush();
// FL_EXPORT char export( const char *filename, Type fileFormat );
// FL_EXPORT char import( const char *filename );
// char export( const char *filename, Type fileFormat );
// char import( const char *filename );
class Name {
char *data_;
public:
FL_EXPORT Name( unsigned int n );
FL_EXPORT Name( const char *format, ... );
FL_EXPORT operator const char *() { return data_; }
FL_EXPORT ~Name();
Name( unsigned int n );
Name( const char *format, ... );
operator const char *() { return data_; }
~Name();
};
struct Entry
@ -155,5 +155,5 @@ private:
#endif // !Fl_Preferences_H
//
// End of "$Id: Fl_Preferences.H,v 1.1.2.8 2002/05/31 19:27:56 easysw Exp $".
// End of "$Id: Fl_Preferences.H,v 1.1.2.9 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Scrollbar.H,v 1.5.2.4.2.2 2002/08/09 01:09:48 easysw Exp $"
// "$Id: Fl_Scrollbar.H,v 1.5.2.4.2.3 2002/08/14 16:19:48 easysw Exp $"
//
// Scroll bar header file for the Fast Light Tool Kit (FLTK).
//
@ -28,19 +28,19 @@
#include "Fl_Slider.H"
class Fl_Scrollbar : public Fl_Slider {
class FL_EXPORT Fl_Scrollbar : public Fl_Slider {
int linesize_;
int pushed_;
static FL_EXPORT void timeout_cb(void*);
FL_EXPORT void increment_cb();
static void timeout_cb(void*);
void increment_cb();
protected:
FL_EXPORT void draw();
void draw();
public:
FL_EXPORT Fl_Scrollbar(int x,int y,int w,int h, const char *l = 0);
FL_EXPORT int handle(int);
Fl_Scrollbar(int x,int y,int w,int h, const char *l = 0);
int handle(int);
int value() {return int(Fl_Slider::value());}
int value(int p, int s, int top, int total) {
@ -54,5 +54,5 @@ public:
#endif
//
// End of "$Id: Fl_Scrollbar.H,v 1.5.2.4.2.2 2002/08/09 01:09:48 easysw Exp $".
// End of "$Id: Fl_Scrollbar.H,v 1.5.2.4.2.3 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Shared_Image.H,v 1.22.2.6 2002/07/14 21:25:39 easysw Exp $"
// "$Id: Fl_Shared_Image.H,v 1.22.2.7 2002/08/14 16:19:48 easysw Exp $"
//
// Shared image header file for the Fast Light Tool Kit (FLTK).
//
@ -53,11 +53,11 @@ class FL_EXPORT Fl_Shared_Image : public Fl_Image {
static int compare(Fl_Shared_Image **i0, Fl_Shared_Image **i1);
// Use get() and release() to load/delete images in memory...
FL_EXPORT Fl_Shared_Image();
FL_EXPORT Fl_Shared_Image(const char *n, Fl_Image *img = 0);
FL_EXPORT virtual ~Fl_Shared_Image();
FL_EXPORT void add();
FL_EXPORT void update();
Fl_Shared_Image();
Fl_Shared_Image(const char *n, Fl_Image *img = 0);
virtual ~Fl_Shared_Image();
void add();
void update();
public:
@ -92,5 +92,5 @@ FL_EXPORT extern void fl_register_images();
#endif // !Fl_Shared_Image_H
//
// End of "$Id: Fl_Shared_Image.H,v 1.22.2.6 2002/07/14 21:25:39 easysw Exp $"
// End of "$Id: Fl_Shared_Image.H,v 1.22.2.7 2002/08/14 16:19:48 easysw Exp $"
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Slider.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $"
// "$Id: Fl_Slider.H,v 1.5.2.3.2.2 2002/08/14 16:19:48 easysw Exp $"
//
// Slider header file for the Fast Light Tool Kit (FLTK).
//
@ -38,30 +38,30 @@
#define FL_VERT_NICE_SLIDER 4
#define FL_HOR_NICE_SLIDER 5
class Fl_Slider : public Fl_Valuator {
class FL_EXPORT Fl_Slider : public Fl_Valuator {
float slider_size_;
uchar slider_;
FL_EXPORT void _Fl_Slider();
FL_EXPORT void draw_bg(int, int, int, int);
void _Fl_Slider();
void draw_bg(int, int, int, int);
protected:
// these allow subclasses to put the slider in a smaller area:
FL_EXPORT void draw(int, int, int, int);
FL_EXPORT int handle(int, int, int, int, int);
void draw(int, int, int, int);
int handle(int, int, int, int, int);
public:
FL_EXPORT void draw();
FL_EXPORT int handle(int);
FL_EXPORT Fl_Slider(int x,int y,int w,int h, const char *l = 0);
FL_EXPORT Fl_Slider(uchar t,int x,int y,int w,int h, const char *l);
void draw();
int handle(int);
Fl_Slider(int x,int y,int w,int h, const char *l = 0);
Fl_Slider(uchar t,int x,int y,int w,int h, const char *l);
FL_EXPORT int scrollvalue(int windowtop,int windowsize,int first,int totalsize);
FL_EXPORT void bounds(double a, double b);
int scrollvalue(int windowtop,int windowsize,int first,int totalsize);
void bounds(double a, double b);
float slider_size() const {return slider_size_;}
FL_EXPORT void slider_size(double v);
void slider_size(double v);
Fl_Boxtype slider() const {return (Fl_Boxtype)slider_;}
void slider(Fl_Boxtype c) {slider_ = c;}
};
@ -69,5 +69,5 @@ public:
#endif
//
// End of "$Id: Fl_Slider.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $".
// End of "$Id: Fl_Slider.H,v 1.5.2.3.2.2 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Valuator.H,v 1.5.2.5.2.1 2002/01/01 15:11:28 easysw Exp $"
// "$Id: Fl_Valuator.H,v 1.5.2.5.2.2 2002/08/14 16:19:48 easysw Exp $"
//
// Valuator header file for the Fast Light Tool Kit (FLTK).
//
@ -34,7 +34,7 @@
#define FL_VERTICAL 0
#define FL_HORIZONTAL 1
class Fl_Valuator : public Fl_Widget {
class FL_EXPORT Fl_Valuator : public Fl_Widget {
double value_;
double previous_value_;
@ -44,14 +44,14 @@ class Fl_Valuator : public Fl_Widget {
protected:
int horizontal() const {return type()&1;}
FL_EXPORT Fl_Valuator(int X, int Y, int W, int H, const char* L);
Fl_Valuator(int X, int Y, int W, int H, const char* L);
double previous_value() const {return previous_value_;}
void handle_push() {previous_value_ = value_;}
FL_EXPORT double softclamp(double);
FL_EXPORT void handle_drag(double newvalue);
FL_EXPORT void handle_release(); // use drag() value
virtual FL_EXPORT void value_damage(); // cause damage() due to value() changing
double softclamp(double);
void handle_drag(double newvalue);
void handle_release(); // use drag() value
virtual void value_damage(); // cause damage() due to value() changing
void set_value(double v) {value_ = v;}
public:
@ -64,21 +64,21 @@ public:
void range(double a, double b) {min = a; max = b;}
void step(int a) {A = a; B = 1;}
void step(double a, int b) {A = a; B = b;}
FL_EXPORT void step(double s);
void step(double s);
double step() const {return A/B;}
FL_EXPORT void precision(int);
void precision(int);
double value() const {return value_;}
FL_EXPORT int value(double);
int value(double);
virtual FL_EXPORT int format(char*);
FL_EXPORT double round(double); // round to nearest multiple of step
FL_EXPORT double clamp(double); // keep in range
FL_EXPORT double increment(double, int); // add n*step to value
virtual int format(char*);
double round(double); // round to nearest multiple of step
double clamp(double); // keep in range
double increment(double, int); // add n*step to value
};
#endif
//
// End of "$Id: Fl_Valuator.H,v 1.5.2.5.2.1 2002/01/01 15:11:28 easysw Exp $".
// End of "$Id: Fl_Valuator.H,v 1.5.2.5.2.2 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Widget.H,v 1.6.2.4.2.16 2002/08/09 01:09:48 easysw Exp $"
// "$Id: Fl_Widget.H,v 1.6.2.4.2.17 2002/08/14 16:19:48 easysw Exp $"
//
// Widget header file for the Fast Light Tool Kit (FLTK).
//
@ -38,7 +38,7 @@ typedef Fl_Callback* Fl_Callback_p; // needed for BORLAND
typedef void (Fl_Callback0)(Fl_Widget*);
typedef void (Fl_Callback1)(Fl_Widget*, long);
struct Fl_Label {
struct FL_EXPORT Fl_Label {
const char* value;
Fl_Image* image;
Fl_Image* deimage;
@ -46,11 +46,11 @@ struct Fl_Label {
uchar font;
uchar size;
unsigned color;
FL_EXPORT void draw(int,int,int,int, Fl_Align) const ;
FL_EXPORT void measure(int&, int&) const ;
void draw(int,int,int,int, Fl_Align) const ;
void measure(int&, int&) const ;
};
class Fl_Widget {
class FL_EXPORT Fl_Widget {
friend class Fl_Group;
Fl_Group* parent_;
@ -70,12 +70,12 @@ class Fl_Widget {
const char *tooltip_;
// "de-implement" the copy constructors:
FL_EXPORT Fl_Widget & operator=(const Fl_Widget &);
FL_EXPORT Fl_Widget(const Fl_Widget &);
Fl_Widget & operator=(const Fl_Widget &);
Fl_Widget(const Fl_Widget &);
protected:
FL_EXPORT Fl_Widget(int,int,int,int,const char* =0);
Fl_Widget(int,int,int,int,const char* =0);
void x(int v) {x_ = v;}
void y(int v) {y_ = v;}
@ -88,20 +88,20 @@ protected:
enum {INACTIVE=1, INVISIBLE=2, OUTPUT=4, SHORTCUT_LABEL=64,
CHANGED=128, VISIBLE_FOCUS=512};
FL_EXPORT void draw_box() const;
FL_EXPORT void draw_box(Fl_Boxtype, Fl_Color) const;
FL_EXPORT void draw_box(Fl_Boxtype, int,int,int,int, Fl_Color) const;
void draw_box() const;
void draw_box(Fl_Boxtype, Fl_Color) const;
void draw_box(Fl_Boxtype, int,int,int,int, Fl_Color) const;
void draw_focus() {draw_focus(box(),x(),y(),w(),h());}
FL_EXPORT void draw_focus(Fl_Boxtype, int,int,int,int) const;
FL_EXPORT void draw_label() const;
FL_EXPORT void draw_label(int, int, int, int) const;
void draw_focus(Fl_Boxtype, int,int,int,int) const;
void draw_label() const;
void draw_label(int, int, int, int) const;
public:
FL_EXPORT virtual ~Fl_Widget();
virtual ~Fl_Widget();
FL_EXPORT virtual void draw() = 0;
FL_EXPORT virtual int handle(int);
virtual void draw() = 0;
virtual int handle(int);
Fl_Group* parent() const {return parent_;}
void parent(Fl_Group* p) {parent_ = p;} // for hacks only, Fl_Group::add()
@ -112,8 +112,8 @@ public:
int y() const {return y_;}
int w() const {return w_;}
int h() const {return h_;}
FL_EXPORT virtual void resize(int,int,int,int);
FL_EXPORT int damage_resize(int,int,int,int);
virtual void resize(int,int,int,int);
int damage_resize(int,int,int,int);
void position(int X,int Y) {resize(X,Y,w_,h_);}
void size(int W,int H) {resize(x_,y_,W,H);}
@ -144,7 +144,7 @@ public:
void deimage(Fl_Image* a) {label_.deimage=a;}
void deimage(Fl_Image& a) {label_.deimage=&a;}
const char *tooltip() const {return tooltip_;}
FL_EXPORT void tooltip(const char *t);
void tooltip(const char *t);
Fl_Callback_p callback() const {return callback_;}
void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;}
void callback(Fl_Callback* c) {callback_=c;}
@ -158,15 +158,15 @@ public:
void when(uchar i) {when_ = i;}
int visible() const {return !(flags_&INVISIBLE);}
FL_EXPORT int visible_r() const;
FL_EXPORT void show();
FL_EXPORT void hide();
int visible_r() const;
void show();
void hide();
void set_visible() {flags_ &= ~INVISIBLE;}
void clear_visible() {flags_ |= INVISIBLE;}
int active() const {return !(flags_&INACTIVE);}
FL_EXPORT int active_r() const;
FL_EXPORT void activate();
FL_EXPORT void deactivate();
int active_r() const;
void activate();
void deactivate();
int output() const {return (flags_&OUTPUT);}
void set_output() {flags_ |= OUTPUT;}
void clear_output() {flags_ &= ~OUTPUT;}
@ -174,30 +174,30 @@ public:
int changed() const {return flags_&CHANGED;}
void set_changed() {flags_ |= CHANGED;}
void clear_changed() {flags_ &= ~CHANGED;}
FL_EXPORT int take_focus();
int take_focus();
void set_visible_focus() { flags_ |= VISIBLE_FOCUS; }
void clear_visible_focus() { flags_ &= ~VISIBLE_FOCUS; }
void visible_focus(int v) { if (v) set_visible_focus(); else clear_visible_focus(); }
int visible_focus() { return flags_ & VISIBLE_FOCUS; }
FL_EXPORT static void default_callback(Fl_Widget*, void*);
static void default_callback(Fl_Widget*, void*);
void do_callback() {callback_(this,user_data_);}
void do_callback(Fl_Widget* o,void* arg=0) {callback_(o,arg);}
void do_callback(Fl_Widget* o,long arg) {callback_(o,(void*)arg);}
FL_EXPORT int test_shortcut();
FL_EXPORT static int test_shortcut(const char*);
FL_EXPORT int contains(const Fl_Widget*) const ;
int test_shortcut();
static int test_shortcut(const char*);
int contains(const Fl_Widget*) const ;
int inside(const Fl_Widget* o) const {return o ? o->contains(this) : 0;}
FL_EXPORT void redraw();
void redraw();
uchar damage() const {return damage_;}
void clear_damage(uchar c = 0) {damage_ = c;}
FL_EXPORT void damage(uchar c);
FL_EXPORT void damage(uchar c,int,int,int,int);
FL_EXPORT void draw_label(int, int, int, int, Fl_Align) const;
void damage(uchar c);
void damage(uchar c,int,int,int,int);
void draw_label(int, int, int, int, Fl_Align) const;
void measure_label(int& xx, int& yy) {label_.measure(xx,yy);}
FL_EXPORT Fl_Window* window() const ;
Fl_Window* window() const ;
// back compatability only:
Fl_Color color2() const {return (Fl_Color)color2_;}
@ -212,5 +212,5 @@ public:
#endif
//
// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.16 2002/08/09 01:09:48 easysw Exp $".
// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.17 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Window.H,v 1.12.2.6.2.4 2002/08/01 02:15:41 easysw Exp $"
// "$Id: Fl_Window.H,v 1.12.2.6.2.5 2002/08/14 16:19:48 easysw Exp $"
//
// Window header file for the Fast Light Tool Kit (FLTK).
//
@ -46,7 +46,7 @@ class FL_EXPORT Fl_Window : public Fl_Group {
// cursor stuff
Fl_Cursor cursor_default;
Fl_Color cursor_fg, cursor_bg;
FL_EXPORT void size_range_();
void size_range_();
// values for flags():
enum {
FL_MODAL = 64,
@ -55,13 +55,13 @@ class FL_EXPORT Fl_Window : public Fl_Group {
FL_NON_MODAL = 32,
FL_OVERRIDE = 256
};
FL_EXPORT void _Fl_Window(); // constructor innards
void _Fl_Window(); // constructor innards
protected:
static FL_EXPORT Fl_Window *current_;
virtual FL_EXPORT void draw();
virtual FL_EXPORT void flush();
static Fl_Window *current_;
virtual void draw();
virtual void flush();
public:
@ -123,5 +123,5 @@ public:
#endif
//
// End of "$Id: Fl_Window.H,v 1.12.2.6.2.4 2002/08/01 02:15:41 easysw Exp $".
// End of "$Id: Fl_Window.H,v 1.12.2.6.2.5 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Wizard.H,v 1.1.2.3 2002/07/14 19:08:25 easysw Exp $"
// "$Id: Fl_Wizard.H,v 1.1.2.4 2002/08/14 16:19:48 easysw Exp $"
//
// Fl_Wizard widget definitions.
//
@ -41,7 +41,7 @@ class FL_EXPORT Fl_Wizard : public Fl_Group
{
Fl_Widget *value_;
FL_EXPORT void draw();
void draw();
public:
@ -56,5 +56,5 @@ class FL_EXPORT Fl_Wizard : public Fl_Group
#endif // !_Fl_Wizard_H_
//
// End of "$Id: Fl_Wizard.H,v 1.1.2.3 2002/07/14 19:08:25 easysw Exp $".
// End of "$Id: Fl_Wizard.H,v 1.1.2.4 2002/08/14 16:19:48 easysw Exp $".
//

View File

@ -147,10 +147,6 @@ SOURCE=..\src\Fl_Bitmap.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_BMP_Image.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_Box.cxx
# End Source File
# Begin Source File
@ -295,10 +291,6 @@ SOURCE=..\src\Fl_get_system_colors.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_GIF_Image.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_grab.cxx
# End Source File
# Begin Source File
@ -407,10 +399,6 @@ SOURCE=..\src\fl_plastic.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_PNM_Image.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_Positioner.cxx
# End Source File
# Begin Source File

View File

@ -8,12 +8,12 @@ CFG=fltkimages - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "fltkimages.lib.mak".
!MESSAGE NMAKE /f "fltkimages.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "fltkimages.lib.mak" CFG="fltkimages - Win32 Debug"
!MESSAGE NMAKE /f "fltkimages.mak" CFG="fltkimages - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@ -83,7 +83,7 @@ LIB32=link.exe -lib
# Name "fltkimages - Win32 Debug"
# Begin Source File
SOURCE=..\src\fl_images_core.cxx
SOURCE=..\src\Fl_BMP_Image.cxx
# End Source File
# Begin Source File
@ -91,11 +91,23 @@ SOURCE=..\src\Fl_File_Icon2.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_GIF_Image.cxx
# End Source File
# Begin Source File
SOURCE=..\src\fl_images_core.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_JPEG_Image.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_PNG_Image.cxx
# End Source File
# Begin Source File
SOURCE=..\src\Fl_PNM_Image.cxx
# End Source File
# End Target
# End Project