summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FL/Enumerations.H2
-rw-r--r--fluid/about_panel.cxx2
-rw-r--r--fluid/code.cxx2
-rw-r--r--fluid/function_panel.cxx4
-rw-r--r--fluid/function_panel.fl4
-rw-r--r--fluid/makedepend3
-rw-r--r--src/makedepend1
7 files changed, 10 insertions, 8 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index a2e5030fc..1efef1532 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -406,7 +406,7 @@ enum Fl_Event { // events
This event is sent to the window's handle method.
*/
FL_ZOOM_GESTURE = 26,
- /** A zoom event (crtl/+/-/0/ or cmd/+/-/0/) was processed.
+ /** A zoom event (ctrl/+/-/0/ or cmd/+/-/0/) was processed.
Use Fl::add_handler() to be notified of this event.
*/
FL_ZOOM_EVENT = 27
diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx
index d68e853e5..c9cd7b22a 100644
--- a/fluid/about_panel.cxx
+++ b/fluid/about_panel.cxx
@@ -300,7 +300,7 @@ Fl_Double_Window* make_about_panel() {
/**
Embedded image for internal fluid.html web page.
*/
-unsigned char fluid_org_png[27580] = /* binary data included from ../documentation/src/fluid-org.png */
+unsigned char fluid_org_png[27580] = /* data inlined from ../documentation/src/fluid-org.png */
{137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,2,161,0,0,1,25,8,6,0,0,0,
167,211,252,219,0,0,0,1,115,82,71,66,0,174,206,28,233,0,0,0,6,98,75,71,68,0,255,
0,255,0,255,160,189,167,147,0,0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,
diff --git a/fluid/code.cxx b/fluid/code.cxx
index 62114c238..c9d63e1b5 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -157,7 +157,7 @@ void write_cstring(const char *s, int length) {
return;
}
// if we are rendering to the source code preview window, and the text is
- // longer that four lines, we only render a placeholder.
+ // longer than four lines, we only render a placeholder.
if (write_sourceview && ((s==NULL) || (length>300))) {
if (length>=0)
fprintf(code_file, "\" ... %d bytes of text... \"", length);
diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx
index 91d56e234..8aabc129a 100644
--- a/fluid/function_panel.cxx
+++ b/fluid/function_panel.cxx
@@ -483,8 +483,8 @@ Fl_Double_Window* make_data_panel() {
data_class_choice->menu(menu_data_class_choice);
} // Fl_Choice* data_class_choice
{ data_mode = new Fl_Check_Button(200, 10, 78, 20, "text mode");
- data_mode->tooltip("When text mode is seleted, the returned type is \"const char*\" and a trailin\
-g NUL will be appended to the data.");
+ data_mode->tooltip("When text mode is selected, the returned type is \"const char*\" and a traili\
+ng NUL will be appended to the data.");
data_mode->down_box(FL_DOWN_BOX);
data_mode->labelsize(11);
} // Fl_Check_Button* data_mode
diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl
index b46fcde37..f8c6de902 100644
--- a/fluid/function_panel.fl
+++ b/fluid/function_panel.fl
@@ -337,7 +337,7 @@ Function {make_data_panel()} {open
} {
Fl_Window data_panel {
label {Inline Data Properties} open
- xywh {472 191 343 237} type Double align 80 resizable size_range {343 237 0 0} visible
+ xywh {472 191 343 237} type Double align 80 hide resizable size_range {343 237 0 0}
} {
Fl_Group {} {open
xywh {10 10 320 20}
@@ -383,7 +383,7 @@ Function {make_data_panel()} {open
}
Fl_Check_Button data_mode {
label {text mode}
- tooltip {When text mode is seleted, the returned type is "const char*" and a trailing NUL will be appended to the data.} xywh {200 10 78 20} down_box DOWN_BOX labelsize 11
+ tooltip {When text mode is selected, the returned type is "const char*" and a trailing NUL will be appended to the data.} xywh {200 10 78 20} down_box DOWN_BOX labelsize 11
}
}
Fl_Input data_input {
diff --git a/fluid/makedepend b/fluid/makedepend
index 1405c6474..a2105f0e6 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -381,7 +381,8 @@ function_panel.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
function_panel.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
function_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Return_Button.H
function_panel.o: ../FL/Fl_Button.H ../FL/Fl_Button.H CodeEditor.h
-function_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Menu_Button.H
+function_panel.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Check_Button.H
+function_panel.o: ../FL/Fl_Light_Button.H ../FL/Fl_Menu_Button.H
function_panel.o: ../FL/Fl_Window.H ../FL/Fl_Tabs.H Fl_Type.h
function_panel.o: ../FL/Fl_Widget.H ../FL/Fl_Menu.H Fluid_Image.h
function_panel.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H
diff --git a/src/makedepend b/src/makedepend
index fabc4ce3b..f0d92599a 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -232,6 +232,7 @@ Fl_Image_Surface.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/fl_types.h
Fl_Image_Surface.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Group.H
Fl_Image_Surface.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Widget.H
Fl_Image_Surface.o: ../FL/Fl.H ../FL/Fl_Image.H ../FL/Fl_Shared_Image.H
+Fl_Image_Surface.o: ../FL/fl_draw.H
Fl_Input.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
Fl_Input.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
Fl_Input.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H