show the resize cursor when the mouse is above the grip and not only when it's just...

[wxWidgets.git] / samples / opengl / penguin / lw.cpp

diff --git a/samples/opengl/penguin/lw.cpp b/samples/opengl/penguin/lw.cpp
index e7bfe17843c42d5078ed2b6ee2c0737b57d03ef1..487359bbba208bf5da91161e98deb3b6d29f7ebd 100644 (file)
--- a/samples/opengl/penguin/lw.cpp
+++ b/samples/opengl/penguin/lw.cpp
@@ -20,14 +20,22 @@
 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+#include "wx/wx.h"
+#endif
+

 #include "lw.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 
 #include "lw.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 

-#define wxInt32 int
-#define wxUint32 unsigned int
-

 #ifndef FALSE
 #define FALSE 0
 #endif
 #ifndef FALSE
 #define FALSE 0
 #endif


@@ -57,12 +65,23 @@ static wxInt32 read_char(FILE *f)
 
 static wxInt32 read_short(FILE *f)
 {
 
 static wxInt32 read_short(FILE *f)
 {

-  return (read_char(f)<<8) | read_char(f);
+    // the execution path was not always correct
+    // when using the direct evaluation in the return statement
+    wxInt32 first = read_char(f) ;
+    wxInt32 second = read_char(f) ;
+    
+  return (first<<8) | second ;

 }
 
 static wxInt32 read_long(FILE *f)
 {
 }
 
 static wxInt32 read_long(FILE *f)
 {

-  return (read_char(f)<<24) | (read_char(f)<<16) | (read_char(f)<<8) | read_char(f);
+    // the execution path was not always correct
+    // when using the direct evaluation in the return statement
+    wxInt32 first = read_char(f) ;
+    wxInt32 second = read_char(f) ;
+    wxInt32 third = read_char(f) ;
+    wxInt32 fourth = read_char(f) ;
+  return (first<<24) | (second<<16) | (third<<8) | fourth ;

 }
 
 static GLfloat read_float(FILE *f)
 }
 
 static GLfloat read_float(FILE *f)


@@ -109,9 +128,9 @@ static void read_srfs(FILE *f, int nbytes, lwObject *lwo)
     nbytes -= read_string(f,material->name);
 
     /* defaults */
     nbytes -= read_string(f,material->name);
 
     /* defaults */

-    material->r = 0.7;
-    material->g = 0.7;
-    material->b = 0.7;
+    material->r = 0.7f;
+    material->g = 0.7f;
+    material->b = 0.7f;

   }
   lwo->material = (lwMaterial*) realloc(lwo->material, sizeof(lwMaterial)*lwo->material_cnt);
 }
   }
   lwo->material = (lwMaterial*) realloc(lwo->material, sizeof(lwMaterial)*lwo->material_cnt);
 }