First fixes for 1.1.2 - Fl_Scrollbar shouldn't take keyboard focus,
move Fl_Slider focus stuff to main handle() method, use Fl_Light_Button in scroll demo. Bump version numbers to 1.1.2. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2690 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
e001b30f18
commit
9e0efc1e88
8
CHANGES
8
CHANGES
@ -1,3 +1,11 @@
|
||||
CHANGES IN FLTK 1.1.2
|
||||
|
||||
- Fl_Scrollbar widgets incorrectly took keyboard focus
|
||||
when clicked on. This caused widgets such as
|
||||
Fl_Text_Display to hide the cursor when you scrolled
|
||||
the text.
|
||||
|
||||
|
||||
CHANGES IN FLTK 1.1.1
|
||||
|
||||
- Fl_Text_Display didn't always show the cursor.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Enumerations.H,v 1.18.2.14.2.27 2002/10/15 20:45:58 easysw Exp $"
|
||||
// "$Id: Enumerations.H,v 1.18.2.14.2.28 2002/10/24 12:53:40 easysw Exp $"
|
||||
//
|
||||
// Enumerations for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -45,7 +45,7 @@
|
||||
|
||||
#define FL_MAJOR_VERSION 1
|
||||
#define FL_MINOR_VERSION 1
|
||||
#define FL_PATCH_VERSION 1
|
||||
#define FL_PATCH_VERSION 2
|
||||
#define FL_VERSION ((double)FL_MAJOR_VERSION + \
|
||||
(double)FL_MINOR_VERSION * 0.01 + \
|
||||
(double)FL_PATCH_VERSION * 0.0001)
|
||||
@ -406,5 +406,5 @@ enum Fl_Damage {
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Enumerations.H,v 1.18.2.14.2.27 2002/10/15 20:45:58 easysw Exp $".
|
||||
// End of "$Id: Enumerations.H,v 1.18.2.14.2.28 2002/10/24 12:53:40 easysw Exp $".
|
||||
//
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
dnl -*- sh -*-
|
||||
dnl the "configure" script is made from this by running GNU "autoconf"
|
||||
dnl
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.90 2002/10/23 15:18:57 easysw Exp $"
|
||||
dnl "$Id: configure.in,v 1.33.2.31.2.91 2002/10/24 12:53:40 easysw Exp $"
|
||||
dnl
|
||||
dnl Configuration script for the Fast Light Tool Kit (FLTK).
|
||||
dnl
|
||||
@ -34,7 +34,7 @@ AC_INIT(src/Fl.cxx)
|
||||
dnl FLTK library versions...
|
||||
FL_MAJOR_VERSION=1
|
||||
FL_MINOR_VERSION=1
|
||||
FL_PATCH_VERSION=1
|
||||
FL_PATCH_VERSION=2
|
||||
FL_RELEASE_VERSION=
|
||||
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
|
||||
|
||||
@ -805,5 +805,5 @@ dnl Make sure the fltk-config script is executable...
|
||||
chmod +x fltk-config
|
||||
|
||||
dnl
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.90 2002/10/23 15:18:57 easysw Exp $".
|
||||
dnl End of "$Id: configure.in,v 1.33.2.31.2.91 2002/10/24 12:53:40 easysw Exp $".
|
||||
dnl
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<HTML>
|
||||
<HEAD>
|
||||
<META NAME="robots" CONTENT="noindex">
|
||||
<TITLE>FLTK 1.1.1 Programming Manual</TITLE>
|
||||
<TITLE>FLTK 1.1.2 Programming Manual</TITLE>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
<TD VALIGN="MIDDLE">
|
||||
<IMG SRC="FL.gif" WIDTH="200" HEIGHT="100" ALIGN="ABSMIDDLE" ALT="FL"></TD>
|
||||
<TD ALIGN="CENTER" VALIGN="MIDDLE">
|
||||
<H1>FLTK 1.1.1 Programming Manual</H1>
|
||||
<P>Revision 2 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR>
|
||||
<H1>FLTK 1.1.2 Programming Manual</H1>
|
||||
<P>Revision 3 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR>
|
||||
Copyright 1998-2002 by Bill Spitzak and others.</P>
|
||||
</TD>
|
||||
</TR>
|
||||
|
||||
@ -2,15 +2,15 @@
|
||||
<HEAD>
|
||||
<META CONTENT="Written by Michael Sweet, Craig P. Earls, and Bill Spitzak" NAME="Author">
|
||||
<META CONTENT="Copyright 1998-2002 by Bill Spitzak and Others." NAME="Copyright">
|
||||
<META CONTENT="Revision 2" NAME="DocNumber">
|
||||
<TITLE>FLTK 1.1.1 Programming Manual</TITLE>
|
||||
<META CONTENT="Revision 3" NAME="DocNumber">
|
||||
<TITLE>FLTK 1.1.2 Programming Manual</TITLE>
|
||||
</HEAD>
|
||||
<BODY>
|
||||
|
||||
<H1 ALIGN="RIGHT"><A NAME="preface">Preface</A></H1>
|
||||
|
||||
<P>This manual describes the Fast Light Tool Kit ("FLTK")
|
||||
version 1.1.1, a C++ Graphical User Interface
|
||||
version 1.1.2, a C++ Graphical User Interface
|
||||
("GUI") toolkit for UNIX, Microsoft Windows and MacOS. Each
|
||||
of the chapters in this manual is designed as a tutorial for
|
||||
using FLTK, while the appendices provide a convenient reference
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.13 2002/10/06 18:37:14 easysw Exp $"
|
||||
// "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.14 2002/10/24 12:53:40 easysw Exp $"
|
||||
//
|
||||
// Scroll bar widget for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -112,7 +112,6 @@ int Fl_Scrollbar::handle(int event) {
|
||||
handle_release();
|
||||
return 1;
|
||||
case FL_PUSH:
|
||||
if (Fl::visible_focus()) Fl::focus(this);
|
||||
if (pushed_) return 1;
|
||||
if (area != 8) pushed_ = area;
|
||||
if (pushed_) {
|
||||
@ -130,12 +129,6 @@ int Fl_Scrollbar::handle(int event) {
|
||||
if (horizontal()) return 0;
|
||||
handle_drag(clamp(value() + linesize_ * Fl::e_dy));
|
||||
return 1;
|
||||
case FL_FOCUS :
|
||||
case FL_UNFOCUS :
|
||||
if (Fl::visible_focus()) {
|
||||
redraw();
|
||||
return 1;
|
||||
} else return 0;
|
||||
case FL_SHORTCUT:
|
||||
case FL_KEYBOARD: {
|
||||
int v = value();
|
||||
@ -249,5 +242,5 @@ Fl_Scrollbar::Fl_Scrollbar(int X, int Y, int W, int H, const char* L)
|
||||
}
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.13 2002/10/06 18:37:14 easysw Exp $".
|
||||
// End of "$Id: Fl_Scrollbar.cxx,v 1.7.2.14.2.14 2002/10/24 12:53:40 easysw Exp $".
|
||||
//
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Slider.cxx,v 1.8.2.10.2.10 2002/08/13 15:42:44 easysw Exp $"
|
||||
// "$Id: Fl_Slider.cxx,v 1.8.2.10.2.11 2002/10/24 12:53:41 easysw Exp $"
|
||||
//
|
||||
// Slider widget for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -171,7 +171,6 @@ int Fl_Slider::handle(int event, int X, int Y, int W, int H) {
|
||||
switch (event) {
|
||||
case FL_PUSH:
|
||||
if (!Fl::event_inside(X, Y, W, H)) return 0;
|
||||
if (Fl::visible_focus()) Fl::focus(this);
|
||||
handle_push();
|
||||
case FL_DRAG: {
|
||||
|
||||
@ -277,6 +276,8 @@ int Fl_Slider::handle(int event, int X, int Y, int W, int H) {
|
||||
}
|
||||
|
||||
int Fl_Slider::handle(int event) {
|
||||
if (event == FL_PUSH && Fl::visible_focus()) Fl::focus(this);
|
||||
|
||||
return handle(event,
|
||||
x()+Fl::box_dx(box()),
|
||||
y()+Fl::box_dy(box()),
|
||||
@ -285,5 +286,5 @@ int Fl_Slider::handle(int event) {
|
||||
}
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Slider.cxx,v 1.8.2.10.2.10 2002/08/13 15:42:44 easysw Exp $".
|
||||
// End of "$Id: Fl_Slider.cxx,v 1.8.2.10.2.11 2002/10/24 12:53:41 easysw Exp $".
|
||||
//
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: scroll.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:33 easysw Exp $"
|
||||
// "$Id: scroll.cxx,v 1.4.2.3.2.2 2002/10/24 12:53:41 easysw Exp $"
|
||||
//
|
||||
// Fl_Scroll test program for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -26,7 +26,7 @@
|
||||
#include <FL/Fl.H>
|
||||
#include <FL/Fl_Double_Window.H>
|
||||
#include <FL/Fl_Scroll.H>
|
||||
#include <FL/Fl_Toggle_Button.H>
|
||||
#include <FL/Fl_Light_Button.H>
|
||||
#include <FL/Fl_Choice.H>
|
||||
#include <FL/Fl_Box.H>
|
||||
#include <string.h>
|
||||
@ -116,7 +116,7 @@ int main(int argc, char** argv) {
|
||||
Fl_Box box(0,300,5*75,window.h()-300); // gray area below the scroll
|
||||
box.box(FL_FLAT_BOX);
|
||||
|
||||
Fl_Toggle_Button but1(150, 310, 200, 25, "box");
|
||||
Fl_Light_Button but1(150, 310, 200, 25, "box");
|
||||
but1.callback(box_cb);
|
||||
|
||||
Fl_Choice choice(150, 335, 200, 25, "type():");
|
||||
@ -137,5 +137,5 @@ int main(int argc, char** argv) {
|
||||
}
|
||||
|
||||
//
|
||||
// End of "$Id: scroll.cxx,v 1.4.2.3.2.1 2002/01/01 15:11:33 easysw Exp $".
|
||||
// End of "$Id: scroll.cxx,v 1.4.2.3.2.2 2002/10/24 12:53:41 easysw Exp $".
|
||||
//
|
||||
|
||||
Loading…
Reference in New Issue
Block a user