Rename type Fl_Font_Size into Fl_Fontsize to comply with other naming in FLTK.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6161 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

13 files changed, 33 insertions, 33 deletions

diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx
index 87e8786d8..fa1cf7214 100644
--- a/src/Fl_File_Chooser.cxx
+++ b/src/Fl_File_Chooser.cxx
@@ -401,11 +401,11 @@ Fl_Font Fl_File_Chooser::textfont() {
   return (fileList->textfont());
 }
 
-void Fl_File_Chooser::textsize(Fl_Font_Size s) {
+void Fl_File_Chooser::textsize(Fl_Fontsize s) {
   fileList->textsize(s);
 }
 
-Fl_Font_Size Fl_File_Chooser::textsize() {
+Fl_Fontsize Fl_File_Chooser::textsize() {
   return (fileList->textsize());
 }
 
diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl
index ddfa4414e..39d3fca8f 100644
--- a/src/Fl_File_Chooser.fl
+++ b/src/Fl_File_Chooser.fl
@@ -335,11 +335,11 @@ fileName->take_focus();} {}
   } {
     code {return (fileList->textfont());} {}
   }
-  Function {textsize(Fl_Font_Size s)} {return_type void
+  Function {textsize(Fl_Fontsize s)} {return_type void
   } {
     code {fileList->textsize(s);} {}
   }
-  Function {textsize()} {return_type Fl_Font_Size
+  Function {textsize()} {return_type Fl_Fontsize
   } {
     code {return (fileList->textsize());} {}
   }
diff --git a/src/Fl_Font.H b/src/Fl_Font.H
index 3aa854780..c6224e3c2 100644
--- a/src/Fl_Font.H
+++ b/src/Fl_Font.H
@@ -51,15 +51,15 @@ public:
   HFONT fid;
   int width[256];
   TEXTMETRIC metr;
-  FL_EXPORT Fl_FontSize(const char* fontname, Fl_Font_Size size);
+  FL_EXPORT Fl_FontSize(const char* fontname, Fl_Fontsize size);
 #  elif defined(__APPLE_QD__)
-  FL_EXPORT Fl_FontSize(const char* fontname, Fl_Font_Size size);
+  FL_EXPORT Fl_FontSize(const char* fontname, Fl_Fontsize size);
   short font, face, size;
   short ascent, descent;
   short width[256];
   bool knowMetrics;
 #  elif defined(__APPLE_QUARTZ__)
-  FL_EXPORT Fl_FontSize(const char* fontname, Fl_Font_Size size);
+  FL_EXPORT Fl_FontSize(const char* fontname, Fl_Fontsize size);
   ATSUTextLayout layout;
   ATSUStyle style;
   short ascent, descent, q_width;
@@ -70,14 +70,14 @@ public:
 #  elif USE_XFT
   XftFont* font;
   const char* encoding;
-  Fl_Font_Size size;
+  Fl_Fontsize size;
   FL_EXPORT Fl_FontSize(const char* xfontname);
 #  else
   XFontStruct* font;	// X font information
   FL_EXPORT Fl_FontSize(const char* xfontname);
 #  endif
-  Fl_Font_Size minsize;		// smallest point size that should use this
-  Fl_Font_Size maxsize;		// largest point size that should use this
+  Fl_Fontsize minsize;		// smallest point size that should use this
+  Fl_Fontsize maxsize;		// largest point size that should use this
 #  if HAVE_GL
   unsigned int listbase;// base of display list, 0 = none
 #  endif
diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx
index bc48add79..56336d3fa 100644
--- a/src/Fl_Help_Dialog.cxx
+++ b/src/Fl_Help_Dialog.cxx
@@ -244,7 +244,7 @@ void Fl_Help_Dialog::show(int argc, char **argv) {
   window_->show(argc, argv);
 }
 
-void Fl_Help_Dialog::textsize(Fl_Font_Size s) {
+void Fl_Help_Dialog::textsize(Fl_Fontsize s) {
   view_->textsize(s);
 
 if (s <= 8)
@@ -258,7 +258,7 @@ else
   larger_->activate();
 }
 
-Fl_Font_Size Fl_Help_Dialog::textsize() {
+Fl_Fontsize Fl_Help_Dialog::textsize() {
   return (view_->textsize());
 }
 
diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl
index 8293f6cbc..88c349df3 100644
--- a/src/Fl_Help_Dialog.fl
+++ b/src/Fl_Help_Dialog.fl
@@ -204,7 +204,7 @@ window_->label(view_->title());} {}
   } {
     code {window_->show(argc, argv);} {}
   }
-  Function {textsize(Fl_Font_Size s)} {return_type void
+  Function {textsize(Fl_Fontsize s)} {return_type void
   } {
     code {view_->textsize(s);
 
@@ -218,7 +218,7 @@ if (s >= 18)
 else
   larger_->activate();} {}
   }
-  Function {textsize()} {return_type Fl_Font_Size
+  Function {textsize()} {return_type Fl_Fontsize
   } {
     code {return (view_->textsize());} {}
   }
diff --git a/src/Fl_Help_View.cxx b/src/Fl_Help_View.cxx
index 95d5d5654..daa0d43a6 100644
--- a/src/Fl_Help_View.cxx
+++ b/src/Fl_Help_View.cxx
@@ -466,7 +466,7 @@ Fl_Help_View::draw()
   int			xx, yy, ww, hh;	// Current positions and sizes
   int			line;		// Current line
   Fl_Font               font;
-  Fl_Font_Size          fsize;          // Current font and size
+  Fl_Fontsize          fsize;          // Current font and size
   int			head, pre,	// Flags for text
 			needspace;	// Do we need whitespace?
   Fl_Boxtype		b = box() ? box() : FL_DOWN_BOX;
@@ -1084,7 +1084,7 @@ Fl_Help_View::format()
   int		line;		// Current line in block
   int		links;		// Links for current line
   Fl_Font       font;
-  Fl_Font_Size  fsize;          // Current font and size
+  Fl_Fontsize  fsize;          // Current font and size
   unsigned char	border;		// Draw border?
   int		talign,		// Current alignment
 		newalign,	// New alignment
@@ -1897,7 +1897,7 @@ Fl_Help_View::format_table(int        *table_width,	// O - Total table width
 		*start;					// Start of element
   int		minwidths[MAX_COLUMNS];			// Minimum widths for each column
   Fl_Font       font;
-  Fl_Font_Size  fsize;				// Current font and size
+  Fl_Fontsize  fsize;				// Current font and size
 
 
   // Clear widths...
diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx
index 24280b295..c804d3153 100644
--- a/src/Fl_Tooltip.cxx
+++ b/src/Fl_Tooltip.cxx
@@ -39,7 +39,7 @@ unsigned	Fl_Tooltip::color_ = fl_color_cube(FL_NUM_RED - 1,
 						   FL_NUM_BLUE - 2);
 unsigned	Fl_Tooltip::textcolor_ = FL_BLACK;
 Fl_Font         Fl_Tooltip::font_ = FL_HELVETICA;
-Fl_Font_Size    Fl_Tooltip::size_ = FL_NORMAL_SIZE;
+Fl_Fontsize    Fl_Tooltip::size_ = FL_NORMAL_SIZE;
 
 #define MAX_WIDTH 400
 
diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx
index 019a5dd73..7c750984c 100644
--- a/src/Fl_Widget.cxx
+++ b/src/Fl_Widget.cxx
@@ -76,7 +76,7 @@ int Fl_Widget::handle(int) {
   return 0;
 }
 
-Fl_Font_Size FL_NORMAL_SIZE = 14;
+Fl_Fontsize FL_NORMAL_SIZE = 14;
 
 Fl_Widget::Fl_Widget(int X, int Y, int W, int H, Fl_CString L) {
 
diff --git a/src/fl_ask.cxx b/src/fl_ask.cxx
index dbd165b1c..a61083df1 100644
--- a/src/fl_ask.cxx
+++ b/src/fl_ask.cxx
@@ -54,7 +54,7 @@ static Fl_Button *button[3];
 static Fl_Input *input;
 static const char *iconlabel = "?";
 Fl_Font fl_message_font_ = FL_HELVETICA;
-Fl_Font_Size fl_message_size_ = 14;
+Fl_Fontsize fl_message_size_ = 14;
 
 static Fl_Window *makeform() {
  if (message_form) {
diff --git a/src/fl_font_mac.cxx b/src/fl_font_mac.cxx
index 3c1151199..e58a872cb 100644
--- a/src/fl_font_mac.cxx
+++ b/src/fl_font_mac.cxx
@@ -27,7 +27,7 @@
 
 #include <config.h>
 
-Fl_FontSize::Fl_FontSize(const char* name, Fl_Font_Size Size) {
+Fl_FontSize::Fl_FontSize(const char* name, Fl_Fontsize Size) {
   next = 0;
 #  if HAVE_GL
   listbase = 0;
@@ -245,7 +245,7 @@ void fl_font(Fl_FontSize* s) {
 #endif
 }
 
-static Fl_FontSize* find(Fl_Font fnum, Fl_Font_Size size) {
+static Fl_FontSize* find(Fl_Font fnum, Fl_Fontsize size) {
   Fl_Fontdesc* s = fl_fonts+fnum;
   if (!s->name) s = fl_fonts; // use 0 if fnum undefined
   Fl_FontSize* f;
@@ -261,9 +261,9 @@ static Fl_FontSize* find(Fl_Font fnum, Fl_Font_Size size) {
 // Public interface:
 
 Fl_Font fl_font_ = 0;
-Fl_Font_Size fl_size_ = 0;
+Fl_Fontsize fl_size_ = 0;
 
-void fl_font(Fl_Font fnum, Fl_Font_Size size) {
+void fl_font(Fl_Font fnum, Fl_Fontsize size) {
   if (fnum==-1) {
     fl_font_ = 0; 
     fl_size_ = 0;
diff --git a/src/fl_font_win32.cxx b/src/fl_font_win32.cxx
index 102d914db..a9b677adc 100644
--- a/src/fl_font_win32.cxx
+++ b/src/fl_font_win32.cxx
@@ -25,7 +25,7 @@
 //     http://www.fltk.org/str.php
 //
 
-Fl_FontSize::Fl_FontSize(const char* name, Fl_Font_Size size) {
+Fl_FontSize::Fl_FontSize(const char* name, Fl_Fontsize size) {
   int weight = FW_NORMAL;
   int italic = 0;
   switch (*name++) {
@@ -106,7 +106,7 @@ static Fl_Fontdesc built_in_table[] = {
 
 Fl_Fontdesc* fl_fonts = built_in_table;
 
-static Fl_FontSize* find(Fl_Font fnum, Fl_Font_Size size) {
+static Fl_FontSize* find(Fl_Font fnum, Fl_Fontsize size) {
   Fl_Fontdesc* s = fl_fonts+fnum;
   if (!s->name) s = fl_fonts; // use 0 if fnum undefined
   Fl_FontSize* f;
@@ -122,10 +122,10 @@ static Fl_FontSize* find(Fl_Font fnum, Fl_Font_Size size) {
 // Public interface:
 
 Fl_Font fl_font_ = 0;
-Fl_Font_Size fl_size_ = 0;
+Fl_Fontsize fl_size_ = 0;
 //static HDC font_gc;
 
-void fl_font(Fl_Font fnum, Fl_Font_Size size) {
+void fl_font(Fl_Font fnum, Fl_Fontsize size) {
   if (fnum==-1) { // just make sure that we will load a new font next time
     fl_font_ = 0; fl_size_ = 0;
     return;
diff --git a/src/fl_font_x.cxx b/src/fl_font_x.cxx
index ee1c12ec8..1f0ad7920 100644
--- a/src/fl_font_x.cxx
+++ b/src/fl_font_x.cxx
@@ -113,7 +113,7 @@ int fl_correct_encoding(const char* name) {
 }
 
 // locate or create an Fl_FontSize for a given Fl_Fontdesc and size:
-static Fl_FontSize* find(Fl_Font fnum, Fl_Font_Size size) {
+static Fl_FontSize* find(Fl_Font fnum, Fl_Fontsize size) {
   Fl_Fontdesc* s = fl_fonts+fnum;
   if (!s->name) s = fl_fonts; // use font 0 if still undefined
   Fl_FontSize* f;
@@ -194,12 +194,12 @@ static Fl_FontSize* find(Fl_Font fnum, Fl_Font_Size size) {
 // Public interface:
 
 Fl_Font fl_font_ = 0;
-Fl_Font_Size fl_size_ = 0;
+Fl_Fontsize fl_size_ = 0;
 XFontStruct* fl_xfont = 0;
 void *fl_xftfont = 0;
 static GC font_gc;
 
-void fl_font(Fl_Font fnum, Fl_Font_Size size) {
+void fl_font(Fl_Font fnum, Fl_Fontsize size) {
   if (fnum==-1) {
     fl_font_ = 0; fl_size_ = 0;
     return;
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx
index 2ded22247..3e06a6325 100644
--- a/src/fl_font_xft.cxx
+++ b/src/fl_font_xft.cxx
@@ -89,13 +89,13 @@ Fl_Fontdesc* fl_fonts = built_in_table;
 #define current_font (fl_fontsize->font)
 
 Fl_Font fl_font_ = 0;
-Fl_Font_Size fl_size_ = 0;
+Fl_Fontsize fl_size_ = 0;
 XFontStruct* fl_xfont = 0;
 void *fl_xftfont = 0;
 const char* fl_encoding_ = "iso8859-1";
 Fl_FontSize* fl_fontsize = 0;
 
-void fl_font(Fl_Font fnum, Fl_Font_Size size) {
+void fl_font(Fl_Font fnum, Fl_Fontsize size) {
   if (fnum==-1) { // special case to stop font caching
     fl_font_ = 0; fl_size_ = 0;
     return;