Changeset 1048

Timestamp:

May 20, 2009, 3:26:18 PM (15 years ago)

Author:

garnier

Message:

test for VC++9.0

Location:

trunk/source/visualization/OpenGL/src

Files:

• G4OpenGLStoredWin32Viewer.cc (modified) (2 diffs)
• G4OpenGLWin32Viewer.cc (modified) (4 diffs)

trunk/source/visualization/OpenGL/src/G4OpenGLStoredWin32Viewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.21 2009/04/08 16:55:44 lgarnier Exp $
+// $Id: G4OpenGLStoredWin32Viewer.cc,v 1.22 2009/05/20 13:19:09 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -70 +70 @@
   //Win32 version needed
   //  glXMakeCurrent (dpy, win, cx);
-  glViewport (0, 0, fWinSize_x, fWinSize_y);
+  glViewport (0, 0, getWinWidth(), getWinHeight());
 
   G4ViewParameters::DrawingStyle style = GetViewParameters().GetDrawingStyle();

trunk/source/visualization/OpenGL/src/G4OpenGLWin32Viewer.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4OpenGLWin32Viewer.cc,v 1.18 2009/01/13 09:47:05 lgarnier Exp $
+// $Id: G4OpenGLWin32Viewer.cc,v 1.20 2009/05/20 13:19:09 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -37 +37 @@
 
 #include "G4OpenGLWin32Viewer.hh"
+#include "G4VViewer.hh"
+#include "G4VSceneHandler.hh"
+#include "G4OpenGLSceneHandler.hh"
 
 #include "G4ios.hh"
@@ -117 +120 @@
   }  
   
-  fWinSize_x = fVP.GetWindowSizeHintX();
-  fWinSize_y = fVP.GetWindowSizeHintY();
+  ResizeWindow(fVP.GetWindowSizeHintX(),fVP.GetWindowSizeHintY());
+
   int x_res=GetSystemMetrics(SM_CXSCREEN);
   int y_res=GetSystemMetrics(SM_CYSCREEN);
@@ -129 +132 @@
                            fVP.GetWindowAbsoluteLocationHintX(x_res),
                            fVP.GetWindowAbsoluteLocationHintY(y_res),
-                           fWinSize_x,fWinSize_y,
+                           getWinWidth(), getWinHeight(),
                            NULL, NULL, 
                            ::GetModuleHandle(NULL),