summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>2000-02-21 10:45:59 +0000
committerBill Spitzak <spitzak@gmail.com>2000-02-21 10:45:59 +0000
commitb583a643deeaf0a21dac5ee5a2ae0f84f9648dad (patch)
tree1ae1c716884ac7c22c82444fd3a9ad97e43d2389 /FL
parentb5529a0aea519389ad9561074ca7e464b2178d6e (diff)
Forgot to commit the header files and fixed documentation!
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1008 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl.H9
1 files changed, 6 insertions, 3 deletions
diff --git a/FL/Fl.H b/FL/Fl.H
index 8eed4224b..1bfb168f0 100644
--- a/FL/Fl.H
+++ b/FL/Fl.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.H,v 1.8.2.1 1999/04/17 01:02:27 bill Exp $"
+// "$Id: Fl.H,v 1.8.2.2 2000/02/21 10:45:58 bill Exp $"
//
// Main header file for the Fast Light Tool Kit (FLTK).
//
@@ -57,6 +57,7 @@ public: // should be private!
static FL_EXPORT Fl_Widget* selection_owner_;
static FL_EXPORT Fl_Window* modal_;
static FL_EXPORT Fl_Window* grab_;
+ static FL_EXPORT int compose_state;
static void damage(int x) {damage_ = x;}
@@ -87,7 +88,7 @@ public:
static FL_EXPORT int ready();
static FL_EXPORT int run();
static FL_EXPORT Fl_Widget* readqueue();
- static FL_EXPORT void add_timeout(double t,void (*cb)(void*),void* = 0);
+ static FL_EXPORT void add_timeout(double t,void (*cb)(void*),void* v = 0);
static FL_EXPORT void remove_timeout(void (*cb)(void*), void* = 0);
static FL_EXPORT void add_fd(int fd, int when, void (*cb)(int,void*),void* =0);
static FL_EXPORT void add_fd(int fd, void (*cb)(int, void*), void* = 0);
@@ -125,6 +126,8 @@ public:
static FL_EXPORT int get_key(int);
static FL_EXPORT const char* event_text() {return e_text;}
static FL_EXPORT int event_length() {return e_length;}
+ static FL_EXPORT int compose(int &del);
+ static FL_EXPORT void compose_reset() {compose_state = 0;}
static FL_EXPORT int event_inside(int,int,int,int);
static FL_EXPORT int event_inside(const Fl_Widget*);
static FL_EXPORT int test_shortcut(int);
@@ -205,5 +208,5 @@ public:
#endif
//
-// End of "$Id: Fl.H,v 1.8.2.1 1999/04/17 01:02:27 bill Exp $".
+// End of "$Id: Fl.H,v 1.8.2.2 2000/02/21 10:45:58 bill Exp $".
//