Fixed build error in msvs because Fl ref to FULLSCREEN enum was not accessible in Fl_Widget. new inline is_fullscreen() getter has been implemented to avoid a build error with (at least) msvc compilers. Fixed a ton of warnings / problems when bilding on windows 64 bits target with ms toolchain. cleaned up about 200 warnings raised when building win74 targets.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 11 insertions, 11 deletions

diff --git a/test/CubeView.cxx b/test/CubeView.cxx
index 2a660fcde..7a26ff186 100644
--- a/test/CubeView.cxx
+++ b/test/CubeView.cxx
@@ -149,8 +149,8 @@ void CubeView::draw() {
 
     glPushMatrix();
 
-    glTranslatef(xshift, yshift, 0);
-    glRotatef(hAng,0,1,0); glRotatef(vAng,1,0,0);
+    glTranslatef((GLfloat) xshift, (GLfloat) yshift, 0);
+    glRotatef((GLfloat) hAng,0,1,0); glRotatef((GLfloat) vAng,1,0,0);
     glScalef(float(size),float(size),float(size));
 
     drawCube();
diff --git a/test/CubeView.h b/test/CubeView.h
index 06a758852..95d17ae48 100644
--- a/test/CubeView.h
+++ b/test/CubeView.h
@@ -46,10 +46,10 @@ public:
      * This function is called by the horizontal roller in CubeViewUI and the
      * initialize button in CubeViewUI.
      */
-    void v_angle(float angle){vAng=angle;};
+    void v_angle(double angle){vAng=angle;}
     
     // Return the rotation about the vertical (y ) axis.
-    float v_angle(){return vAng;};
+    double v_angle() const {return vAng;}
 
     /* Set the rotation about the horizontal (x ) axis.
      *
@@ -57,23 +57,23 @@ public:
      * initialize button in CubeViewUI.
      */
 
-    void h_angle(float angle){hAng=angle;};
+    void h_angle(double angle){hAng=angle;}
 
     // the rotation about the horizontal (x ) axis.
-    float h_angle(){return hAng;};
+    double h_angle() const {return hAng;}
 
     /* Sets the x shift of the cube view camera.
      *
      * This function is called by the slider in CubeViewUI and the
      * initialize button in CubeViewUI.
      */
-    void panx(float x){xshift=x;};
+    void panx(double x){xshift=x;}
     /* Sets the y shift of the cube view camera.
      *
      * This function is called by the slider in CubeViewUI and the
      * initialize button in CubeViewUI.
      */
-    void pany(float y){yshift=y;};
+    void pany(double y){yshift=y;}
 
 #if HAVE_GL
     /*The widget class draw() override.
@@ -98,8 +98,8 @@ private:
     void drawCube() { }
 #endif /* HAVE_GL */
     
-    float vAng,hAng;
-    float xshift,yshift;
+    double vAng,hAng;
+    double xshift,yshift;
 
 
     float boxv0[3];float boxv1[3];
diff --git a/test/mandelbrot.cxx b/test/mandelbrot.cxx
index f9f2da6fb..50f048f54 100644
--- a/test/mandelbrot.cxx
+++ b/test/mandelbrot.cxx
@@ -45,7 +45,7 @@ static void print(Fl_Widget *o, void *data)
   uchar *image_data = fl_read_image(NULL, 0, 0, win->w(), win->h(), 0);
   if( printer.start_job(1) ) return;
   if( printer.start_page() ) return;
-  printer.scale(.7,.7);
+  printer.scale(.7f,.7f);
   fl_draw_image(image_data, 0,0, win->w(), win->h());
   printer.end_page();
   delete image_data;