summaryrefslogtreecommitdiff
path: root/src/fl_oval_box.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <github@matthiasm.com>2025-12-03 23:33:08 +0100
committerMatthias Melcher <github@matthiasm.com>2025-12-03 23:33:14 +0100
commit87160b6eb9143e044926827b82a2df021cff9c83 (patch)
treebf5b01ba02817eeed0efdb36545220fecd043bd3 /src/fl_oval_box.cxx
parent20b07572df61c6fe7d8cde731aa88b2b145b316a (diff)
Remove boxtype linke trick.
By defining boxtypes with underscores, box drawing cod ethat was not used was not linked, but with the introduction of themes, all boxes are available at all times. Reducing complexity.
Diffstat (limited to 'src/fl_oval_box.cxx')
-rw-r--r--src/fl_oval_box.cxx18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/fl_oval_box.cxx b/src/fl_oval_box.cxx
index 3d8d27fd3..a9db0b799 100644
--- a/src/fl_oval_box.cxx
+++ b/src/fl_oval_box.cxx
@@ -1,7 +1,7 @@
//
// Oval box drawing code for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2020 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -25,22 +25,22 @@
// BW = box shadow width
#define BW (Fl::box_shadow_width())
-static void fl_oval_flat_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_oval_flat_box(int x, int y, int w, int h, Fl_Color c) {
Fl::set_box_color(c);
fl_pie(x, y, w, h, 0, 360);
}
-static void fl_oval_frame(int x, int y, int w, int h, Fl_Color c) {
+void fl_oval_frame(int x, int y, int w, int h, Fl_Color c) {
Fl::set_box_color(c);
fl_arc(x, y, w, h, 0, 360);
}
-static void fl_oval_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_oval_box(int x, int y, int w, int h, Fl_Color c) {
fl_oval_flat_box(x,y,w,h,c);
fl_oval_frame(x,y,w,h,FL_BLACK);
}
-static void fl_oval_shadow_box(int x, int y, int w, int h, Fl_Color c) {
+void fl_oval_shadow_box(int x, int y, int w, int h, Fl_Color c) {
fl_oval_flat_box(x+BW,y+BW,w,h,FL_DARK3);
fl_oval_box(x,y,w,h,c);
}
@@ -58,11 +58,3 @@ void fl_oval_focus(Fl_Boxtype bt, int x, int y, int w, int h, Fl_Color fg, Fl_Co
fl_color(savecolor);
}
-extern void fl_internal_boxtype(Fl_Boxtype, Fl_Box_Draw_F*, Fl_Box_Draw_Focus_F* =NULL);
-Fl_Boxtype fl_define_FL_OVAL_BOX() {
- fl_internal_boxtype(_FL_OSHADOW_BOX, fl_oval_shadow_box, fl_oval_focus);
- fl_internal_boxtype(_FL_OVAL_FRAME, fl_oval_frame, fl_oval_focus);
- fl_internal_boxtype(_FL_OFLAT_BOX, fl_oval_flat_box, fl_oval_focus);
- fl_internal_boxtype(_FL_OVAL_BOX, fl_oval_box, fl_oval_focus);
- return _FL_OVAL_BOX;
-}