mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STR #1617: fltkgl.vcproj in the vnet directory had missing closing brackets in the XML code. The question remains: who ate the slashes?

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5721 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2007-02-27 19:23:24 +00:00
parent 4f0bda21f8
commit a1f5426a97
5 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -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

2
src/Fl_Light_Button.cxx
View File

@ -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) {

2
src/Fl_Menu.cxx
View File

@ -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_);

64
src/fl_gtk.cxx
View File

@ -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);
}

16
vcnet/fltkgl.vcproj
View File

@ -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