- Update version string in leda_window to 2.3.

- Minor fixes.

Packages/window/changes.txt

@@ -1,3 +1,7 @@
+2.8.2       (18 June 2001)
+- Update version string in leda_window to 2.3.
+- Minor fixes.
+
 2.8.1       (23 May 2001)
 - changed __USE_CGAL_WINDOW__ to the better name
   CGAL_USE_CGAL_WINDOW (suggested by Sylvain)

Packages/window/doc_tex/Colors_and_windows/Window.tex

@@ -72,7 +72,7 @@ displays it at default position on the display. Returns a pointer to the window
 the center of the window. 
 Returns a pointer to the window created.}
 
-\ccFunction{Window_stream* create_and_dislpay_demo_window( float width, float height, const char* str, double x_extension);}
+\ccFunction{Window_stream* create_and_display_demo_window( float width, float height, const char* str, double x_extension);}
 {creates a window of \ccStyle{width} $\times$ \ccStyle{height} pixels, sets the window label to
 \ccc{str}, and initializes the $x$-range in object space that is mapped to the physical window by
 [-\ccc{x_extension}, \ccc{x_extension}]. The $y$-range is initialized such that the origin is at
@@ -153,12 +153,13 @@ that get inserted to or extracted from the window stream.
 
 \begin{cprog}
 
+#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Segment_2.h>
 #include <CGAL/IO/Window_stream.h>
 
-typedef CGAL::Point_2< Cartesian<double> >     Point;
-typedef CGAL::Segment_2< Cartesian<double> >   Segment;
+typedef CGAL::Point_2< CGAL::Cartesian<double> >     Point;
+typedef CGAL::Segment_2< CGAL::Cartesian<double> >   Segment;
 
 int main()
 {

Packages/window/doc_tex/support/Colors_and_windows/Window.tex

@@ -72,7 +72,7 @@ displays it at default position on the display. Returns a pointer to the window
 the center of the window. 
 Returns a pointer to the window created.}
 
-\ccFunction{Window_stream* create_and_dislpay_demo_window( float width, float height, const char* str, double x_extension);}
+\ccFunction{Window_stream* create_and_display_demo_window( float width, float height, const char* str, double x_extension);}
 {creates a window of \ccStyle{width} $\times$ \ccStyle{height} pixels, sets the window label to
 \ccc{str}, and initializes the $x$-range in object space that is mapped to the physical window by
 [-\ccc{x_extension}, \ccc{x_extension}]. The $y$-range is initialized such that the origin is at
@@ -153,12 +153,13 @@ that get inserted to or extracted from the window stream.
 
 \begin{cprog}
 
+#include <CGAL/basic.h>
 #include <CGAL/Cartesian.h>
 #include <CGAL/Segment_2.h>
 #include <CGAL/IO/Window_stream.h>
 
-typedef CGAL::Point_2< Cartesian<double> >     Point;
-typedef CGAL::Segment_2< Cartesian<double> >   Segment;
+typedef CGAL::Point_2< CGAL::Cartesian<double> >     Point;
+typedef CGAL::Segment_2< CGAL::Cartesian<double> >   Segment;
 
 int main()
 {

Packages/window/include/CGAL/IO/cgal_window.h

@@ -21,7 +21,6 @@
 // coordinator   : MPI, Saarbruecken  (<Stefan.Schirra@mpi-sb.mpg.de>)
 // ======================================================================
  
-
 #ifndef CGAL_LEDA_WINDOW_H
 #define CGAL_LEDA_WINDOW_H
 
@@ -29,10 +28,8 @@
 #include <CGAL/LEDA/window.h>
 #include <CGAL/IO/esprit_logo.xpm>
 
-
 CGAL_BEGIN_NAMESPACE
 
-
 typedef CGAL::window        Window_stream;
 
 inline
@@ -43,7 +40,6 @@ operator<<(CGAL::window& w, const Color& c)
   return w;
 }
 
-
 inline
 void
 cgalize(CGAL::window& w)
@@ -69,7 +65,6 @@ create_demo_window( float w = 512.0, float h = 512.0,
   return Wptr;
 }
 
-
 inline
 CGAL::window*
 create_and_display_demo_window(float w = 512.0, float h = 512.0,

Packages/window/include/CGAL/IO/esprit_logo.xpm

@@ -1,5 +1,3 @@
-#ifndef CGAL_IO_ESPRIT_LOGO_XPM
-#define CGAL_IO_ESPRIT_LOGO_XPM
 // ============================================================================
 //
 // Copyright (c) 1999 The CGAL Consortium
@@ -13,16 +11,18 @@
 // release       :
 // release_date  :
 // 
-// source        : (leda_window.fw)
 // file          : IO/esprit_logo.xpm
-// revision      : 2.7
-// revision_date : 21 Aug 2000 
+// package       : window
+// revision      : $Revision$
+// revision_date : $Date$
 // author(s)     : created automatically using ...
 // maintainer    : Stefan Schirra <Stefan.Schirra@mpi-sb.mpg.de> 
 //
 // coordinator   : MPI, Saarbruecken (<Stefan.Schirra@mpi-sb.mpg.de>)
 // ============================================================================
 
+#ifndef CGAL_IO_ESPRIT_LOGO_XPM
+#define CGAL_IO_ESPRIT_LOGO_XPM
 
 CGAL_BEGIN_NAMESPACE
 
@@ -153,5 +153,4 @@ static char* esprit_logo[] = {
 };
 CGAL_END_NAMESPACE
 
-
 #endif // CGAL_IO_ESPRIT_LOGO_XPM

Packages/window/include/CGAL/IO/leda_window.h

@@ -61,12 +61,11 @@ operator<<(leda_window& w, const Color& c)
   return w;
 }
 
-
 inline
 void
 cgalize(leda_window& w)
 {
-  w.set_frame_label("CGAL-2.1");
+  w.set_frame_label("CGAL-2.3");
   w.set_icon_label("CGAL");
   w.set_node_width( 3);
   w.set_line_width( 2);
@@ -87,7 +86,6 @@ create_demo_window( float w = 512.0, float h = 512.0,
   return Wptr;
 }
 
-
 inline
 leda_window*
 create_and_display_demo_window(float w = 512.0, float h = 512.0,
@@ -105,7 +103,6 @@ create_and_display_demo_window(float w = 512.0, float h = 512.0,
 
 CGAL_END_NAMESPACE
 
-
 #endif // CGAL_LEDA_WINDOW_H
 
 CGAL_BEGIN_NAMESPACE
@@ -754,16 +751,9 @@ operator<<(leda_window& w, const Bbox_2& b)
 #endif // CGAL_LEDA_WINDOW_BBOX_2
 #endif // CGAL_BBOX_2_H
 
-
 CGAL_END_NAMESPACE
 
-#ifndef IO_TRIANGULATION_WINDOW_STREAM_H
 #include <CGAL/IO/triangulation_Window_stream.h>
-#endif  // IO_TRIANGULATION_WINDOW_STREAM_H
-#ifndef IO_OPTIMISATION_WINDOW_STREAM_H
 #include <CGAL/IO/optimisation_Window_stream.h>
-#endif // IO_OPTIMISATION_WINDOW_STREAM_H
-#ifndef IO_POLYGON_WINDOW_STREAM_H
 #include <CGAL/IO/polygon_Window_stream.h>
-#endif // IO_POLYGON_WINDOW_STREAM_H