summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--fluid/fluid.cxx26
2 files changed, 15 insertions, 12 deletions
diff --git a/CHANGES b/CHANGES
index d63f15a4e..e4c665472 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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
diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx
index fb48bcd33..f8c16bb69 100644
--- a/fluid/fluid.cxx
+++ b/fluid/fluid.cxx
@@ -1751,18 +1751,20 @@ void toggle_sourceview_b_cb(Fl_Button*, void *) {
}
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);
-
- load_history();
-
- make_layout_window();
- make_settings_window();
- make_shell_window();
+ 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();
+
+ make_layout_window();
+ make_settings_window();
+ make_shell_window();
+ }
if (!main_window) {
Fl_Widget *o;