Author: matt
Date: 2011-05-22 06:16:31 -0700 (Sun, 22 May 2011)
New Revision: 8713
Log:
123: fixed links to boxtypes.
Modified:
branches/branch-3.0/src/Fl_PNG_Image.cxx
branches/branch-3.0/src/fl_boxtype.cxx
branches/branch-3.0/src/fl_diamond_box.cxx
branches/branch-3.0/src/fl_gtk.cxx
branches/branch-3.0/src/fl_oval_box.cxx
branches/branch-3.0/src/fl_plastic.cxx
branches/branch-3.0/src/fl_rounded_box.cxx
branches/branch-3.0/src/fl_shadow_box.cxx
Modified: branches/branch-3.0/src/Fl_PNG_Image.cxx
===================================================================
--- branches/branch-3.0/src/Fl_PNG_Image.cxx 2011-05-22 09:45:40 UTC (rev
8712)
+++ branches/branch-3.0/src/Fl_PNG_Image.cxx 2011-05-22 13:16:31 UTC (rev
8713)
@@ -85,7 +85,7 @@
\param[in] filename Name of PNG file to read
*/
-fltk3::PNGImage::fltk3::PNGImage (const char *filename): fltk3::RGBImage(0,0,0)
+fltk3::PNGImage::PNGImage (const char *filename): fltk3::RGBImage(0,0,0)
{
load_png_(filename, NULL, 0);
}
@@ -102,7 +102,7 @@
\param buffer Pointer to the start of the PNG image in memory
\param maxsize Size in bytes of the memory buffer containing the PNG image
*/
-fltk3::PNGImage::fltk3::PNGImage (
+fltk3::PNGImage::PNGImage (
const char *name_png, const unsigned char *buffer, int maxsize):
fltk3::RGBImage(0,0,0)
{
load_png_(name_png, buffer, maxsize);
Modified: branches/branch-3.0/src/fl_boxtype.cxx
===================================================================
--- branches/branch-3.0/src/fl_boxtype.cxx 2011-05-22 09:45:40 UTC (rev
8712)
+++ branches/branch-3.0/src/fl_boxtype.cxx 2011-05-22 13:16:31 UTC (rev
8713)
@@ -250,68 +250,109 @@
////////////////////////////////////////////////////////////////
+void fl_diamond_down_box(int x,int y,int w,int h,fltk3::Color bgcolor);
+void fl_diamond_up_box(int x,int y,int w,int h,fltk3::Color bgcolor);
+void fl_shadow_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_shadow_box(int x, int y, int w, int h, fltk3::Color c);
+
+void fl_round_up_box(int x, int y, int w, int h, fltk3::Color bgcolor);
+void fl_round_down_box(int x, int y, int w, int h, fltk3::Color bgcolor);
+void fl_rflat_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_rounded_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_rounded_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_rshadow_box(int x, int y, int w, int h, fltk3::Color c);
+
+void fl_oval_shadow_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_oval_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_oval_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_oval_flat_box(int x, int y, int w, int h, fltk3::Color c);
+
+void fl_plastic_up_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_plastic_down_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_plastic_up_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_plastic_down_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_plastic_thin_up_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_plastic_up_round(int x, int y, int w, int h, fltk3::Color c);
+void fl_plastic_down_round(int x, int y, int w, int h, fltk3::Color c);
+
+void fl_gtk_up_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_up_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_down_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_down_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_thin_up_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_thin_up_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_thin_down_frame(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_thin_down_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c);
+void fl_gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c);
+
static struct {
fltk3::BoxDrawF *f;
uchar dx, dy, dw, dh;
int set;
} fl_box_table[256] = {
// must match list in enumerations.h!!!
- {fl_no_box, 0,0,0,0,1},
- {fltk3::rectf, 0,0,0,0,1}, // fltk3::FLAT_BOX
- {fl_up_box, D1,D1,D2,D2,1},
- {fl_down_box, D1,D1,D2,D2,1},
- {fl_up_frame, D1,D1,D2,D2,1},
- {fl_down_frame, D1,D1,D2,D2,1},
- {fl_thin_up_box, 1,1,2,2,1},
- {fl_thin_down_box, 1,1,2,2,1},
- {fl_thin_up_frame, 1,1,2,2,1},
- {fl_thin_down_frame, 1,1,2,2,1},
- {fl_engraved_box, 2,2,4,4,1},
- {fl_embossed_box, 2,2,4,4,1},
- {fl_engraved_frame, 2,2,4,4,1},
- {fl_embossed_frame, 2,2,4,4,1},
- {fl_border_box, 1,1,2,2,1},
- {fl_border_box, 1,1,5,5,0}, // _FL_SHADOW_BOX,
- {fl_border_frame, 1,1,2,2,1},
- {fl_border_frame, 1,1,5,5,0}, // _FL_SHADOW_FRAME,
- {fl_border_box, 1,1,2,2,0}, // _FL_ROUNDED_BOX,
- {fl_border_box, 1,1,2,2,0}, // _FL_RSHADOW_BOX,
- {fl_border_frame, 1,1,2,2,0}, // _FL_ROUNDED_FRAME
- {fltk3::rectf, 0,0,0,0,0}, // _FL_RFLAT_BOX,
- {fl_up_box, 3,3,6,6,0}, // _FL_ROUND_UP_BOX
- {fl_down_box, 3,3,6,6,0}, // _FL_ROUND_DOWN_BOX,
- {fl_up_box, 0,0,0,0,0}, // _FL_DIAMOND_UP_BOX
- {fl_down_box, 0,0,0,0,0}, // _FL_DIAMOND_DOWN_BOX
- {fl_border_box, 1,1,2,2,0}, // _FL_OVAL_BOX,
- {fl_border_box, 1,1,2,2,0}, // _FL_OVAL_SHADOW_BOX,
- {fl_border_frame, 1,1,2,2,0}, // _FL_OVAL_FRAME
- {fltk3::rectf, 0,0,0,0,0}, // _FL_OVAL_FLAT_BOX,
- {fl_up_box, 4,4,8,8,0}, // _FL_PLASTIC_UP_BOX,
- {fl_down_box, 2,2,4,4,0}, // _FL_PLASTIC_DOWN_BOX,
- {fl_up_frame, 2,2,4,4,0}, // _FL_PLASTIC_UP_FRAME,
- {fl_down_frame, 2,2,4,4,0}, // _FL_PLASTIC_DOWN_FRAME,
- {fl_up_box, 2,2,4,4,0}, // _FL_PLASTIC_THIN_UP_BOX,
- {fl_down_box, 2,2,4,4,0}, // _FL_PLASTIC_THIN_DOWN_BOX,
- {fl_up_box, 2,2,4,4,0}, // _FL_PLASTIC_ROUND_UP_BOX,
- {fl_down_box, 2,2,4,4,0}, // _FL_PLASTIC_ROUND_DOWN_BOX,
- {fl_up_box, 2,2,4,4,0}, // _FL_GTK_UP_BOX,
- {fl_down_box, 2,2,4,4,0}, // _FL_GTK_DOWN_BOX,
- {fl_up_frame, 2,2,4,4,0}, // _FL_GTK_UP_FRAME,
- {fl_down_frame, 2,2,4,4,0}, // _FL_GTK_DOWN_FRAME,
- {fl_up_frame, 1,1,2,2,0}, // _FL_GTK_THIN_UP_FRAME,
- {fl_down_frame, 1,1,2,2,0}, // _FL_GTK_THIN_DOWN_FRAME,
- {fl_up_box, 1,1,2,2,0}, // _FL_GTK_THIN_ROUND_UP_BOX,
- {fl_down_box, 1,1,2,2,0}, // _FL_GTK_THIN_ROUND_DOWN_BOX,
- {fl_up_box, 2,2,4,4,0}, // _FL_GTK_ROUND_UP_BOX,
- {fl_down_box, 2,2,4,4,0}, // _FL_GTK_ROUND_DOWN_BOX,
- {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+0
- {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+1
- {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+2
- {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+3
- {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+4
- {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+5
- {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+6
- {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+7
+ {fl_no_box, 0,0,0,0,1},
+ {fltk3::rectf, 0,0,0,0,1}, // fltk3::FLAT_BOX
+ {fl_up_box, D1,D1,D2,D2,1},
+ {fl_down_box, D1,D1,D2,D2,1},
+ {fl_up_frame, D1,D1,D2,D2,1},
+ {fl_down_frame, D1,D1,D2,D2,1},
+ {fl_thin_up_box, 1,1,2,2,1},
+ {fl_thin_down_box, 1,1,2,2,1},
+ {fl_thin_up_frame, 1,1,2,2,1},
+ {fl_thin_down_frame, 1,1,2,2,1},
+ {fl_engraved_box, 2,2,4,4,1},
+ {fl_embossed_box, 2,2,4,4,1},
+ {fl_engraved_frame, 2,2,4,4,1},
+ {fl_embossed_frame, 2,2,4,4,1},
+ {fl_border_box, 1,1,2,2,1},
+ {fl_shadow_box, 1,1,5,5,0}, // FL_SHADOW_BOX,
+ {fl_border_frame, 1,1,2,2,1},
+ {fl_shadow_frame, 1,1,5,5,0}, // FL_SHADOW_FRAME,
+
+ {fl_rounded_box, 1,1,2,2,0}, // FL_ROUNDED_BOX,
+ {fl_rshadow_box, 1,1,2,2,0}, // FL_RSHADOW_BOX,
+ {fl_rounded_frame, 1,1,2,2,0}, // FL_ROUNDED_FRAME
+ {fl_rflat_box, 0,0,0,0,0}, // FL_RFLAT_BOX,
+ {fl_round_up_box, 3,3,6,6,0}, // FL_ROUND_UP_BOX
+ {fl_round_down_box, 3,3,6,6,0}, // FL_ROUND_DOWN_BOX,
+ {fl_diamond_up_box, 0,0,0,0,0}, // FL_DIAMOND_UP_BOX
+ {fl_diamond_down_box, 0,0,0,0,0}, // FL_DIAMOND_DOWN_BOX
+
+ {fl_oval_box, 1,1,2,2,0}, // FL_OVAL_BOX,
+ {fl_oval_shadow_box, 1,1,2,2,0}, // FL_OVAL_SHADOW_BOX,
+ {fl_oval_frame, 1,1,2,2,0}, // FL_OVAL_FRAME
+ {fl_oval_flat_box, 0,0,0,0,0}, // FL_OVAL_FLAT_BOX,
+
+ {fl_plastic_up_box, 4,4,8,8,0}, // FL_PLASTIC_UP_BOX,
+ {fl_plastic_down_box, 2,2,4,4,0}, // FL_PLASTIC_DOWN_BOX,
+ {fl_plastic_up_frame, 2,2,4,4,0}, // FL_PLASTIC_UP_FRAME,
+ {fl_plastic_down_frame, 2,2,4,4,0}, // FL_PLASTIC_DOWN_FRAME,
+ {fl_plastic_thin_up_box, 2,2,4,4,0}, // FL_PLASTIC_THIN_UP_BOX,
+ {fl_plastic_down_box, 2,2,4,4,0}, // FL_PLASTIC_THIN_DOWN_BOX,
+ {fl_plastic_up_round, 2,2,4,4,0}, // FL_PLASTIC_ROUND_UP_BOX,
+ {fl_plastic_down_round, 2,2,4,4,0}, // FL_PLASTIC_ROUND_DOWN_BOX,
+
+ {fl_gtk_up_box, 2,2,4,4,0}, // FL_GTK_UP_BOX,
+ {fl_gtk_down_box, 2,2,4,4,0}, // FL_GTK_DOWN_BOX,
+ {fl_gtk_up_frame, 2,2,4,4,0}, // FL_GTK_UP_FRAME,
+ {fl_gtk_down_frame, 2,2,4,4,0}, // FL_GTK_DOWN_FRAME,
+ {fl_gtk_thin_up_box, 1,1,2,2,0}, // FL_GTK_THIN_ROUND_UP_BOX,
+ {fl_gtk_thin_down_box, 1,1,2,2,0}, // FL_GTK_THIN_ROUND_DOWN_BOX,
+ {fl_gtk_thin_up_frame, 1,1,2,2,0}, // FL_GTK_THIN_UP_FRAME,
+ {fl_gtk_thin_down_frame, 1,1,2,2,0}, // FL_GTK_THIN_DOWN_FRAME,
+ {fl_gtk_round_up_box, 2,2,4,4,0}, // FL_GTK_ROUND_UP_BOX,
+ {fl_gtk_round_down_box, 2,2,4,4,0}, // FL_GTK_ROUND_DOWN_BOX,
+
+ {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+0
+ {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+1
+ {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+2
+ {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+3
+ {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+4
+ {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+5
+ {fl_up_box, 3,3,6,6,0}, // FL_FREE_BOX+6
+ {fl_down_box, 3,3,6,6,0}, // FL_FREE_BOX+7
};
/**
Modified: branches/branch-3.0/src/fl_diamond_box.cxx
===================================================================
--- branches/branch-3.0/src/fl_diamond_box.cxx 2011-05-22 09:45:40 UTC (rev
8712)
+++ branches/branch-3.0/src/fl_diamond_box.cxx 2011-05-22 13:16:31 UTC (rev
8713)
@@ -38,7 +38,7 @@
extern uchar* gray_ramp();
}
-static void fl_diamond_up_box(int x,int y,int w,int h,fltk3::Color bgcolor) {
+void fl_diamond_up_box(int x,int y,int w,int h,fltk3::Color bgcolor) {
w &= -2;
h &= -2;
int x1 = x+w/2;
@@ -54,7 +54,7 @@
fltk3::color(g['A']); fltk3::loop(x, y1, x1, y, x+w, y1, x1, y+h);
}
-static void fl_diamond_down_box(int x,int y,int w,int h,fltk3::Color bgcolor) {
+void fl_diamond_down_box(int x,int y,int w,int h,fltk3::Color bgcolor) {
w &= -2;
h &= -2;
int x1 = x+w/2;
Modified: branches/branch-3.0/src/fl_gtk.cxx
===================================================================
--- branches/branch-3.0/src/fl_gtk.cxx 2011-05-22 09:45:40 UTC (rev 8712)
+++ branches/branch-3.0/src/fl_gtk.cxx 2011-05-22 13:16:31 UTC (rev 8713)
@@ -44,7 +44,7 @@
}
-static void gtk_up_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_up_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.5));
fltk3::xyline(x + 2, y + 1, x + w - 3);
fltk3::yxline(x + 1, y + 2, y + h - 3);
@@ -63,8 +63,8 @@
}
-static void gtk_up_box(int x, int y, int w, int h, fltk3::Color c) {
- gtk_up_frame(x, y, w, h, c);
+void fl_gtk_up_box(int x, int y, int w, int h, fltk3::Color c) {
+ fl_gtk_up_frame(x, y, w, h, c);
gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.4f));
fltk3::xyline(x + 2, y + 2, x + w - 3);
@@ -84,7 +84,7 @@
}
-static void gtk_down_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_down_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.5));
fltk3::begin_loop();
fltk3::vertex(x, y + 2);
@@ -106,8 +106,8 @@
}
-static void gtk_down_box(int x, int y, int w, int h, fltk3::Color c) {
- gtk_down_frame(x, y, w, h, c);
+void fl_gtk_down_box(int x, int y, int w, int h, fltk3::Color c) {
+ fl_gtk_down_frame(x, y, w, h, c);
gtk_color(c);
fltk3::rectf(x + 3, y + 3, w - 5, h - 4);
@@ -115,7 +115,7 @@
}
-static void gtk_thin_up_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_thin_up_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.6f));
fltk3::xyline(x + 1, y, x + w - 2);
fltk3::yxline(x, y + 1, y + h - 2);
@@ -126,8 +126,8 @@
}
-static void gtk_thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
- gtk_thin_up_frame(x, y, w, h, c);
+void fl_gtk_thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
+ fl_gtk_thin_up_frame(x, y, w, h, c);
gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.4f));
fltk3::xyline(x + 1, y + 1, x + w - 2);
@@ -146,7 +146,7 @@
}
-static void gtk_thin_down_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_thin_down_frame(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.4f));
fltk3::xyline(x + 1, y, x + w - 2);
fltk3::yxline(x, y + 1, y + h - 2);
@@ -157,8 +157,8 @@
}
-static void gtk_thin_down_box(int x, int y, int w, int h, fltk3::Color c) {
- gtk_thin_down_frame(x, y, w, h, c);
+void fl_gtk_thin_down_box(int x, int y, int w, int h, fltk3::Color c) {
+ fl_gtk_thin_down_frame(x, y, w, h, c);
gtk_color(c);
fltk3::rectf(x + 1, y + 1, w - 2, h - 2);
@@ -212,7 +212,7 @@
}
}
-void gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c);
draw(FILL, x, y, w, h, 2);
@@ -243,7 +243,7 @@
draw(CLOSED, x, y, w, h, 0);
}
-void gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c);
draw(FILL, x, y, w, h, 2);
@@ -260,7 +260,7 @@
#else
-static void gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_round_up_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(c);
fltk3::pie(x, y, w, h, 0.0, 360.0);
gtk_color(fltk3::color_average(fltk3::WHITE, c, 0.5f));
@@ -272,7 +272,7 @@
}
-static void gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_gtk_round_down_box(int x, int y, int w, int h, fltk3::Color c) {
gtk_color(c);
fltk3::pie(x, y, w, h, 0.0, 360.0);
gtk_color(fltk3::color_average(fltk3::BLACK, c, 0.2));
Modified: branches/branch-3.0/src/fl_oval_box.cxx
===================================================================
--- branches/branch-3.0/src/fl_oval_box.cxx 2011-05-22 09:45:40 UTC (rev
8712)
+++ branches/branch-3.0/src/fl_oval_box.cxx 2011-05-22 13:16:31 UTC (rev
8713)
@@ -32,22 +32,22 @@
#include <fltk3/run.h>
#include <fltk3/draw.h>
-static void fl_oval_flat_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_oval_flat_box(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c);
fltk3::pie(x, y, w, h, 0, 360);
}
-static void fl_oval_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_oval_frame(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c);
fltk3::arc(x, y, w, h, 0, 360);
}
-static void fl_oval_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_oval_box(int x, int y, int w, int h, fltk3::Color c) {
fl_oval_flat_box(x,y,w,h,c);
fl_oval_frame(x,y,w,h,fltk3::BLACK);
}
-static void fl_oval_shadow_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_oval_shadow_box(int x, int y, int w, int h, fltk3::Color c) {
fl_oval_flat_box(x+3,y+3,w,h,fltk3::DARK3);
fl_oval_box(x,y,w,h,c);
}
Modified: branches/branch-3.0/src/fl_plastic.cxx
===================================================================
--- branches/branch-3.0/src/fl_plastic.cxx 2011-05-22 09:45:40 UTC (rev
8712)
+++ branches/branch-3.0/src/fl_plastic.cxx 2011-05-22 13:16:31 UTC (rev
8713)
@@ -282,7 +282,7 @@
}
-static void up_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_plastic_up_frame(int x, int y, int w, int h, fltk3::Color c) {
frame_rect(x, y, w, h - 1, "KLDIIJLM", c);
}
@@ -304,7 +304,7 @@
}
-static void thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_plastic_thin_up_box(int x, int y, int w, int h, fltk3::Color c) {
#ifdef USE_OLD_PLASTIC_BOX
shade_rect(x + 2, y + 2, w - 4, h - 5, "RVQNOPQRSTUVWVQ", c);
up_frame(x, y, w, h, c);
@@ -319,7 +319,7 @@
}
-static void up_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_plastic_up_box(int x, int y, int w, int h, fltk3::Color c) {
#ifdef USE_OLD_PLASTIC_BOX
shade_rect(x + 2, y + 2, w - 4, h - 5, "RVQNOPQRSTUVWVQ", c);
up_frame(x, y, w, h, c);
@@ -328,27 +328,27 @@
shade_rect(x + 1, y + 1, w - 2, h - 3, "RVQNOPQRSTUVWVQ", c);
frame_rect(x, y, w, h - 1, "IJLM", c);
} else {
- thin_up_box(x, y, w, h, c);
+ fl_plastic_thin_up_box(x, y, w, h, c);
}
#endif // USE_OLD_PLASTIC_BOX
}
-static void up_round(int x, int y, int w, int h, fltk3::Color c) {
+void fl_plastic_up_round(int x, int y, int w, int h, fltk3::Color c) {
shade_round(x, y, w, h, "RVQNOPQRSTUVWVQ", c);
frame_round(x, y, w, h, "IJLM", c);
}
-static void down_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_plastic_down_frame(int x, int y, int w, int h, fltk3::Color c) {
frame_rect(x, y, w, h - 1, "LLLLTTRR", c);
}
-static void down_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_plastic_down_box(int x, int y, int w, int h, fltk3::Color c) {
if (w > 6 && h > 6) {
shade_rect(x + 2, y + 2, w - 4, h - 5, "STUVWWWVT", c);
- down_frame(x, y, w, h, c);
+ fl_plastic_down_frame(x, y, w, h, c);
}
else {
narrow_thin_box(x, y, w, h, c);
@@ -356,7 +356,7 @@
}
-static void down_round(int x, int y, int w, int h, fltk3::Color c) {
+void fl_plastic_down_round(int x, int y, int w, int h, fltk3::Color c) {
shade_round(x, y, w, h, "STUVWWWVT", c);
frame_round(x, y, w, h, "IJLM", c);
}
Modified: branches/branch-3.0/src/fl_rounded_box.cxx
===================================================================
--- branches/branch-3.0/src/fl_rounded_box.cxx 2011-05-22 09:45:40 UTC (rev
8712)
+++ branches/branch-3.0/src/fl_rounded_box.cxx 2011-05-22 13:16:31 UTC (rev
8713)
@@ -54,20 +54,20 @@
if (fill) fltk3::end_polygon(); else fltk3::end_loop();
}
-static void fl_rflat_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_rflat_box(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c); rbox(1, x, y, w, h); rbox(0, x, y, w, h);
}
-static void fl_rounded_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_rounded_frame(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c); rbox(0, x, y, w, h);
}
-static void fl_rounded_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_rounded_box(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c); rbox(1, x, y, w, h);
fltk3::color(fltk3::BLACK); rbox(0, x, y, w, h);
}
-static void fl_rshadow_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_rshadow_box(int x, int y, int w, int h, fltk3::Color c) {
// draw shadow:
fltk3::color(fltk3::DARK3);
rbox(1, x+BW, y+BW, w, h);
Modified: branches/branch-3.0/src/fl_shadow_box.cxx
===================================================================
--- branches/branch-3.0/src/fl_shadow_box.cxx 2011-05-22 09:45:40 UTC (rev
8712)
+++ branches/branch-3.0/src/fl_shadow_box.cxx 2011-05-22 13:16:31 UTC (rev
8713)
@@ -30,7 +30,7 @@
#define BW 3
-static void fl_shadow_frame(int x, int y, int w, int h, fltk3::Color c) {
+void fl_shadow_frame(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(fltk3::DARK3);
fltk3::rectf(x+BW, y+h-BW, w - BW, BW);
fltk3::rectf(x+w-BW, y+BW, BW, h - BW);
@@ -38,7 +38,7 @@
fltk3::rect(x,y,w-BW,h-BW);
}
-static void fl_shadow_box(int x, int y, int w, int h, fltk3::Color c) {
+void fl_shadow_box(int x, int y, int w, int h, fltk3::Color c) {
fltk3::color(c);
fltk3::rectf(x+1,y+1,w-2-BW,h-2-BW);
fl_shadow_frame(x,y,w,h,fltk3::GRAY0);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
