Don't apply tile image to menu or overlay windows.
Add Fl_BMP_Image.H links to fltk.list.in. Reset colors to standard FLTK ones in Fl::get_system_colors(). Don't clear button events when fixing focus. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1918 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
d725a22d43
commit
a55363086d
7
CHANGES
7
CHANGES
@ -1,6 +1,11 @@
|
||||
CHANGES IN FLTK 1.1.0b9
|
||||
|
||||
- Add Fl_BMP_Image class to support loading of Windows
|
||||
- Fl::scheme() applied the scheme tile image to overlay
|
||||
and menu windows, which caused problems when the
|
||||
overlay planes were in use.
|
||||
- Fixed Fl::event_button() value when hiding tooltip on
|
||||
some systems.
|
||||
- Added Fl_BMP_Image class to support loading of Windows
|
||||
bitmap (BMP) files.
|
||||
- The shiny demo didn't work on some systems (no
|
||||
single-buffered OpenGL visual), and the new box types
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $"
|
||||
// "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.2 2002/01/07 18:47:27 easysw Exp $"
|
||||
//
|
||||
// Menu window header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -40,13 +40,13 @@ public:
|
||||
void clear_overlay() {set_flag(NO_OVERLAY);}
|
||||
FL_EXPORT ~Fl_Menu_Window();
|
||||
Fl_Menu_Window(int W, int H, const char *l = 0)
|
||||
: Fl_Single_Window(W,H,l) {}
|
||||
: Fl_Single_Window(W,H,l) { image(0); }
|
||||
Fl_Menu_Window(int X, int Y, int W, int H, const char *l = 0)
|
||||
: Fl_Single_Window(X,Y,W,H,l) {}
|
||||
: Fl_Single_Window(X,Y,W,H,l) { image(0); }
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.1 2002/01/01 15:11:28 easysw Exp $".
|
||||
// End of "$Id: Fl_Menu_Window.H,v 1.5.2.3.2.2 2002/01/07 18:47:27 easysw Exp $".
|
||||
//
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.2 2002/01/01 15:11:28 easysw Exp $"
|
||||
// "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.3 2002/01/07 18:47:27 easysw Exp $"
|
||||
//
|
||||
// Overlay window header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -41,14 +41,14 @@ public:
|
||||
FL_EXPORT int can_do_overlay();
|
||||
FL_EXPORT void redraw_overlay();
|
||||
Fl_Overlay_Window(int W, int H, const char *l=0)
|
||||
: Fl_Double_Window(W,H,l) {overlay_ = 0; force_doublebuffering_=1;}
|
||||
: Fl_Double_Window(W,H,l) {overlay_ = 0; force_doublebuffering_=1; image(0); }
|
||||
Fl_Overlay_Window(int X, int Y, int W, int H, const char *l=0)
|
||||
: Fl_Double_Window(X,Y,W,H,l) {overlay_ = 0; force_doublebuffering_=1;}
|
||||
: Fl_Double_Window(X,Y,W,H,l) {overlay_ = 0; force_doublebuffering_=1; image(0); }
|
||||
void show(int a, char **b) {Fl_Double_Window::show(a,b);}
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.2 2002/01/01 15:11:28 easysw Exp $".
|
||||
// End of "$Id: Fl_Overlay_Window.H,v 1.5.2.3.2.3 2002/01/07 18:47:27 easysw Exp $".
|
||||
//
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: fltk.list.in,v 1.1.2.3 2002/01/06 13:40:28 easysw Exp $"
|
||||
# "$Id: fltk.list.in,v 1.1.2.4 2002/01/07 18:47:27 easysw Exp $"
|
||||
#
|
||||
# EPM product list file for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -105,6 +105,7 @@ l 0000 root sys $includedir/FL/Enumerations.h Enumerations.H
|
||||
l 0000 root sys $includedir/FL/Fl.h Fl.H
|
||||
l 0000 root sys $includedir/FL/Fl_Adjuster.h Fl_Adjuster.H
|
||||
l 0000 root sys $includedir/FL/Fl_Bitmap.h Fl_Bitmap.H
|
||||
l 0000 root sys $includedir/FL/Fl_BMP_Image.h Fl_BMP_Image.H
|
||||
l 0000 root sys $includedir/FL/Fl_Box.h Fl_Box.H
|
||||
l 0000 root sys $includedir/FL/Fl_Browser.h Fl_Browser.H
|
||||
l 0000 root sys $includedir/FL/Fl_Browser_.h Fl_Browser_.H
|
||||
@ -216,5 +217,5 @@ f 0444 root sys $datadir/doc/fltk/COPYING COPYING
|
||||
f 0444 root sys $datadir/doc/fltk/CHANGES CHANGES
|
||||
|
||||
#
|
||||
# End of "$Id: fltk.list.in,v 1.1.2.3 2002/01/06 13:40:28 easysw Exp $".
|
||||
# End of "$Id: fltk.list.in,v 1.1.2.4 2002/01/07 18:47:27 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl.cxx,v 1.24.2.41.2.16 2002/01/01 15:11:29 easysw Exp $"
|
||||
// "$Id: Fl.cxx,v 1.24.2.41.2.17 2002/01/07 18:47:27 easysw Exp $"
|
||||
//
|
||||
// Main event handling code for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -447,7 +447,9 @@ void fl_fix_focus() {
|
||||
// set focus based on Fl::modal() and fl_xfocus
|
||||
Fl_Widget* w = fl_xfocus;
|
||||
if (w) {
|
||||
Fl::e_keysym = 0; // make sure widgets don't think a keystroke moved focus
|
||||
if (Fl::e_keysym < (FL_Button + FL_LEFT_MOUSE) ||
|
||||
Fl::e_keysym > (FL_Button + FL_RIGHT_MOUSE))
|
||||
Fl::e_keysym = 0; // make sure widgets don't think a keystroke moved focus
|
||||
while (w->parent()) w = w->parent();
|
||||
if (Fl::modal()) w = Fl::modal();
|
||||
if (!w->contains(Fl::focus()))
|
||||
@ -851,5 +853,5 @@ void Fl_Window::flush() {
|
||||
}
|
||||
|
||||
//
|
||||
// End of "$Id: Fl.cxx,v 1.24.2.41.2.16 2002/01/01 15:11:29 easysw Exp $".
|
||||
// End of "$Id: Fl.cxx,v 1.24.2.41.2.17 2002/01/07 18:47:27 easysw Exp $".
|
||||
//
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.5 2002/01/01 15:11:31 easysw Exp $"
|
||||
// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.6 2002/01/07 18:47:27 easysw Exp $"
|
||||
//
|
||||
// System color support for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@ -62,9 +62,9 @@ void Fl::background2(uchar r, uchar g, uchar b) {
|
||||
}
|
||||
|
||||
// these are set by Fl::args() and override any system colors:
|
||||
const char *fl_fg;
|
||||
const char *fl_bg;
|
||||
const char *fl_bg2;
|
||||
const char *fl_fg = NULL;
|
||||
const char *fl_bg = NULL;
|
||||
const char *fl_bg2 = NULL;
|
||||
|
||||
static void set_selection_color(uchar r, uchar g, uchar b) {
|
||||
Fl::set_color(FL_SELECTION_COLOR,r,g,b);
|
||||
@ -159,11 +159,11 @@ void Fl::get_system_colors()
|
||||
// the same color as the windows).
|
||||
|
||||
static void
|
||||
getsyscolor(const char *key1, const char* key2, const char *arg, void (*func)(uchar,uchar,uchar))
|
||||
getsyscolor(const char *key1, const char* key2, const char *arg, const char *defarg, void (*func)(uchar,uchar,uchar))
|
||||
{
|
||||
if (!arg) {
|
||||
arg = XGetDefault (fl_display, key1, key2);
|
||||
if (!arg) return;
|
||||
if (!arg) arg = defarg;
|
||||
}
|
||||
XColor x;
|
||||
if (!XParseColor(fl_display, fl_colormap, arg, &x))
|
||||
@ -178,10 +178,10 @@ void Fl::get_system_colors()
|
||||
const char* key1 = 0;
|
||||
if (Fl::first_window()) key1 = Fl::first_window()->xclass();
|
||||
if (!key1) key1 = "fltk";
|
||||
getsyscolor(key1, "background", fl_bg, Fl::background);
|
||||
getsyscolor(key1, "foreground", fl_fg, Fl::foreground);
|
||||
getsyscolor("Text","background", fl_bg2, Fl::background2);
|
||||
getsyscolor(key1, "selectBackground",0, set_selection_color);
|
||||
getsyscolor(key1, "background", fl_bg, "#c0c0c0", Fl::background);
|
||||
getsyscolor(key1, "foreground", fl_fg, "#000000", Fl::foreground);
|
||||
getsyscolor("Text","background", fl_bg2, "#ffffff", Fl::background2);
|
||||
getsyscolor(key1, "selectBackground",0, "#000080", set_selection_color);
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -304,5 +304,5 @@ int Fl::reload_scheme() {
|
||||
|
||||
|
||||
//
|
||||
// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.5 2002/01/01 15:11:31 easysw Exp $".
|
||||
// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.6 2002/01/07 18:47:27 easysw Exp $".
|
||||
//
|
||||
|
||||
Loading…
Reference in New Issue
Block a user