From c04f2f8bff6ca31d8d4858584b6dbf585c66164f Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 1 May 2008 18:56:12 +0000 Subject: fix Fl_Font and Fl_Font_Size types in Fl_File_Chooser.fl file git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6122 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_File_Chooser.H | 7 ++++++- src/Fl_File_Chooser.cxx | 8 ++++---- src/Fl_File_Chooser.fl | 10 +++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H index 0659f55d0..97c3aecbb 100644 --- a/FL/Fl_File_Chooser.H +++ b/FL/Fl_File_Chooser.H @@ -25,7 +25,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0108 +// generated by Fast Light User Interface Designer (fluid) version 1.0300 #ifndef Fl_File_Chooser_H #define Fl_File_Chooser_H @@ -175,6 +175,11 @@ public: static const char *save_label; static const char *show_label; static Fl_File_Sort_F *sort; +private: + Fl_Widget* ext_group; + bool ext_managed; +public: + Fl_Widget* add_extra(Fl_Widget* gr); }; FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname,int relative=0); FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname,int relative=0); diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index fb588cb7d..87e8786d8 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -393,19 +393,19 @@ Fl_Color Fl_File_Chooser::textcolor() { return (fileList->textcolor()); } -void Fl_File_Chooser::textfont(uchar f) { +void Fl_File_Chooser::textfont(Fl_Font f) { fileList->textfont(f); } -uchar Fl_File_Chooser::textfont() { +Fl_Font Fl_File_Chooser::textfont() { return (fileList->textfont()); } -void Fl_File_Chooser::textsize(uchar s) { +void Fl_File_Chooser::textsize(Fl_Font_Size s) { fileList->textsize(s); } -uchar Fl_File_Chooser::textsize() { +Fl_Font_Size Fl_File_Chooser::textsize() { return (fileList->textsize()); } diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 80b5b589d..ddfa4414e 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -28,7 +28,7 @@ comment {// // // http://www.fltk.org/str.php // -} {selected in_source in_header +} {in_source in_header } decl {\#include } {} @@ -327,19 +327,19 @@ fileName->take_focus();} {} } { code {return (fileList->textcolor());} {} } - Function {textfont(uchar f)} {return_type void + Function {textfont(Fl_Font f)} {return_type void } { code {fileList->textfont(f);} {} } - Function {textfont()} {return_type uchar + Function {textfont()} {selected return_type Fl_Font } { code {return (fileList->textfont());} {} } - Function {textsize(uchar s)} {return_type void + Function {textsize(Fl_Font_Size s)} {return_type void } { code {fileList->textsize(s);} {} } - Function {textsize()} {return_type uchar + Function {textsize()} {return_type Fl_Font_Size } { code {return (fileList->textsize());} {} } -- cgit v1.2.3