Changes from Carl to get rid of default_ variables...

git-svn-id: file:///fltk/svn/fltk/trunk@106 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

4 files changed, 8 insertions, 34 deletions

diff --git a/FL/Fl_Input_.H b/FL/Fl_Input_.H
index ec6da5f40..133b0a762 100644
--- a/FL/Fl_Input_.H
+++ b/FL/Fl_Input_.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Input_.H,v 1.3 1998/10/21 14:19:15 mike Exp $"
+// "$Id: Fl_Input_.H,v 1.4 1998/12/02 15:39:26 mike Exp $"
 //
 // Input base class header file for the Fast Light Tool Kit (FLTK).
 //
@@ -62,9 +62,6 @@ class Fl_Input_ : public Fl_Widget {
   void minimal_update(int p);
   void put_in_buffer(int newsize);
 
-  static Fl_Boxtype default_box_;
-  static Fl_Font default_font_;
-  static int default_size_;
   void setfont() const;
 
 protected:
@@ -118,17 +115,10 @@ public:
   void textcolor(uchar n) {textcolor_ = n;}
   Fl_Color cursor_color() const {return (Fl_Color)cursor_color_;}
   void cursor_color(uchar n) {cursor_color_ = n;}
-
-  static void default_box(Fl_Boxtype b) {default_box_ = b;}
-  static Fl_Boxtype default_box() {return default_box_;}
-  static void default_font(Fl_Font b) {default_font_ = b;}
-  static Fl_Font default_font() {return default_font_;}
-  static void default_size(int b) {default_size_ = b;}
-  static int default_size() {return default_size_;}
 };
 
 #endif 
 
 //
-// End of "$Id: Fl_Input_.H,v 1.3 1998/10/21 14:19:15 mike Exp $".
+// End of "$Id: Fl_Input_.H,v 1.4 1998/12/02 15:39:26 mike Exp $".
 //
diff --git a/FL/Fl_Menu_.H b/FL/Fl_Menu_.H
index 61da9ec59..69165ef8e 100644
--- a/FL/Fl_Menu_.H
+++ b/FL/Fl_Menu_.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Menu_.H,v 1.3 1998/10/21 14:19:18 mike Exp $"
+// "$Id: Fl_Menu_.H,v 1.4 1998/12/02 15:39:27 mike Exp $"
 //
 // Menu base class header file for the Fast Light Tool Kit (FLTK).
 //
@@ -35,8 +35,6 @@ class Fl_Menu_ : public Fl_Widget {
 
   Fl_Menu_Item *menu_;
   const Fl_Menu_Item *value_;
-  static Fl_Font default_font_;
-  static int default_size_;
 
 protected:
 
@@ -83,11 +81,6 @@ public:
   Fl_Color textcolor() const {return (Fl_Color)textcolor_;}
   void textcolor(uchar c) {textcolor_=c;}
 
-  static void default_font(Fl_Font b) {default_font_ = b;}
-  static Fl_Font default_font() {return default_font_;}
-  static void default_size(int b) {default_size_ = b;}
-  static int default_size() {return default_size_;}
-
   Fl_Boxtype down_box() const {return (Fl_Boxtype)down_box_;}
   void down_box(Fl_Boxtype b) {down_box_ = b;}
 
@@ -99,5 +92,5 @@ public:
 #endif
 
 //
-// End of "$Id: Fl_Menu_.H,v 1.3 1998/10/21 14:19:18 mike Exp $".
+// End of "$Id: Fl_Menu_.H,v 1.4 1998/12/02 15:39:27 mike Exp $".
 //
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H
index 651943144..4fe429902 100644
--- a/FL/Fl_Widget.H
+++ b/FL/Fl_Widget.H
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget.H,v 1.3 1998/10/21 14:19:42 mike Exp $"
+// "$Id: Fl_Widget.H,v 1.4 1998/12/02 15:39:27 mike Exp $"
 //
 // Widget header file for the Fast Light Tool Kit (FLTK).
 //
@@ -86,9 +86,6 @@ protected:
   void draw_label() const;
   void draw_label(int, int, int, int) const;
 
-  static Fl_Font default_font_;
-  static int default_size_;
-
 public:
 
   virtual ~Fl_Widget();
@@ -142,11 +139,6 @@ public:
   Fl_When when() const {return (Fl_When)when_;}
   void when(uchar i) {when_ = i;}
 
-  static void default_font(Fl_Font b) {default_font_ = b;}
-  static Fl_Font default_font() {return default_font_;}
-  static void default_size(int b) {default_size_ = b;}
-  static int default_size() {return default_size_;}
-
   int visible() const {return !(flags_&INVISIBLE);}
   int visible_r() const;
   void show();
@@ -198,5 +190,5 @@ public:
 #endif
 
 //
-// End of "$Id: Fl_Widget.H,v 1.3 1998/10/21 14:19:42 mike Exp $".
+// End of "$Id: Fl_Widget.H,v 1.4 1998/12/02 15:39:27 mike Exp $".
 //
diff --git a/FL/fl_draw.H b/FL/fl_draw.H
index 2d95499fc..e0531dbe5 100644
--- a/FL/fl_draw.H
+++ b/FL/fl_draw.H
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw.H,v 1.3 1998/10/21 14:19:45 mike Exp $"
+// "$Id: fl_draw.H,v 1.4 1998/12/02 15:39:28 mike Exp $"
 //
 // Portable drawing function header file for the Fast Light Tool Kit (FLTK).
 //
@@ -108,7 +108,6 @@ void fl_transformed_vertex(double x, double y);
 
 // current font:
 void fl_font(int face, int size);
-void fl_font(int face, int size, Fl_Font default_font, int default_size);
 extern int fl_font_; inline int fl_font() {return fl_font_;}
 extern int fl_size_; inline int fl_size() {return fl_size_;}
 
@@ -157,5 +156,5 @@ int fl_add_symbol(const char* name, void (*drawit)(Fl_Color), int scalable);
 #endif
 
 //
-// End of "$Id: fl_draw.H,v 1.3 1998/10/21 14:19:45 mike Exp $".
+// End of "$Id: fl_draw.H,v 1.4 1998/12/02 15:39:28 mike Exp $".
 //