From 82eb2381e6e8a733e2b5354047c86fd717bee263 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 12 Jun 1999 13:53:34 +0000 Subject: Updates for 1.0.4. Added changes to event documentation for FL_DRAG and FL_KEYBOARD. Added WIN32 stuff to Cosmo/Optimizer example code. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@603 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- documentation/Makefile | 6 +++--- documentation/events.html | 12 ++++++++++-- documentation/index.html | 6 +++--- documentation/opengl.html | 12 ++++++++++++ documentation/preface.html | 4 ++-- 5 files changed, 30 insertions(+), 10 deletions(-) (limited to 'documentation') diff --git a/documentation/Makefile b/documentation/Makefile index 632979614..62e8c46ff 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile,v 1.9.2.1 1999/05/01 15:08:11 mike Exp $" +# "$Id: Makefile,v 1.9.2.2 1999/06/12 13:53:23 mike Exp $" # # Documentation makefile for the Fast Light Tool Kit (FLTK). # @@ -134,7 +134,7 @@ fltk.d/index.html: $(HTMLFILES) fltk.ps: $(HTMLFILES) @echo "Generating PostScript documentation..." - @$(HTMLDOC) -f fltk.ps -t ps2 --jpeg --duplex --verbose --toclevels 2 --title FL.gif $(HTMLFILES) + @$(HTMLDOC) -f fltk.ps -t ps2 --duplex --verbose --toclevels 2 --title FL.gif $(HTMLFILES) fltk.pdf: $(HTMLFILES) @echo "Generating PDF documentation..." @@ -142,5 +142,5 @@ fltk.pdf: $(HTMLFILES) @$(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --title FL.gif $(HTMLFILES) # -# End of "$Id: Makefile,v 1.9.2.1 1999/05/01 15:08:11 mike Exp $". +# End of "$Id: Makefile,v 1.9.2.2 1999/06/12 13:53:23 mike Exp $". # diff --git a/documentation/events.html b/documentation/events.html index e43066dd5..88ec9b9f3 100644 --- a/documentation/events.html +++ b/documentation/events.html @@ -28,6 +28,10 @@ The mouse has moved with a button held down. The current button state is in Fl::event_state(). The mouse position is in Fl::event_x() and Fl::event_y(). + +

To receive FL_DRAG events you must also respond to the +FL_PUSH and FL_RELEASE events. +

FL_RELEASE

A mouse button has been released. You can find out what button by calling Fl::event_button(). @@ -68,10 +72,14 @@ widget when another widget gets the focus. be found with Fl::event_text() and its length is in Fl::event_length(). If you use the key handle() - should return 1. If you return zero then FLTK assummes you ignored +should return 1. If you return zero then FLTK assummes you ignored the key. It will then attempt to send it to a parent widget. If none of them want it, it will change the event into a FL_SHORTCUT - event. +event. + +

To receive FL_KEYBOARD events you must also respond to the +FL_FOCUS and FL_UNFOCUS events. +

FL_SHORTCUT

If the Fl::focus() widget is zero or ignores an FL_KEYBOARD event then FLTK tries sending this diff --git a/documentation/index.html b/documentation/index.html index 14c5e38e0..ad42728b5 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -1,6 +1,6 @@ - FLTK 1.0.3 Programming Manual + FLTK 1.0.4 Programming Manual @@ -8,8 +8,8 @@

FLTK 1.0.3 Programming Manual

-Revision 10 by Michael Sweet, Craig P. Earls, and Bill Spitzak
+

FLTK 1.0.4 Programming Manual

+Revision 11 by Michael Sweet, Craig P. Earls, and Bill Spitzak
Copyright 1998-1999 by Bill Spitzak and others.
diff --git a/documentation/opengl.html b/documentation/opengl.html index 5ed567992..8a5ab0aa7 100644 --- a/documentation/opengl.html +++ b/documentation/opengl.html @@ -283,9 +283,15 @@ void OptimizerWindow::draw() { // This is the first time we've been asked to draw; create the // Optimizer context for the scene... +#ifdef WIN32 + context_ = new csContext((HDC)fl_getHDC()); + context_->ref(); + context_->makeCurrent((HDC)fl_getHDC()); +#else context_ = new csContext(fl_display, fl_visual); context_->ref(); context_->makeCurrent(fl_display, fl_window); +#endif // WIN32 ... perform other context setup as desired ... @@ -296,6 +302,12 @@ void OptimizerWindow::draw() { draw_action_->setCamera(camera_); camera_->draw(draw_action_); } + } else { +#ifdef WIN32 + context_->makeCurrent((HDC)fl_getHDC()); +#else + context_->makeCurrent(fl_display, fl_window); +#endif // WIN32 } if (!valid()) { diff --git a/documentation/preface.html b/documentation/preface.html index a9b789332..de053541b 100644 --- a/documentation/preface.html +++ b/documentation/preface.html @@ -2,8 +2,8 @@ - - FLTK 1.0.3 Programming Manual + + FLTK 1.0.4 Programming Manual

Preface

-- cgit v1.2.3