summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2002-04-18 20:37:29 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2002-04-18 20:37:29 +0000
commit7e8ec10e6d9a50ea7a4cea0d00cf7566135c8a15 (patch)
treed8d7e5e749739ac9a8115b1f9aba62a8bc65a890 /FL
parent9ca9171e7a35f4a2b3b6c8b52bdc966218b8137f (diff)
Add missing docos for Fl_Progress.
Add Fl_File_Chooser::directory_label, filename_label, and filter_label static string pointers for labels (allows for I18N of the file chooser). Fix typos in other docos. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2098 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_File_Chooser.H37
-rw-r--r--FL/Fl_Progress.H8
2 files changed, 24 insertions, 21 deletions
diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H
index 4be5bb883..a9ca0f824 100644
--- a/FL/Fl_File_Chooser.H
+++ b/FL/Fl_File_Chooser.H
@@ -7,12 +7,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <FL/Fl_File_Browser.H>
+#include <FL/Fl_Choice.H>
#include <FL/Fl_Button.H>
-#include <FL/Fl_Return_Button.H>
#include <FL/fl_ask.H>
+#include <FL/Fl_File_Browser.H>
#include <FL/Fl_Input.H>
-#include <FL/Fl_Choice.H>
+#include <FL/Fl_Return_Button.H>
class Fl_File_Chooser {
public:
@@ -22,28 +22,28 @@ private:
Fl_Window *window;
inline void cb_window_i(Fl_Window*, void*);
static void cb_window(Fl_Window*, void*);
- Fl_File_Browser *fileList;
- inline void cb_fileList_i(Fl_File_Browser*, void*);
- static void cb_fileList(Fl_File_Browser*, void*);
- inline void cb_Cancel_i(Fl_Button*, void*);
- static void cb_Cancel(Fl_Button*, void*);
- Fl_Return_Button *okButton;
- inline void cb_okButton_i(Fl_Return_Button*, void*);
- static void cb_okButton(Fl_Return_Button*, void*);
- Fl_Input *fileName;
- inline void cb_fileName_i(Fl_Input*, void*);
- static void cb_fileName(Fl_Input*, void*);
+ Fl_Choice *dirMenu;
+ inline void cb_dirMenu_i(Fl_Choice*, void*);
+ static void cb_dirMenu(Fl_Choice*, void*);
Fl_Button *upButton;
inline void cb_upButton_i(Fl_Button*, void*);
static void cb_upButton(Fl_Button*, void*);
Fl_Button *newButton;
inline void cb_newButton_i(Fl_Button*, void*);
static void cb_newButton(Fl_Button*, void*);
- Fl_Choice *dirMenu;
- inline void cb_dirMenu_i(Fl_Choice*, void*);
- static void cb_dirMenu(Fl_Choice*, void*);
inline void cb__i(Fl_Button*, void*);
static void cb_(Fl_Button*, void*);
+ Fl_File_Browser *fileList;
+ inline void cb_fileList_i(Fl_File_Browser*, void*);
+ static void cb_fileList(Fl_File_Browser*, void*);
+ Fl_Input *fileName;
+ inline void cb_fileName_i(Fl_Input*, void*);
+ static void cb_fileName(Fl_Input*, void*);
+ Fl_Return_Button *okButton;
+ inline void cb_okButton_i(Fl_Return_Button*, void*);
+ static void cb_okButton(Fl_Return_Button*, void*);
+ inline void cb_Cancel_i(Fl_Button*, void*);
+ static void cb_Cancel(Fl_Button*, void*);
void (*callback_)(Fl_File_Chooser*, void *);
void *data_;
char directory_[1024];
@@ -80,6 +80,9 @@ public:
const char *value(int f = 1);
void value(const char *filename);
int visible();
+ static const char *directory_label;
+ static const char *filename_label;
+ static const char *filter_label;
};
extern FL_EXPORT char *fl_dir_chooser(const char *message,const char *fname);
extern FL_EXPORT char *fl_file_chooser(const char *message,const char *pat,const char *fname);
diff --git a/FL/Fl_Progress.H b/FL/Fl_Progress.H
index c950d40e1..a1f95bf2c 100644
--- a/FL/Fl_Progress.H
+++ b/FL/Fl_Progress.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Progress.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $"
+// "$Id: Fl_Progress.H,v 1.1.2.3 2002/04/18 20:37:29 easysw Exp $"
//
// Progress bar widget definitions.
//
@@ -40,8 +40,8 @@
class Fl_Progress : public Fl_Widget
{
float value_,
- minimum_,
- maximum_;
+ minimum_,
+ maximum_;
protected:
@@ -64,5 +64,5 @@ class Fl_Progress : public Fl_Widget
#endif // !_Fl_Progress_H_
//
-// End of "$Id: Fl_Progress.H,v 1.1.2.2 2002/01/01 15:11:28 easysw Exp $".
+// End of "$Id: Fl_Progress.H,v 1.1.2.3 2002/04/18 20:37:29 easysw Exp $".
//