Author: matt
Date: 2009-09-23 12:24:34 -0700 (Wed, 23 Sep 2009)
New Revision: 6896
Log:
Fixed Fluid dependency on X11 (STR #226)
Modified:
branches/branch-1.3/CHANGES
branches/branch-1.3/fluid/fluid.cxx
Modified: branches/branch-1.3/CHANGES
===================================================================
--- branches/branch-1.3/CHANGES 2009-09-21 06:35:08 UTC (rev 6895)
+++ branches/branch-1.3/CHANGES 2009-09-23 19:24:34 UTC (rev 6896)
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.3.0
+ - Fixed Fluid dependency on X11 (STR #2261)
- Updated the bundled libpng to v1.2.40 (released Sep. 10, 2009)
- Fixed Fl_Choice contrast with light-on-dark settings (STR #2219)
- Fixed X server "lock", if a modal dialog window is opened
Modified: branches/branch-1.3/fluid/fluid.cxx
===================================================================
--- branches/branch-1.3/fluid/fluid.cxx 2009-09-21 06:35:08 UTC (rev 6895)
+++ branches/branch-1.3/fluid/fluid.cxx 2009-09-23 19:24:34 UTC (rev 6896)
@@ -1751,18 +1751,20 @@
}
void make_main_window() {
- fluid_prefs.get("snap", snap, 1);
- fluid_prefs.get("gridx", gridx, 5);
- fluid_prefs.get("gridy", gridy, 5);
- fluid_prefs.get("show_guides", show_guides, 0);
- fluid_prefs.get("widget_size", Fl_Widget_Type::default_size, 14);
- fluid_prefs.get("show_comments", show_comments, 1);
+ if (!compile_only) {
+ fluid_prefs.get("snap", snap, 1);
+ fluid_prefs.get("gridx", gridx, 5);
+ fluid_prefs.get("gridy", gridy, 5);
+ fluid_prefs.get("show_guides", show_guides, 0);
+ fluid_prefs.get("widget_size", Fl_Widget_Type::default_size, 14);
+ fluid_prefs.get("show_comments", show_comments, 1);
- load_history();
+ load_history();
- make_layout_window();
- make_settings_window();
- make_shell_window();
+ make_layout_window();
+ make_settings_window();
+ make_shell_window();
+ }
if (!main_window) {
Fl_Widget *o;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
