summaryrefslogtreecommitdiff
path: root/fluid
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2009-09-23 19:24:34 +0000
committerMatthias Melcher <fltk@matthiasm.com>2009-09-23 19:24:34 +0000
commitbcd43ecb7d30039bb838542ed7643383c5b20a59 (patch)
tree033c535539f88e3bef954299a94228231177b1ba /fluid
parent6beaec33de4f6b91b839a28d76e624f7ee827b66 (diff)
Fixed Fluid dependency on X11 (STR #226)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6896 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
-rw-r--r--fluid/fluid.cxx26
1 files changed, 14 insertions, 12 deletions
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;