From 2f9a58d6084f4ba3fa16c5ca72c5a253d68f9ef8 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 3 May 2002 14:33:00 +0000 Subject: [PATCH] Don't open the display to load a .fl file. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2187 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 3 +++ fluid/Fl_Window_Type.cxx | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index dce85ede5..35ad2af12 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,9 @@ CHANGES IN FLTK 1.1.0rc2 - Wide arcs would draw with "teeth". - The preferences demo included Fl/Fl_Preferences.H instead of FL/Fl_Preferences.H. + - Fl_File_Chooser.cxx defined the file chooser functions + again; they should only be defined in the header file. + - FLUID was opening the display when it shouldn't have. CHANGES IN FLTK 1.1.0rc1 diff --git a/fluid/Fl_Window_Type.cxx b/fluid/Fl_Window_Type.cxx index 530a9a159..c778084d0 100644 --- a/fluid/Fl_Window_Type.cxx +++ b/fluid/Fl_Window_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.3 2002/05/01 19:17:24 easysw Exp $" +// "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.4 2002/05/03 14:33:00 easysw Exp $" // // Window type code for the Fast Light Tool Kit (FLTK). // @@ -251,8 +251,10 @@ Fl_Type *Fl_Window_Type::make() { this->o = new Fl_Window(100,100); Fl_Group::current(0); } + // Set the size ranges for this window; in order to avoid opening the + // X display we use an arbitrary maximum size... ((Fl_Window *)(this->o))->size_range(gridx * snap, gridy * snap, - Fl::w(), Fl::h(), + 3072, 2048, gridx * snap, gridy * snap, 0); myo->factory = this; myo->drag = 0; @@ -790,5 +792,5 @@ int Fl_Window_Type::read_fdesign(const char* name, const char* value) { } // -// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.3 2002/05/01 19:17:24 easysw Exp $". +// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.4 2002/05/03 14:33:00 easysw Exp $". //