summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>2000-04-11 08:11:56 +0000
committerBill Spitzak <spitzak@gmail.com>2000-04-11 08:11:56 +0000
commitffd26dfc452b94f631df22497de561791e5ce8d0 (patch)
tree369d0b8bf5aa969d829b3216c939effeb9535052 /FL
parent177e3cd076288531a1bee16374a091aed80e61a6 (diff)
I made FL_NORMAL_SIZE into a public int variable. You can now change it
before any widgets are created, in order to change the default size of the fonts used. The most useful thing that can be done is to set it to 12 so that the default font size matches Win32. I also fixed the menubar drawing a bit so that a menubar with a FL_FLAT_BOX draws correctly. It should also be documented that "Fl::set_color(Fl_Color(15),0,0,128);" can be used to get Win32-style highlighting of menus and text items. This is not portable to fltk 2.0. With these changes it should be easier to get fltk to look just like Win32. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1062 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/Enumerations.H6
-rw-r--r--FL/forms.H6
2 files changed, 6 insertions, 6 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H
index 05b1d4f2a..37821c58e 100644
--- a/FL/Enumerations.H
+++ b/FL/Enumerations.H
@@ -1,5 +1,5 @@
//
-// "$Id: Enumerations.H,v 1.18.2.9 2000/03/05 06:51:03 bill Exp $"
+// "$Id: Enumerations.H,v 1.18.2.10 2000/04/11 08:11:49 bill Exp $"
//
// Enumerations for the Fast Light Tool Kit (FLTK).
//
@@ -265,7 +265,7 @@ enum Fl_Font { // standard fonts
FL_ITALIC = 2 // add this to helvetica, courier, or times
};
-#define FL_NORMAL_SIZE 14 // default size of all labels & text
+extern FL_EXPORT int FL_NORMAL_SIZE;
enum Fl_Color { // standard colors
FL_BLACK = 0,
@@ -371,5 +371,5 @@ enum Fl_Damage {
#endif
//
-// End of "$Id: Enumerations.H,v 1.18.2.9 2000/03/05 06:51:03 bill Exp $".
+// End of "$Id: Enumerations.H,v 1.18.2.10 2000/04/11 08:11:49 bill Exp $".
//
diff --git a/FL/forms.H b/FL/forms.H
index e0eafbf3c..60f8b28a6 100644
--- a/FL/forms.H
+++ b/FL/forms.H
@@ -1,5 +1,5 @@
//
-// "$Id: forms.H,v 1.7.2.2 2000/03/05 06:51:04 bill Exp $"
+// "$Id: forms.H,v 1.7.2.3 2000/04/11 08:11:50 bill Exp $"
//
// Forms emulation header file for the Fast Light Tool Kit (FLTK).
//
@@ -134,7 +134,7 @@ typedef Fl_Window FL_FORM;
// size values are different from XForms, match older Forms:
#define FL_TINY_SIZE 8
#define FL_SMALL_SIZE 11 // 10
-#define FL_NORMAL_SIZE 14 // 12
+//#define FL_NORMAL_SIZE 14 // 12
#define FL_MEDIUM_SIZE 18 // 14
#define FL_LARGE_SIZE 24 // 18
#define FL_HUGE_SIZE 32 // 24
@@ -838,5 +838,5 @@ inline void fl_draw() {Fl::flush();}
#endif /* define __FORMS_H__ */
//
-// End of "$Id: forms.H,v 1.7.2.2 2000/03/05 06:51:04 bill Exp $".
+// End of "$Id: forms.H,v 1.7.2.3 2000/04/11 08:11:50 bill Exp $".
//