summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES1
-rw-r--r--src/Fl_Light_Button.cxx2
-rw-r--r--src/Fl_Menu.cxx2
-rw-r--r--src/fl_gtk.cxx64
-rw-r--r--vcnet/fltkgl.vcproj16
5 files changed, 43 insertions, 42 deletions
diff --git a/CHANGES b/CHANGES
index 64acf7266..d979ad24d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ CHANGES IN FLTK 1.1.8
STR #1457, STR #1458, STR #1460, STR #1481, STR #1578)
- The sample RPM spec file now enables large file support
and threading support (STR #1603)
+ - Fixed VCNet OpenGL project file (STR #1617)
- Fixed scrolling of clipped areas in MSWindows (STR
#1601)
- Fixed clipping in OS X Quartz offscreen buffers (STR
diff --git a/src/Fl_Light_Button.cxx b/src/Fl_Light_Button.cxx
index 0e37333e1..b4ca03a88 100644
--- a/src/Fl_Light_Button.cxx
+++ b/src/Fl_Light_Button.cxx
@@ -90,7 +90,7 @@ void Fl_Light_Button::draw() {
tW --;
fl_pie(x() + tdx - 1, y() + tdy - 1, tW + 3, tW + 3, 0.0, 360.0);
fl_arc(x() + tdx - 1, y() + tdy - 1, tW + 3, tW + 3, 0.0, 360.0);
- fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2));
+ fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2f));
} else fl_color(col);
switch (tW) {
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index b8337d4d6..703f2ec39 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -190,7 +190,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m,
tW --;
fl_pie(x + td + 1, y + d + td - 1, tW + 3, tW + 3, 0.0, 360.0);
fl_arc(x + td + 1, y + d + td - 1, tW + 3, tW + 3, 0.0, 360.0);
- fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2));
+ fl_color(fl_color_average(FL_WHITE, FL_SELECTION_COLOR, 0.2f));
} else fl_color(labelcolor_);
} else fl_color(labelcolor_);
diff --git a/src/fl_gtk.cxx b/src/fl_gtk.cxx
index 31a5a0e5d..c0930c63b 100644
--- a/src/fl_gtk.cxx
+++ b/src/fl_gtk.cxx
@@ -66,19 +66,19 @@ static void gtk_up_frame(int x, int y, int w, int h, Fl_Color c) {
static void gtk_up_box(int x, int y, int w, int h, Fl_Color c) {
gtk_up_frame(x, y, w, h, c);
- gtk_color(fl_color_average(FL_WHITE, c, 0.4));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.4f));
fl_xyline(x + 2, y + 2, x + w - 3);
- gtk_color(fl_color_average(FL_WHITE, c, 0.2));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.2f));
fl_xyline(x + 2, y + 3, x + w - 3);
- gtk_color(fl_color_average(FL_WHITE, c, 0.1));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.1f));
fl_xyline(x + 2, y + 4, x + w - 3);
gtk_color(c);
fl_rectf(x + 2, y + 5, w - 4, h - 7);
- gtk_color(fl_color_average(FL_BLACK, c, 0.025));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.025f));
fl_xyline(x + 2, y + h - 4, x + w - 3);
- gtk_color(fl_color_average(FL_BLACK, c, 0.05));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.05f));
fl_xyline(x + 2, y + h - 3, x + w - 3);
- gtk_color(fl_color_average(FL_BLACK, c, 0.1));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.1f));
fl_xyline(x + 2, y + h - 2, x + w - 3);
fl_yxline(x + w - 2, y + 2, y + h - 3);
}
@@ -97,11 +97,11 @@ static void gtk_down_frame(int x, int y, int w, int h, Fl_Color c) {
fl_vertex(x, y + h - 3);
fl_end_loop();
- gtk_color(fl_color_average(FL_BLACK, c, 0.1));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.1f));
fl_xyline(x + 2, y + 1, x + w - 3);
fl_yxline(x + 1, y + 2, y + h - 3);
- gtk_color(fl_color_average(FL_BLACK, c, 0.05));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.05f));
fl_yxline(x + 2, y + h - 2, y + 2, x + w - 2);
}
@@ -116,11 +116,11 @@ static void gtk_down_box(int x, int y, int w, int h, Fl_Color c) {
static void gtk_thin_up_frame(int x, int y, int w, int h, Fl_Color c) {
- gtk_color(fl_color_average(FL_WHITE, c, 0.6));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.6f));
fl_xyline(x + 1, y, x + w - 2);
fl_yxline(x, y + 1, y + h - 2);
- gtk_color(fl_color_average(FL_BLACK, c, 0.4));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.4f));
fl_xyline(x + 1, y + h - 1, x + w - 2);
fl_yxline(x + w - 1, y + 1, y + h - 2);
}
@@ -129,29 +129,29 @@ static void gtk_thin_up_frame(int x, int y, int w, int h, Fl_Color c) {
static void gtk_thin_up_box(int x, int y, int w, int h, Fl_Color c) {
gtk_thin_up_frame(x, y, w, h, c);
- gtk_color(fl_color_average(FL_WHITE, c, 0.4));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.4f));
fl_xyline(x + 1, y + 1, x + w - 2);
- gtk_color(fl_color_average(FL_WHITE, c, 0.2));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.2f));
fl_xyline(x + 1, y + 2, x + w - 2);
- gtk_color(fl_color_average(FL_WHITE, c, 0.1));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.1f));
fl_xyline(x + 1, y + 3, x + w - 2);
gtk_color(c);
fl_rectf(x + 1, y + 4, w - 2, h - 8);
- gtk_color(fl_color_average(FL_BLACK, c, 0.025));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.025f));
fl_xyline(x + 1, y + h - 4, x + w - 2);
- gtk_color(fl_color_average(FL_BLACK, c, 0.05));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.05f));
fl_xyline(x + 1, y + h - 3, x + w - 2);
- gtk_color(fl_color_average(FL_BLACK, c, 0.1));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.1f));
fl_xyline(x + 1, y + h - 2, x + w - 2);
}
static void gtk_thin_down_frame(int x, int y, int w, int h, Fl_Color c) {
- gtk_color(fl_color_average(FL_BLACK, c, 0.4));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.4f));
fl_xyline(x + 1, y, x + w - 2);
fl_yxline(x, y + 1, y + h - 2);
- gtk_color(fl_color_average(FL_WHITE, c, 0.6));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.6f));
fl_xyline(x + 1, y + h - 1, x + w - 2);
fl_yxline(x + w - 1, y + 1, y + h - 2);
}
@@ -216,30 +216,30 @@ void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) {
fl_color(c);
draw(FILL, x, y, w, h, 2);
- gtk_color(fl_color_average(FL_BLACK, c, 0.025));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.025f));
draw(LOWER_RIGHT, x+1, y, w-2, h, 2);
draw(LOWER_RIGHT, x, y, w, h, 3);
- gtk_color(fl_color_average(FL_BLACK, c, 0.05));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.05f));
draw(LOWER_RIGHT, x+1, y, w-2, h, 1);
draw(LOWER_RIGHT, x, y, w, h, 2);
- gtk_color(fl_color_average(FL_BLACK, c, 0.1));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.1f));
draw(LOWER_RIGHT, x+1, y, w-2, h, 0);
draw(LOWER_RIGHT, x, y, w, h, 1);
- gtk_color(fl_color_average(FL_WHITE, c, 0.1));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.1f));
draw(UPPER_LEFT, x, y, w, h, 4);
draw(UPPER_LEFT, x+1, y, w-2, h, 3);
- gtk_color(fl_color_average(FL_WHITE, c, 0.2));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.2f));
draw(UPPER_LEFT, x, y, w, h, 3);
draw(UPPER_LEFT, x+1, y, w-2, h, 2);
- gtk_color(fl_color_average(FL_WHITE, c, 0.4));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.4f));
draw(UPPER_LEFT, x, y, w, h, 2);
draw(UPPER_LEFT, x+1, y, w-2, h, 1);
- gtk_color(fl_color_average(FL_WHITE, c, 0.5));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.5f));
draw(UPPER_LEFT, x, y, w, h, 1);
draw(UPPER_LEFT, x+1, y, w-2, h, 0);
- gtk_color(fl_color_average(FL_BLACK, c, 0.5));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.5f));
draw(CLOSED, x, y, w, h, 0);
}
@@ -247,14 +247,14 @@ void gtk_round_down_box(int x, int y, int w, int h, Fl_Color c) {
fl_color(c);
draw(FILL, x, y, w, h, 2);
- gtk_color(fl_color_average(FL_BLACK, c, 0.05));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.05f));
draw(UPPER_LEFT, x, y, w, h, 2);
draw(UPPER_LEFT, x+1, y, w-2, h, 1);
- gtk_color(fl_color_average(FL_BLACK, c, 0.1));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.1f));
draw(UPPER_LEFT, x, y, w, h, 1);
draw(UPPER_LEFT, x+1, y, w-2, h, 0);
- gtk_color(fl_color_average(FL_BLACK, c, 0.5));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.5f));
draw(CLOSED, x, y, w, h, 0);
}
@@ -263,11 +263,11 @@ void gtk_round_down_box(int x, int y, int w, int h, Fl_Color c) {
static void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) {
gtk_color(c);
fl_pie(x, y, w, h, 0.0, 360.0);
- gtk_color(fl_color_average(FL_WHITE, c, 0.5));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.5f));
fl_arc(x, y, w, h, 45.0, 180.0);
- gtk_color(fl_color_average(FL_WHITE, c, 0.25));
+ gtk_color(fl_color_average(FL_WHITE, c, 0.25f));
fl_arc(x, y, w, h, 180.0, 405.0);
- gtk_color(fl_color_average(FL_BLACK, c, 0.5));
+ gtk_color(fl_color_average(FL_BLACK, c, 0.5f));
fl_arc(x, y, w, h, 225.0, 360.0);
}
diff --git a/vcnet/fltkgl.vcproj b/vcnet/fltkgl.vcproj
index a29e6eace..03eac2426 100644
--- a/vcnet/fltkgl.vcproj
+++ b/vcnet/fltkgl.vcproj
@@ -178,7 +178,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
@@ -186,7 +186,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
</File>
<File
@@ -196,7 +196,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
@@ -204,7 +204,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
</File>
<File
@@ -214,7 +214,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
@@ -222,7 +222,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
</File>
<File
@@ -232,7 +232,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
@@ -240,7 +240,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
+ PreprocessorDefinitions="" />
</FileConfiguration>
</File>
<File
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-08 10:22:10 +0000