]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
rnc: fix error introduced by my merge operation
authorgdd <gdd>
Tue, 8 Nov 2011 14:01:51 +0000 (14:01 +0000)
committergdd <gdd>
Tue, 8 Nov 2011 14:01:51 +0000 (14:01 +0000)
src/OCCViewer/OCCViewer_ViewPort3d.cxx
src/OCCViewer/OCCViewer_ViewPort3d.h

index 7419c10a720e86961bb2e1749561becbe4d1115d..7c4cda7e43c87ba762d51892712a4ee6f2f2bb12 100755 (executable)
 #include <V3d_PerspectiveView.hxx>
 #include <V3d_OrthographicView.hxx>
 
-#include <InterfaceGraphic_Visual3d.hxx>
-#include <OpenGl_cmn_varargs.h>
-#include <OpenGl_tsm_ws.h>
-
 #include "utilities.h"
 
 #if defined WNT
index 985126bb4346af997a81ebe0b2d7c06001b7a9a7..ea977007bdc1446c85cf7b42022ef52edda9d8a9 100755 (executable)
@@ -65,8 +65,6 @@ public:
 
   virtual void          updateStaticTriedronVisibility();
 
-  virtual void          updateStaticTriedronVisibility();
-
 //   void         setActive( V3d_TypeOfView );
   virtual bool          syncronize( const OCCViewer_ViewPort3d* );