mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed .gif files in fluid, they were broken by the fix for large .xpm 

files in version 1.0.9.

Fix for OpenGL hardware overlays with the transparent index != 0.
Tested on the brand new HP Linux Workstations, this is the only bug
encountered.  Both X and OpenGL hardware overlay works perfectly on
these, though configue may not enable it by default...)

Fl_Choice and all other Fl_Menu_ subclasses draw the items using
textcolor() as the default color of the text.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1244 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Bill Spitzak 2000-06-29 07:23:56 +00:00
parent 753c53cc75
commit e2e44bfcd5
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fluid/Fluid_Image.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fluid_Image.cxx,v 1.7.2.4 2000/06/16 07:08:15 bill Exp $"
// "$Id: Fluid_Image.cxx,v 1.7.2.5 2000/06/29 07:23:56 spitzak Exp $"
//
// Pixmap label support for the Fast Light Tool Kit (FLTK).
//
@ -74,7 +74,7 @@ void pixmap_image::write_static() {
write_c("static char *%s[] = {\n",
unique_id(this, "image", filename_name(name()), 0));
int l;
for (l = 0; l < numlines; l++) {
for (l = 0; l < numlines && p->data[l]; l++) {
if (l) write_c(",\n");
write_cstring(p->data[l],linelength[l]);
}
@ -101,7 +101,7 @@ static int hexdigit(int x) {
#define INITIALLINES 1024
pixmap_image::pixmap_image(const char *name, FILE *f) : Fluid_Image(name) {
if (!f) return; // for subclasses
if (!f) {numlines = 0x7ffffff; return;} // for subclasses
// read all the c-strings out of the file:
char* local_data[INITIALLINES];
char** data = local_data;
@ -437,5 +437,5 @@ Fluid_Image *ui_find_image(const char *oldname) {
}
//
// End of "$Id: Fluid_Image.cxx,v 1.7.2.4 2000/06/16 07:08:15 bill Exp $".
// End of "$Id: Fluid_Image.cxx,v 1.7.2.5 2000/06/29 07:23:56 spitzak Exp $".
//

5
src/Fl_Gl_Overlay.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.10 2000/06/10 18:24:30 bill Exp $"
// "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.11 2000/06/29 07:23:56 spitzak Exp $"
//
// OpenGL overlay code for the Fast Light Tool Kit (FLTK).
//
@ -75,6 +75,7 @@ public:
};
void _Fl_Gl_Overlay::draw() {
if (!valid_) glClearIndex((GLfloat)fl_transparent_pixel);
if (damage() != FL_DAMAGE_EXPOSE) glClear(GL_COLOR_BUFFER_BIT);
Fl_Gl_Window *w = (Fl_Gl_Window *)parent();
uchar save_valid = w->valid_;
@ -208,5 +209,5 @@ void Fl_Gl_Window::hide_overlay() {
#endif
//
// End of "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.10 2000/06/10 18:24:30 bill Exp $".
// End of "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.11 2000/06/29 07:23:56 spitzak Exp $".
//

6
src/Fl_Menu.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Menu.cxx,v 1.18.2.8 2000/06/05 21:20:53 mike Exp $"
// "$Id: Fl_Menu.cxx,v 1.18.2.9 2000/06/29 07:23:56 spitzak Exp $"
//
// Menu code for the Fast Light Tool Kit (FLTK).
//
@ -127,7 +127,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
l.type = labeltype_;
l.font = labelsize_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA);
l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE;
l.color = labelcolor_ ? labelcolor_ : m ? m->labelcolor() : int(FL_BLACK);
l.color = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_BLACK);
if (!active()) l.color = inactive((Fl_Color)l.color);
Fl_Color color = m ? m->color() : FL_GRAY;
if (selected) {
@ -737,5 +737,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const {
}
//
// End of "$Id: Fl_Menu.cxx,v 1.18.2.8 2000/06/05 21:20:53 mike Exp $".
// End of "$Id: Fl_Menu.cxx,v 1.18.2.9 2000/06/29 07:23:56 spitzak Exp $".
//