mirror of
https://github.com/fltk/fltk.git
synced 2026-09-28 15:55:22 +08:00
More FL_EXPORT stuff for WIN32.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2529 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
CHANGES IN FLTK 1.1.0
|
||||
|
||||
- Cleaned up the WIN32 export definitions for some of
|
||||
the widget classes.
|
||||
- Fixed a filename completion bug when changing
|
||||
directories.
|
||||
- Fl_File_Chooser::value() would return directories with
|
||||
|
||||
+20
-20
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Group.H,v 1.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $"
|
||||
// "$Id: Fl_Group.H,v 1.6.2.4.2.5 2002/07/14 19:08:25 easysw Exp $"
|
||||
//
|
||||
// Group header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "Fl_Widget.H"
|
||||
#endif
|
||||
|
||||
class Fl_Group : public Fl_Widget {
|
||||
class FL_EXPORT Fl_Group : public Fl_Widget {
|
||||
|
||||
Fl_Widget** array_;
|
||||
Fl_Widget* savedfocus_;
|
||||
@@ -39,7 +39,7 @@ class Fl_Group : public Fl_Widget {
|
||||
short *sizes_; // remembered initial sizes of children
|
||||
|
||||
int navigation(int);
|
||||
FL_EXPORT static Fl_Group *current_;
|
||||
static Fl_Group *current_;
|
||||
|
||||
protected:
|
||||
|
||||
@@ -51,39 +51,39 @@ protected:
|
||||
|
||||
public:
|
||||
|
||||
FL_EXPORT int handle(int);
|
||||
FL_EXPORT void begin();
|
||||
FL_EXPORT void end();
|
||||
FL_EXPORT static Fl_Group *current();
|
||||
FL_EXPORT static void current(Fl_Group *g);
|
||||
int handle(int);
|
||||
void begin();
|
||||
void end();
|
||||
static Fl_Group *current();
|
||||
static void current(Fl_Group *g);
|
||||
|
||||
int children() const {return children_;}
|
||||
Fl_Widget* child(int n) const {return array()[n];}
|
||||
FL_EXPORT int find(const Fl_Widget*) const;
|
||||
int find(const Fl_Widget*) const;
|
||||
int find(const Fl_Widget& o) const {return find(&o);}
|
||||
FL_EXPORT Fl_Widget* const* array() const;
|
||||
Fl_Widget* const* array() const;
|
||||
|
||||
FL_EXPORT void resize(int,int,int,int);
|
||||
FL_EXPORT Fl_Group(int,int,int,int, const char * = 0);
|
||||
FL_EXPORT virtual ~Fl_Group();
|
||||
FL_EXPORT void add(Fl_Widget&);
|
||||
void resize(int,int,int,int);
|
||||
Fl_Group(int,int,int,int, const char * = 0);
|
||||
virtual ~Fl_Group();
|
||||
void add(Fl_Widget&);
|
||||
void add(Fl_Widget* o) {add(*o);}
|
||||
FL_EXPORT void insert(Fl_Widget&, int i);
|
||||
void insert(Fl_Widget&, int i);
|
||||
void insert(Fl_Widget& o, Fl_Widget* before) {insert(o,find(before));}
|
||||
FL_EXPORT void remove(Fl_Widget&);
|
||||
void remove(Fl_Widget&);
|
||||
void remove(Fl_Widget* o) {remove(*o);}
|
||||
FL_EXPORT void clear();
|
||||
void clear();
|
||||
|
||||
void resizable(Fl_Widget& o) {resizable_ = &o;}
|
||||
void resizable(Fl_Widget* o) {resizable_ = o;}
|
||||
Fl_Widget* resizable() const {return resizable_;}
|
||||
void add_resizable(Fl_Widget& o) {resizable_ = &o; add(o);}
|
||||
FL_EXPORT void init_sizes();
|
||||
void init_sizes();
|
||||
|
||||
// back compatability function:
|
||||
void focus(Fl_Widget* o) {o->take_focus();}
|
||||
Fl_Widget* & _ddfdesign_kludge() {return resizable_;}
|
||||
FL_EXPORT void forms_end();
|
||||
void forms_end();
|
||||
};
|
||||
|
||||
// dummy class used to end child groups in constructors for complex
|
||||
@@ -96,5 +96,5 @@ public:
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Group.H,v 1.6.2.4.2.4 2002/07/14 17:03:30 easysw Exp $".
|
||||
// End of "$Id: Fl_Group.H,v 1.6.2.4.2.5 2002/07/14 19:08:25 easysw Exp $".
|
||||
//
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <FL/Fl_Help_View.H>
|
||||
#include <FL/Fl_Button.H>
|
||||
|
||||
class Fl_Help_Dialog {
|
||||
class FL_EXPORT Fl_Help_Dialog {
|
||||
int index_;
|
||||
int max_;
|
||||
int line_[100];
|
||||
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Help_View.H,v 1.1.2.9 2002/03/05 11:26:41 easysw Exp $"
|
||||
// "$Id: Fl_Help_View.H,v 1.1.2.10 2002/07/14 19:08:25 easysw Exp $"
|
||||
//
|
||||
// Help Viewer widget definitions.
|
||||
//
|
||||
@@ -92,7 +92,7 @@ struct Fl_Help_Target
|
||||
// Fl_Help_View class...
|
||||
//
|
||||
|
||||
class Fl_Help_View : public Fl_Group //// Help viewer widget
|
||||
class FL_EXPORT Fl_Help_View : public Fl_Group //// Help viewer widget
|
||||
{
|
||||
enum { RIGHT = -1, CENTER, LEFT }; // Alignments
|
||||
|
||||
@@ -187,5 +187,5 @@ class Fl_Help_View : public Fl_Group //// Help viewer widget
|
||||
#endif // !Fl_Help_View_H
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Help_View.H,v 1.1.2.9 2002/03/05 11:26:41 easysw Exp $".
|
||||
// End of "$Id: Fl_Help_View.H,v 1.1.2.10 2002/07/14 19:08:25 easysw Exp $".
|
||||
//
|
||||
|
||||
+4
-4
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Wizard.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $"
|
||||
// "$Id: Fl_Wizard.H,v 1.1.2.3 2002/07/14 19:08:25 easysw Exp $"
|
||||
//
|
||||
// Fl_Wizard widget definitions.
|
||||
//
|
||||
@@ -37,11 +37,11 @@
|
||||
// Fl_Wizard class...
|
||||
//
|
||||
|
||||
class Fl_Wizard : public Fl_Group
|
||||
class FL_EXPORT Fl_Wizard : public Fl_Group
|
||||
{
|
||||
Fl_Widget *value_;
|
||||
|
||||
void draw();
|
||||
FL_EXPORT void draw();
|
||||
|
||||
public:
|
||||
|
||||
@@ -56,5 +56,5 @@ class Fl_Wizard : public Fl_Group
|
||||
#endif // !_Fl_Wizard_H_
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Wizard.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $".
|
||||
// End of "$Id: Fl_Wizard.H,v 1.1.2.3 2002/07/14 19:08:25 easysw Exp $".
|
||||
//
|
||||
|
||||
+7
-6
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $"
|
||||
* "$Id: flstring.h,v 1.1.2.8 2002/07/14 19:08:25 easysw Exp $"
|
||||
*
|
||||
* Common string header file for the Fast Light Tool Kit (FLTK).
|
||||
*
|
||||
@@ -26,6 +26,7 @@
|
||||
#ifndef flstring_h
|
||||
# define flstring_h
|
||||
|
||||
# include <FL/Fl_Export.H>
|
||||
# include <config.h>
|
||||
# include <stdarg.h>
|
||||
# include <string.h>
|
||||
@@ -57,12 +58,12 @@ extern "C" {
|
||||
# endif /* __cplusplus */
|
||||
|
||||
# if !HAVE_SNPRINTF
|
||||
extern int fl_snprintf(char *, size_t, const char *, ...);
|
||||
FL_EXPORT extern int fl_snprintf(char *, size_t, const char *, ...);
|
||||
# define snprintf fl_snprintf
|
||||
# endif /* !HAVE_SNPRINTF */
|
||||
|
||||
# if !HAVE_VSNPRINTF
|
||||
extern int fl_vsnprintf(char *, size_t, const char *, va_list ap);
|
||||
FL_EXPORT extern int fl_vsnprintf(char *, size_t, const char *, va_list ap);
|
||||
# define vsnprintf fl_vsnprintf
|
||||
# endif /* !HAVE_VSNPRINTF */
|
||||
|
||||
@@ -72,12 +73,12 @@ extern int fl_vsnprintf(char *, size_t, const char *, va_list ap);
|
||||
*/
|
||||
|
||||
# if !HAVE_STRLCAT
|
||||
extern size_t fl_strlcat(char *, const char *, size_t);
|
||||
FL_EXPORT extern size_t fl_strlcat(char *, const char *, size_t);
|
||||
# define strlcat fl_strlcat
|
||||
# endif /* !HAVE_STRLCAT */
|
||||
|
||||
# if !HAVE_STRLCPY
|
||||
extern size_t fl_strlcpy(char *, const char *, size_t);
|
||||
FL_EXPORT extern size_t fl_strlcpy(char *, const char *, size_t);
|
||||
# define strlcpy fl_strlcpy
|
||||
# endif /* !HAVE_STRLCPY */
|
||||
|
||||
@@ -87,5 +88,5 @@ extern size_t fl_strlcpy(char *, const char *, size_t);
|
||||
#endif /* !flstring_h */
|
||||
|
||||
/*
|
||||
* End of "$Id: flstring.h,v 1.1.2.7 2002/05/19 17:44:56 easysw Exp $".
|
||||
* End of "$Id: flstring.h,v 1.1.2.8 2002/07/14 19:08:25 easysw Exp $".
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user