summaryrefslogtreecommitdiff
path: root/fluid/Fl_Function_Type.cxx
diff options
context:
space:
mode:
authorCarl E. Thompson <devel-fltk@carlthompson.net>1999-03-29 17:39:46 +0000
committerCarl E. Thompson <devel-fltk@carlthompson.net>1999-03-29 17:39:46 +0000
commit81c7d9b2156da7495668132a96e63e994be0d19d (patch)
tree7e1c3dc9dbc0fd7cde40759301bb7bf99483a10c /fluid/Fl_Function_Type.cxx
parent617a7ee619493a1b07df49058509922bae48f559 (diff)
Changes needed to get FLTK to compile on Borland C++ 5 under Windows. I
compiled this on BC++ 5.0 upgraded to 5.0B via the two monster patches. I didn't turn on optimization because my version of BC++ doesn't seem to do much in the way of optimization (FLUID was only 1k smaller when optimized for size). VC++ generates smaller code. The examples that use OpenGL don't work because Borland's linker can't find "wglShareLists". I'm sure this is a simple problem, but I don't know how to fix it. Borland's C++ compiler won't allow you to call main() from C++, so I had to add a c function in "fl_call_main.c" to call it so that you don't have to do that WinMain crap. However, when I added this file to the Visual C++ project it converted the whole thing from 5.0 format to 6.0 format. The files look the nearly identical so I don't think this should be a problem for 5.0 users, but if it is then you can revert them back to the previous version and just add this one source file. Borland really doesn't suck that bad. It doesn't look as polished as VC++ and it refused to supress some warnings for no reason, but I forgot how much I liked the feel of Borlands compilers... Much more intuitive then MS VC++. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@475 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid/Fl_Function_Type.cxx')
-rw-r--r--fluid/Fl_Function_Type.cxx99
1 files changed, 2 insertions, 97 deletions
diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx
index 3b19bdb64..08cb46806 100644
--- a/fluid/Fl_Function_Type.cxx
+++ b/fluid/Fl_Function_Type.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Function_Type.cxx,v 1.15 1999/02/19 14:53:04 mike Exp $"
+// "$Id: Fl_Function_Type.cxx,v 1.15.2.1 1999/03/29 17:39:24 carl Exp $"
//
// C function type code for the Fast Light Tool Kit (FLTK).
//
@@ -103,26 +103,6 @@ const char *c_check(const char *c, int type) {
////////////////////////////////////////////////////////////////
-class Fl_Function_Type : public Fl_Type {
- const char* return_type;
- char public_, constructor, havewidgets;
-public:
- Fl_Type *make();
- void write_declare();
- void write_code1();
- void write_code2();
- void open();
- int ismain() {return name_ == 0;}
- virtual const char *type_name() {return "Function";}
- virtual const char *title() {
- return name() ? name() : "main()";
- }
- int is_parent() const {return 1;}
- int is_code_block() const {return 1;}
- void write_properties();
- void read_property(const char *);
-};
-
Fl_Type *Fl_Function_Type::make() {
Fl_Type *p = Fl_Type::current;
while (p && !p->is_decl_block()) p = p->parent;
@@ -276,17 +256,6 @@ void Fl_Function_Type::write_code2() {
////////////////////////////////////////////////////////////////
-class Fl_Code_Type : public Fl_Type {
-public:
- Fl_Type *make();
- void write_declare();
- void write_code1();
- void write_code2();
- void open();
- virtual const char *type_name() {return "code";}
- int is_code_block() const {return 0;}
-};
-
Fl_Type *Fl_Code_Type::make() {
Fl_Type *p = Fl_Type::current;
while (p && !p->is_code_block()) p = p->parent;
@@ -337,21 +306,6 @@ void Fl_Code_Type::write_code2() {}
////////////////////////////////////////////////////////////////
-class Fl_CodeBlock_Type : public Fl_Type {
- const char* after;
-public:
- Fl_Type *make();
- void write_declare();
- void write_code1();
- void write_code2();
- void open();
- virtual const char *type_name() {return "codeblock";}
- int is_code_block() const {return 1;}
- int is_parent() const {return 1;}
- void write_properties();
- void read_property(const char *);
-};
-
Fl_Type *Fl_CodeBlock_Type::make() {
Fl_Type *p = Fl_Type::current;
while (p && !p->is_code_block()) p = p->parent;
@@ -427,19 +381,6 @@ void Fl_CodeBlock_Type::write_code2() {
////////////////////////////////////////////////////////////////
-class Fl_Decl_Type : public Fl_Type {
- char public_;
-public:
- Fl_Type *make();
- void write_declare();
- void write_code1();
- void write_code2();
- void open();
- virtual const char *type_name() {return "decl";}
- void write_properties();
- void read_property(const char *);
-};
-
Fl_Type *Fl_Decl_Type::make() {
Fl_Type *p = Fl_Type::current;
while (p && !p->is_decl_block()) p = p->parent;
@@ -525,21 +466,6 @@ void Fl_Decl_Type::write_code2() {}
////////////////////////////////////////////////////////////////
-class Fl_DeclBlock_Type : public Fl_Type {
- const char* after;
-public:
- Fl_Type *make();
- void write_declare();
- void write_code1();
- void write_code2();
- void open();
- virtual const char *type_name() {return "declblock";}
- void write_properties();
- void read_property(const char *);
- int is_parent() const {return 1;}
- int is_decl_block() const {return 1;}
-};
-
Fl_Type *Fl_DeclBlock_Type::make() {
Fl_Type *p = Fl_Type::current;
while (p && !p->is_decl_block()) p = p->parent;
@@ -611,27 +537,6 @@ void Fl_DeclBlock_Type::write_code2() {
////////////////////////////////////////////////////////////////
-class Fl_Class_Type : public Fl_Type {
- const char* subclass_of;
- char public_;
-public:
- // state variables for output:
- char write_public_state; // true when public: has been printed
- Fl_Class_Type* parent_class; // save class if nested
-//
- Fl_Type *make();
- void write_declare();
- void write_code1();
- void write_code2();
- void open();
- virtual const char *type_name() {return "class";}
- int is_parent() const {return 1;}
- int is_decl_block() const {return 1;}
- int is_class() const {return 1;}
- void write_properties();
- void read_property(const char *);
-};
-
const char* Fl_Type::class_name() const {
Fl_Type* p = parent;
while (p) {if (p->is_class()) return p->name(); p = p->parent;}
@@ -729,5 +634,5 @@ void Fl_Class_Type::write_code2() {
}
//
-// End of "$Id: Fl_Function_Type.cxx,v 1.15 1999/02/19 14:53:04 mike Exp $".
+// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.1 1999/03/29 17:39:24 carl Exp $".
//