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

Non-changing changes... Attempting to keep the porting branch somehwat in-sync with doc changes in main 1.3.x 

None of these changes alter the actual code.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11076 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Ian MacArthur 2016-01-28 17:16:32 +00:00
parent ed9ac2aba3
commit 5aefd057d1
3 changed files with 319 additions and 280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
FL/Fl.H
View File

@ -434,15 +434,19 @@ public:
stdout with a fair degree of accuracy: stdout with a fair degree of accuracy:
\code \code
void callback(void*) { #include <stdio.h>
puts("TICK"); #include <FL/Fl.H>
Fl::repeat_timeout(1.0, callback); #include <FL/Fl_Window.H>
} void callback(void*) {
printf("TICK\n");
int main() { Fl::repeat_timeout(1.0, callback); // retrigger timeout
Fl::add_timeout(1.0, callback); }
return Fl::run(); int main() {
} Fl_Window win(100,100);
win.show();
Fl::add_timeout(1.0, callback); // set up first timeout
return Fl::run();
}
\endcode \endcode
*/ */
static void add_timeout(double t, Fl_Timeout_Handler,void* = 0); // platform dependent static void add_timeout(double t, Fl_Timeout_Handler,void* = 0); // platform dependent

554
FL/Fl_Text_Buffer.H
View File

File diff suppressed because it is too large Load Diff

23
FL/Fl_Text_Display.H
View File

@ -3,7 +3,7 @@
// //
// Header file for Fl_Text_Display class. // Header file for Fl_Text_Display class.
// //
// Copyright 2001-2010 by Bill Spitzak and others. // Copyright 2001-2016 by Bill Spitzak and others.
// Original code Copyright Mark Edel. Permission to distribute under // Original code Copyright Mark Edel. Permission to distribute under
// the LGPL for the FLTK library granted by Mark Edel. // the LGPL for the FLTK library granted by Mark Edel.
// //
@ -133,14 +133,23 @@ public:
typedef void (*Unfinished_Style_Cb)(int, void *); typedef void (*Unfinished_Style_Cb)(int, void *);
/** /**
This structure associates the color, font, andsize of a string to draw This structure associates the color, font, and font size of a string to draw
with an attribute mask matching attr with an attribute mask matching attr.
There must be one entry for each style that can be used in an
Fl_Text_Display for displaying text. The style table is an array of
struct Style_Table_Entry.
The style table is associated with an Fl_Text_Display by using
Fl_Text_Display::highlight_data().
\see Fl_Text_Display::highlight_data()
*/ */
struct Style_Table_Entry { struct Style_Table_Entry {
Fl_Color color; Fl_Color color; ///< text color
Fl_Font font; Fl_Font font; ///< text font
Fl_Fontsize size; Fl_Fontsize size; ///< text font size
unsigned attr; unsigned attr; ///< currently unused (this may be change in the future)
}; };
Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0); Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0);