diff --git a/CHANGES b/CHANGES index cdc28491f..17920c61d 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,10 @@ CHANGES IN FLTK 1.1.0b6 - Documentation updates... - The configure script now works within the CygWin environment. + - Added new Fl::version() method to get the current + FLTK library version (for shared libraries/DLLs) + - Added new Fl::event() method to get the current + event that is being processed. - Added new fl_beep() function to do audible notifications of various types. - Added new Fl_GIF_Image, Fl_JPEG_Image, Fl_PNG_Image, diff --git a/FL/Fl.H b/FL/Fl.H index d74126f42..78bd10ec8 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -1,5 +1,5 @@ // -// "$Id: Fl.H,v 1.8.2.11.2.4 2001/11/27 17:44:06 easysw Exp $" +// "$Id: Fl.H,v 1.8.2.11.2.5 2001/11/28 18:00:16 easysw Exp $" // // Main header file for the Fast Light Tool Kit (FLTK). // @@ -45,6 +45,7 @@ class Fl { public: // should be private! + static FL_EXPORT int e_number; static FL_EXPORT int e_x,e_y,e_x_root,e_y_root; static FL_EXPORT int e_dx, e_dy; static FL_EXPORT int e_state; @@ -68,6 +69,9 @@ public: // should be private! public: + // API version number + static double version(); + // argument parsers: static FL_EXPORT int arg(int, char**, int&); static FL_EXPORT int args(int, char**, int&, int (*)(int,char**,int&) = 0); @@ -119,8 +123,9 @@ public: static FL_EXPORT void grab(Fl_Window*); // event information: - static FL_EXPORT int event_x() {return e_x;} - static FL_EXPORT int event_y() {return e_y;} + static FL_EXPORT int event() {return e_number;} + static FL_EXPORT int event_x() {return e_x;} + static FL_EXPORT int event_y() {return e_y;} static FL_EXPORT int event_x_root() {return e_x_root;} static FL_EXPORT int event_y_root() {return e_y_root;} static FL_EXPORT void get_mouse(int &,int &); @@ -220,5 +225,5 @@ public: #endif // -// End of "$Id: Fl.H,v 1.8.2.11.2.4 2001/11/27 17:44:06 easysw Exp $". +// End of "$Id: Fl.H,v 1.8.2.11.2.5 2001/11/28 18:00:16 easysw Exp $". // diff --git a/documentation/Fl_Adjuster.html b/documentation/Fl_Adjuster.html index 4cc5c464b..70cade0b7 100644 --- a/documentation/Fl_Adjuster.html +++ b/documentation/Fl_Adjuster.html @@ -1,5 +1,5 @@ -
+

class Fl_Adjuster

Class Hierarchy

diff --git a/documentation/Fl_Box.html b/documentation/Fl_Box.html index 74ad9b67a..01ed1b4c0 100644 --- a/documentation/Fl_Box.html +++ b/documentation/Fl_Box.html @@ -1,5 +1,5 @@ -
+

class Fl_Box

Class Hierarchy

diff --git a/documentation/Fl_Browser.html b/documentation/Fl_Browser.html index 34516f1d9..22541b057 100644 --- a/documentation/Fl_Browser.html +++ b/documentation/Fl_Browser.html @@ -1,5 +1,5 @@ -
+

class Fl_Browser

Class Hierarchy

diff --git a/documentation/Fl_Browser_.html b/documentation/Fl_Browser_.html index f5cca44fb..f7908f0f5 100644 --- a/documentation/Fl_Browser_.html +++ b/documentation/Fl_Browser_.html @@ -1,5 +1,5 @@ -
+

class Fl_Browser_

Class Hierarchy

diff --git a/documentation/Fl_Button.html b/documentation/Fl_Button.html index cd8c2db7a..26202efcb 100644 --- a/documentation/Fl_Button.html +++ b/documentation/Fl_Button.html @@ -1,5 +1,5 @@ -
+

class Fl_Button

Class Hierarchy

@@ -127,4 +127,4 @@ the default value is FL_WHEN_RELEASE: value() changes (when the user pushes and releases the button, and as the mouse is dragged around in and out of the button). - \ No newline at end of file + diff --git a/documentation/Fl_Chart.html b/documentation/Fl_Chart.html index 15420b6c6..7a65a772d 100644 --- a/documentation/Fl_Chart.html +++ b/documentation/Fl_Chart.html @@ -1,5 +1,5 @@ -
+

class Fl_Chart

Class Hierarchy

diff --git a/documentation/Fl_Check_Button.html b/documentation/Fl_Check_Button.html index 1f60a548f..d1074e2ac 100644 --- a/documentation/Fl_Check_Button.html +++ b/documentation/Fl_Check_Button.html @@ -1,5 +1,5 @@ -
+

class Fl_Check_Button

Class Hierarchy

diff --git a/documentation/Fl_Choice.html b/documentation/Fl_Choice.html index 627e8fbda..ad22c3448 100644 --- a/documentation/Fl_Choice.html +++ b/documentation/Fl_Choice.html @@ -1,5 +1,5 @@ -
+

class Fl_Choice

Class Hierarchy

diff --git a/documentation/Fl_Clock.html b/documentation/Fl_Clock.html index de45e3169..5f217bb31 100644 --- a/documentation/Fl_Clock.html +++ b/documentation/Fl_Clock.html @@ -1,5 +1,5 @@ -
+

class Fl_Clock

Class Hierarchy

diff --git a/documentation/Fl_Color_Chooser.html b/documentation/Fl_Color_Chooser.html index 28d638269..89fc52592 100644 --- a/documentation/Fl_Color_Chooser.html +++ b/documentation/Fl_Color_Chooser.html @@ -1,5 +1,5 @@ -
+

class Fl_Color_Chooser

Class Hierarchy

diff --git a/documentation/Fl_Counter.html b/documentation/Fl_Counter.html index dff366451..34fffb768 100644 --- a/documentation/Fl_Counter.html +++ b/documentation/Fl_Counter.html @@ -1,5 +1,5 @@ -
+

class Fl_Counter

Class Hierarchy

diff --git a/documentation/Fl_Dial.html b/documentation/Fl_Dial.html index 2cd8dc13f..4184ddd99 100644 --- a/documentation/Fl_Dial.html +++ b/documentation/Fl_Dial.html @@ -1,5 +1,5 @@ -
+

class Fl_Dial

Class Hierarchy

diff --git a/documentation/Fl_Double_Window.html b/documentation/Fl_Double_Window.html index 03ddfb08b..7be7b758d 100644 --- a/documentation/Fl_Double_Window.html +++ b/documentation/Fl_Double_Window.html @@ -1,5 +1,5 @@ -
+

class Fl_Double_Window

Class Hierarchy

@@ -50,4 +50,4 @@ all the children in the user code. Returns the off-screen pixmap or back buffer. This value is zero until the first time flush() is called. - \ No newline at end of file + diff --git a/documentation/Fl_End.html b/documentation/Fl_End.html index fc1439815..48d5595f2 100644 --- a/documentation/Fl_End.html +++ b/documentation/Fl_End.html @@ -1,5 +1,5 @@ -
+

class Fl_End

Class Hierarchy

@@ -38,4 +38,4 @@ MyClass::MyClass() :
  • Fl_End

    • Fl_End::Fl_End

    - The constructor does Fl_Group::current()->end(). \ No newline at end of file + The constructor does Fl_Group::current()->end(). diff --git a/documentation/Fl_Float_Input.html b/documentation/Fl_Float_Input.html index a274f159f..a19dda0dd 100644 --- a/documentation/Fl_Float_Input.html +++ b/documentation/Fl_Float_Input.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Float_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Free.html b/documentation/Fl_Free.html index c444faebe..89a8de00f 100644 --- a/documentation/Fl_Free.html +++ b/documentation/Fl_Free.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Free

    Class Hierarchy

    @@ -71,4 +71,4 @@ The event argument contains the event type:

    virtual Fl_Free::~Fl_Free()

    The destructor will call the handle function with the event -FL_FREE_MEM. \ No newline at end of file +FL_FREE_MEM. diff --git a/documentation/Fl_Gl_Window.html b/documentation/Fl_Gl_Window.html index a2e30ba64..21276d2e0 100644 --- a/documentation/Fl_Gl_Window.html +++ b/documentation/Fl_Gl_Window.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Gl_Window

    Class Hierarchy

    diff --git a/documentation/Fl_Group.html b/documentation/Fl_Group.html index e507588d5..1e8e4dac6 100644 --- a/documentation/Fl_Group.html +++ b/documentation/Fl_Group.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Group

    Class Hierarchy

    diff --git a/documentation/Fl_Hold_Browser.html b/documentation/Fl_Hold_Browser.html index 489520e4e..3cd7ba673 100644 --- a/documentation/Fl_Hold_Browser.html +++ b/documentation/Fl_Hold_Browser.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Hold_Browser

    Class Hierarchy

    @@ -52,4 +52,4 @@ than one line the results are unpredictable.

    int Fl_Browser::value() const
    void Fl_Browser::value(int)

    Set or get which line is selected. This returns zero if no line is -selected, so be aware that this can happen in a callback. \ No newline at end of file +selected, so be aware that this can happen in a callback. diff --git a/documentation/Fl_Input.html b/documentation/Fl_Input.html index e0b27db16..a99da8d93 100644 --- a/documentation/Fl_Input.html +++ b/documentation/Fl_Input.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Input_.html b/documentation/Fl_Input_.html index 7078311f5..c2e4a617b 100644 --- a/documentation/Fl_Input_.html +++ b/documentation/Fl_Input_.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Input_

    Class Hierarchy

    diff --git a/documentation/Fl_Int_Input.html b/documentation/Fl_Int_Input.html index bf93544c6..81fe7069c 100644 --- a/documentation/Fl_Int_Input.html +++ b/documentation/Fl_Int_Input.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Int_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Light_Button.html b/documentation/Fl_Light_Button.html index bec16ae0d..c7598a7a2 100644 --- a/documentation/Fl_Light_Button.html +++ b/documentation/Fl_Light_Button.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Light_Button

    Class Hierarchy

    diff --git a/documentation/Fl_Menu_.html b/documentation/Fl_Menu_.html index 79c975297..ba6ad06dd 100644 --- a/documentation/Fl_Menu_.html +++ b/documentation/Fl_Menu_.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Menu_

    Class Hierarchy

    diff --git a/documentation/Fl_Menu_Bar.html b/documentation/Fl_Menu_Bar.html index a33db2fda..3fc543899 100644 --- a/documentation/Fl_Menu_Bar.html +++ b/documentation/Fl_Menu_Bar.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Menu_Bar

    Class Hierarchy

    diff --git a/documentation/Fl_Menu_Button.html b/documentation/Fl_Menu_Button.html index 35a112481..b8e4a382d 100644 --- a/documentation/Fl_Menu_Button.html +++ b/documentation/Fl_Menu_Button.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Menu_Button

    Class Hierarchy

    diff --git a/documentation/Fl_Menu_Item.html b/documentation/Fl_Menu_Item.html index bfa8f802d..bb8e495c1 100644 --- a/documentation/Fl_Menu_Item.html +++ b/documentation/Fl_Menu_Item.html @@ -1,5 +1,5 @@ -
    +

    struct Fl_Menu_Item

    Class Hierarchy

    diff --git a/documentation/Fl_Menu_Window.html b/documentation/Fl_Menu_Window.html index 3772e328c..9ca520209 100644 --- a/documentation/Fl_Menu_Window.html +++ b/documentation/Fl_Menu_Window.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Menu_Window

    Class Hierarchy

    @@ -42,4 +42,4 @@ Fl_Menu_Window::clear_overlay(); This is usually necessary if your menu contains multi-color pixmaps.

    Fl_Menu_Window::set_overlay()

    Tells FLTK to use hardware overlay planes if they are available. - \ No newline at end of file + diff --git a/documentation/Fl_Multi_Browser.html b/documentation/Fl_Multi_Browser.html index f02b4e27b..350fb9ca4 100644 --- a/documentation/Fl_Multi_Browser.html +++ b/documentation/Fl_Multi_Browser.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Multi_Browser

    Class Hierarchy

    @@ -53,4 +53,4 @@ line.
    void Fl_Browser::value(int) Selects a single line or gets the last toggled line. This returns zero if no line has been toggled, so be aware that this can happen in a -callback. \ No newline at end of file +callback. diff --git a/documentation/Fl_Multiline_Input.html b/documentation/Fl_Multiline_Input.html index 6d33dff8b..dfec9c12d 100644 --- a/documentation/Fl_Multiline_Input.html +++ b/documentation/Fl_Multiline_Input.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Multiline_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Multiline_Output.html b/documentation/Fl_Multiline_Output.html index 19445661d..aad161675 100644 --- a/documentation/Fl_Multiline_Output.html +++ b/documentation/Fl_Multiline_Output.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Multiline_Output

    Class Hierarchy

    @@ -35,4 +35,4 @@ position, size, and label string. The default boxtype is FL_DOWN_BOX .

    virtual Fl_Multiline_Output::~Fl_Multiline_Output()

    - Destroys the widget and any value associated with it. \ No newline at end of file + Destroys the widget and any value associated with it. diff --git a/documentation/Fl_Output.html b/documentation/Fl_Output.html index 98b0691ac..fee6d91b9 100644 --- a/documentation/Fl_Output.html +++ b/documentation/Fl_Output.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Output

    Class Hierarchy

    diff --git a/documentation/Fl_Overlay_Window.html b/documentation/Fl_Overlay_Window.html index 8da57d313..43401ec12 100644 --- a/documentation/Fl_Overlay_Window.html +++ b/documentation/Fl_Overlay_Window.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Overlay_Window

    Class Hierarchy

    @@ -53,4 +53,4 @@ can use any of the routines described in Call this to indicate that the overlay data has changed and needs to be redrawn. The overlay will be clear until the first time this is called, so if you want an initial display you must call this after -calling show(). \ No newline at end of file +calling show(). diff --git a/documentation/Fl_Pack.html b/documentation/Fl_Pack.html index ef3efeb23..a26e81e5c 100644 --- a/documentation/Fl_Pack.html +++ b/documentation/Fl_Pack.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Pack

    Class Hierarchy

    diff --git a/documentation/Fl_Positioner.html b/documentation/Fl_Positioner.html index 1268be536..2cf1f2727 100644 --- a/documentation/Fl_Positioner.html +++ b/documentation/Fl_Positioner.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Positioner

    Class Hierarchy

    diff --git a/documentation/Fl_Repeat_Button.html b/documentation/Fl_Repeat_Button.html index 078011daa..bea62f78c 100644 --- a/documentation/Fl_Repeat_Button.html +++ b/documentation/Fl_Repeat_Button.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Repeat_Button

    Class Hierarchy

    @@ -31,4 +31,4 @@ position, size, and label string. The default boxtype is FL_UP_BOX .

    virtual Fl_Repeat_Button::~Fl_Repeat_Button()

    - Deletes the button. \ No newline at end of file + Deletes the button. diff --git a/documentation/Fl_Return_Button.html b/documentation/Fl_Return_Button.html index 5a97ef7c5..1acc552de 100644 --- a/documentation/Fl_Return_Button.html +++ b/documentation/Fl_Return_Button.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Return_Button

    Class Hierarchy

    diff --git a/documentation/Fl_Roller.html b/documentation/Fl_Roller.html index bb99288d6..d423d23d0 100644 --- a/documentation/Fl_Roller.html +++ b/documentation/Fl_Roller.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Roller

    Class Hierarchy

    diff --git a/documentation/Fl_Round_Button.html b/documentation/Fl_Round_Button.html index 19a44c80a..de82d14d9 100644 --- a/documentation/Fl_Round_Button.html +++ b/documentation/Fl_Round_Button.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Round_Button

    Class Hierarchy

    diff --git a/documentation/Fl_Scroll.html b/documentation/Fl_Scroll.html index 8c4361d03..c76b4a94c 100644 --- a/documentation/Fl_Scroll.html +++ b/documentation/Fl_Scroll.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Scroll

    Class Hierarchy

    diff --git a/documentation/Fl_Scrollbar.html b/documentation/Fl_Scrollbar.html index 475ae6921..e05de38a5 100644 --- a/documentation/Fl_Scrollbar.html +++ b/documentation/Fl_Scrollbar.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Scrollbar

    Class Hierarchy

    diff --git a/documentation/Fl_Secret_Input.html b/documentation/Fl_Secret_Input.html index c27d9e276..62f8ba96e 100644 --- a/documentation/Fl_Secret_Input.html +++ b/documentation/Fl_Secret_Input.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Secret_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Select_Browser.html b/documentation/Fl_Select_Browser.html index 029f74c7d..002299527 100644 --- a/documentation/Fl_Select_Browser.html +++ b/documentation/Fl_Select_Browser.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Select_Browser

    Class Hierarchy

    @@ -50,4 +50,4 @@ Fl_Select_Browser::~Fl_Select_Browser() than one line the results are unpredictable.

    int Fl_Browser::value() const

    Returns the number of the highlighted item, or zero if none. Notice -that this is going to be zero except during a callback! \ No newline at end of file +that this is going to be zero except during a callback! diff --git a/documentation/Fl_Single_Window.html b/documentation/Fl_Single_Window.html index 2c97cb467..e10493734 100644 --- a/documentation/Fl_Single_Window.html +++ b/documentation/Fl_Single_Window.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Single_Window

    Class Hierarchy

    diff --git a/documentation/Fl_Slider.html b/documentation/Fl_Slider.html index 11339d6b8..80803e97e 100644 --- a/documentation/Fl_Slider.html +++ b/documentation/Fl_Slider.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Slider

    Class Hierarchy

    diff --git a/documentation/Fl_Tabs.html b/documentation/Fl_Tabs.html index a66411ffe..69f49f0b8 100644 --- a/documentation/Fl_Tabs.html +++ b/documentation/Fl_Tabs.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Tabs

    Class Hierarchy

    diff --git a/documentation/Fl_Text_Buffer.html b/documentation/Fl_Text_Buffer.html index 8ae988a6b..62ba6e2a0 100644 --- a/documentation/Fl_Text_Buffer.html +++ b/documentation/Fl_Text_Buffer.html @@ -95,7 +95,6 @@ excellent NEdit text editor engine - see

    skip_lines

    substitute_null_characters

    tab_distance

    -

    tab_distance

    text_in_rectangle

    text_range

    text

    @@ -107,257 +106,159 @@ excellent NEdit text editor engine - see -

    Fl_Text_Buffer

    +

    Fl_Text_Buffer(int requestedSize = 0);

    -

    ~Fl_Text_Buffer

    +

    ~Fl_Text_Buffer();

    -

    add_modify_callback

    +

    void add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg);

    -

    append

    +

    void append(const char* text);

    -

    appendfile

    +

    int appendfile(const char *file, int buflen = 128*1024);

    -

    call_modify_callbacks

    +

    void call_modify_callbacks();

    -

    character

    +

    char character(int pos);

    -

    character_width

    +

    static int character_width(char c, int indent, int tabDist, char nullSubsChar);

    -

    clear_rectangular

    +

    void clear_rectangular(int start, int end, int rectStart, int rectEnd);

    -

    copy

    +

    void copy(Fl_Text_Buffer* fromBuf, int fromStart, int fromEnd, int toPos);

    -

    count_displayed_characters

    +

    int count_displayed_characters(int lineStartPos, int targetPos);

    -

    count_lines

    +

    int count_lines(int startPos, int endPos);

    -

    expand_character

    +

    int expand_character(int pos, int indent, char *outStr);
    +static int expand_character(char c, int indent, char* outStr, int tabDist, +char nullSubsChar);

    -

    findchar_backward

    +

    int findchar_backward(int startPos, char searchChar, int* foundPos);

    -

    findchar_forward

    +

    int findchar_forward(int startPos, char searchChar, int* foundPos);

    -

    findchars_backward

    +

    int findchars_backward(int startPos, const char* searchChars, int* foundPos);

    -

    findchars_forward

    +

    int findchars_forward(int startPos, const char* searchChars, int* foundPos);

    -

    highlight

    +

    void highlight(int start, int end);

    -

    highlight_position

    +

    int highlight_position(int* start, int* end, int* isRect, int* rectStart, +int* rectEnd);

    -

    highlight_rectangular

    +

    void highlight_rectangular(int start, int end, int rectStart, int rectEnd);

    -

    highlight_selection

    +

    Fl_Text_Selection* highlight_selection();

    -

    highlight_text

    +

    const char* highlight_text();

    -

    insert_column

    +

    void insert_column(int column, int startPos, const char* text, +int* charsInserted, int* charsDeleted);

    -

    insertfile

    +

    int insertfile(const char *file, int pos, int buflen = 128*1024);

    -

    insert

    +

    void insert(int pos, const char* text);

    -

    length

    +

    int length();

    -

    line_end

    +

    int line_end(int pos);

    -

    line_start

    +

    int line_start(int pos);

    -

    line_text

    +

    const char* line_text(int pos);

    -

    loadfile

    +

    int loadfile(const char *file, int buflen = 128*1024);

    -

    null_substitution_character

    +

    char null_substitution_character();

    -

    outputfile

    +

    int outputfile(const char *file, int start, int end, int buflen = 128*1024);

    -

    overlay_rectangular

    +

    void overlay_rectangular(int startPos, int rectStart, int rectEnd, +const char* text, int* charsInserted, int* charsDeleted);

    -

    primary_selection

    +

    Fl_Text_Selection* primary_selection();

    -

    remove_modify_callback

    +

    void remove_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg);

    -

    remove_rectangular

    +

    void remove_rectangular(int start, int end, int rectStart, int rectEnd);

    -

    remove

    +

    void remove(int start, int end);

    -

    remove_secondary_selection

    +

    void remove_secondary_selection();

    -

    remove_selection

    +

    void remove_selection();

    -

    replace_rectangular

    +

    void replace_rectangular(int start, int end, int rectStart, int rectEnd, +const char* text);

    -

    replace

    +

    void replace(int start, int end, const char *text);

    -

    replace_secondary_selection

    +

    void replace_secondary_selection(const char* text);

    -

    replace_selection

    +

    void replace_selection(const char* text);

    -

    rewind_lines

    +

    int rewind_lines(int startPos, int nLines);

    -

    savefile

    +

    int savefile(const char *file, int buflen = 128*1024);

    -

    search_backward

    +

    int search_backward(int startPos, const char* searchString, int* foundPos, +int matchCase = 0);

    -

    search_forward

    +

    int search_forward(int startPos, const char* searchString, int* foundPos, +int matchCase = 0);

    -

    secondary_selection_position

    +

    int secondary_selection_position(int* start, int* end, int* isRect, +int* rectStart, int* rectEnd);

    -

    secondary_selection

    +

    Fl_Text_Selection* secondary_selection();

    -

    secondary_selection_text

    +

    const char* secondary_selection_text();

    -

    secondary_select_rectangular

    +

    void secondary_select_rectangular(int start, int end, int rectStart, +int rectEnd);

    -

    secondary_select

    +

    void secondary_select(int start, int end);

    -

    secondary_unselect

    +

    void secondary_unselect();

    -

    selected

    +

    int selected();

    -

    selection_position

    +

    int selection_position(int* start, int* end);
    +int selection_position(int* start, int* end, int* isRect, int* rectStart, int* rectEnd);

    -

    selection_text

    +

    const char* selection_text();

    -

    select_rectangular

    +

    void select_rectangular(int start, int end, int rectStart, int rectEnd);

    -

    select

    +

    void select(int start, int end);

    -

    skip_displayed_characters

    +

    int skip_displayed_characters(int lineStartPos, int nChars);

    -

    skip_lines

    +

    int skip_lines(int startPos, int nLines);

    -

    substitute_null_characters

    +

    int substitute_null_characters(char* string, int length);

    -

    tab_distance

    +

    int tab_distance();
    +void tab_distance(int tabDist);

    -

    tab_distance

    +

    const char* text_in_rectangle(int start, int end, int rectStart, int rectEnd);

    -

    text_in_rectangle

    +

    const char* text_range(int start, int end);

    -

    text_range

    +

    const char* text();
    +void text(const char* text);

    -

    text

    +

    void unhighlight();

    -

    unhighlight

    +

    void unselect();

    -

    unselect

    +

    void unsubstitute_null_characters(char* string);

    -

    unsubstitute_null_characters

    +

    int word_end(int pos);

    -

    word_end

    +

    int word_start(int pos);

    -

    word_start

    - - - - Fl_Text_Buffer(int requestedSize = 0); - ~Fl_Text_Buffer(); - - int length() { return mLength; } - const char* text(); - void text(const char* text); - const char* text_range(int start, int end); - char character(int pos); - const char* text_in_rectangle(int start, int end, int rectStart, int rectEnd); - void insert(int pos, const char* text); - void append(const char* text) { insert(length(), text); } - void remove(int start, int end); - void replace(int start, int end, const char *text); - void copy(Fl_Text_Buffer* fromBuf, int fromStart, int fromEnd, int toPos); - int insertfile(const char *file, int pos, int buflen = 128*1024); - int appendfile(const char *file, int buflen = 128*1024) - { return insertfile(file, length(), buflen); } - int loadfile(const char *file, int buflen = 128*1024) - { select(0, length()); remove_selection(); return appendfile(file, buflen); } - int outputfile(const char *file, int start, int end, int buflen = 128*1024); - int savefile(const char *file, int buflen = 128*1024) - { return outputfile(file, 0, length(), buflen); } - - void insert_column(int column, int startPos, const char* text, - int* charsInserted, int* charsDeleted); - - void replace_rectangular(int start, int end, int rectStart, int rectEnd, - const char* text); - - void overlay_rectangular(int startPos, int rectStart, int rectEnd, - const char* text, int* charsInserted, - int* charsDeleted); - - void remove_rectangular(int start, int end, int rectStart, int rectEnd); - void clear_rectangular(int start, int end, int rectStart, int rectEnd); - int tab_distance() { return mTabDist; } - void tab_distance(int tabDist); - void select(int start, int end); - int selected() { return mPrimary.selected(); } - void unselect(); - void select_rectangular(int start, int end, int rectStart, int rectEnd); - int selection_position(int* start, int* end); - - int selection_position(int* start, int* end, int* isRect, int* rectStart, - int* rectEnd); - - const char* selection_text(); - void remove_selection(); - void replace_selection(const char* text); - void secondary_select(int start, int end); - void secondary_unselect(); - - void secondary_select_rectangular(int start, int end, int rectStart, - int rectEnd); - - int secondary_selection_position(int* start, int* end, int* isRect, - int* rectStart, int* rectEnd); - - const char* secondary_selection_text(); - void remove_secondary_selection(); - void replace_secondary_selection(const char* text); - void highlight(int start, int end); - void unhighlight(); - void highlight_rectangular(int start, int end, int rectStart, int rectEnd); - - int highlight_position(int* start, int* end, int* isRect, int* rectStart, - int* rectEnd); - - const char* highlight_text(); - void add_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg); - void remove_modify_callback(Fl_Text_Modify_Cb bufModifiedCB, void* cbArg); - - void call_modify_callbacks() { call_modify_callbacks(0, 0, 0, 0, 0); } - - const char* line_text(int pos); - int line_start(int pos); - int line_end(int pos); - int word_start(int pos); - int word_end(int pos); - int expand_character(int pos, int indent, char *outStr); - - static int expand_character(char c, int indent, char* outStr, int tabDist, - char nullSubsChar); - - static int character_width(char c, int indent, int tabDist, char nullSubsChar); - int count_displayed_characters(int lineStartPos, int targetPos); - int skip_displayed_characters(int lineStartPos, int nChars); - int count_lines(int startPos, int endPos); - int skip_lines(int startPos, int nLines); - int rewind_lines(int startPos, int nLines); - int findchar_forward(int startPos, char searchChar, int* foundPos); - int findchar_backward(int startPos, char searchChar, int* foundPos); - int findchars_forward(int startPos, const char* searchChars, int* foundPos); - int findchars_backward(int startPos, const char* searchChars, int* foundPos); - - int search_forward(int startPos, const char* searchString, int* foundPos, - int matchCase = 0); - - int search_backward(int startPos, const char* searchString, int* foundPos, - int matchCase = 0); - - int substitute_null_characters(char* string, int length); - void unsubstitute_null_characters(char* string); - char null_substitution_character() { return mNullSubsChar; } - Fl_Text_Selection* primary_selection() { return &mPrimary; } - Fl_Text_Selection* secondary_selection() { return &mSecondary; } - Fl_Text_Selection* highlight_selection() { return &mHighlight; } diff --git a/documentation/Fl_Text_Display.html b/documentation/Fl_Text_Display.html index e0b27db16..a99da8d93 100644 --- a/documentation/Fl_Text_Display.html +++ b/documentation/Fl_Text_Display.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Text_Editor.html b/documentation/Fl_Text_Editor.html index e0b27db16..a99da8d93 100644 --- a/documentation/Fl_Text_Editor.html +++ b/documentation/Fl_Text_Editor.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Tile.html b/documentation/Fl_Tile.html index a782e0bcd..cd2afc2b5 100644 --- a/documentation/Fl_Tile.html +++ b/documentation/Fl_Tile.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Tile

    Class Hierarchy

    diff --git a/documentation/Fl_Timer.html b/documentation/Fl_Timer.html index fef3acc77..1ae611413 100644 --- a/documentation/Fl_Timer.html +++ b/documentation/Fl_Timer.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Timer

    Class Hierarchy

    @@ -55,4 +55,4 @@ initial value(). Gets or sets whether the timer is suspended.

    float value() const
    void value(float)

    - Gets or sets the current timer value. \ No newline at end of file + Gets or sets the current timer value. diff --git a/documentation/Fl_Valuator.html b/documentation/Fl_Valuator.html index 2020e1961..2875e30fe 100644 --- a/documentation/Fl_Valuator.html +++ b/documentation/Fl_Valuator.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Valuator

    Class Hierarchy

    diff --git a/documentation/Fl_Value_Input.html b/documentation/Fl_Value_Input.html index 489b719d8..e4fad9208 100644 --- a/documentation/Fl_Value_Input.html +++ b/documentation/Fl_Value_Input.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Value_Input

    Class Hierarchy

    diff --git a/documentation/Fl_Value_Output.html b/documentation/Fl_Value_Output.html index f7d00f675..ca284f3b3 100644 --- a/documentation/Fl_Value_Output.html +++ b/documentation/Fl_Value_Output.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Value_Output

    Class Hierarchy

    diff --git a/documentation/Fl_Value_Slider.html b/documentation/Fl_Value_Slider.html index 5933b2738..03dd61c5a 100644 --- a/documentation/Fl_Value_Slider.html +++ b/documentation/Fl_Value_Slider.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Value_Slider

    Class Hierarchy

    diff --git a/documentation/Fl_Widget.html b/documentation/Fl_Widget.html index d002bda2d..394b49c21 100644 --- a/documentation/Fl_Widget.html +++ b/documentation/Fl_Widget.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Widget

    Class Hierarchy

    diff --git a/documentation/Fl_Window.html b/documentation/Fl_Window.html index ea422e5c4..2323a38e3 100644 --- a/documentation/Fl_Window.html +++ b/documentation/Fl_Window.html @@ -1,5 +1,5 @@ -
    +

    class Fl_Window

    Class Hierarchy

    diff --git a/src/Fl.cxx b/src/Fl.cxx index 4189ea792..39f1919c7 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.8 2001/11/27 17:44:06 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.9 2001/11/28 18:00:17 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -41,6 +41,7 @@ Fl_Widget *Fl::belowmouse_, *Fl::focus_, *Fl::selection_owner_; int Fl::damage_, + Fl::e_number, Fl::e_x, Fl::e_y, Fl::e_x_root, @@ -56,6 +57,16 @@ int Fl::e_length; int Fl::visible_focus_ = 1; +// +// 'Fl::version()' - Return the API version number... +// + +double +Fl::version() { + return FL_VERSION; +} + + // // 'Fl:event_inside()' - Return whether or not the mouse event is inside // the given rectangle. @@ -506,6 +517,8 @@ int Fl::handle(int event, Fl_Window* window) { Fl_Widget* w = window; + e_number = event; + switch (event) { case FL_CLOSE: @@ -536,7 +549,7 @@ int Fl::handle(int event, Fl_Window* window) fl_xmousewin = window; // this should already be set, but just in case. if (pushed()) { w = pushed(); - event = FL_DRAG; + e_number = event = FL_DRAG; } else if (modal() && w != modal()) { w = 0; } @@ -577,7 +590,7 @@ int Fl::handle(int event, Fl_Window* window) {char* c = (char*)event_text(); // cast away const if (!isalpha(*c)) return 0; *c = isupper(*c) ? tolower(*c) : toupper(*c);} - event = FL_SHORTCUT; + e_number = event = FL_SHORTCUT; case FL_SHORTCUT: Fl_Tooltip::enter((Fl_Widget*)0); @@ -821,5 +834,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.8 2001/11/27 17:44:06 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.9 2001/11/28 18:00:17 easysw Exp $". //