0026734: Visualization, D3DHost_View - drop outdated UserDraw interfaces

Correction of test case for issue CR26765

diff --git a/src/D3DHost/D3DHost_View.cxx b/src/D3DHost/D3DHost_View.cxx
index e499b4539c079c5dd3dcb9c72e0674be162e9c7a..02a096d960f8f3bfc872dd79d7863c988f91f85d 100644 (file)
--- a/src/D3DHost/D3DHost_View.cxx
+++ b/src/D3DHost/D3DHost_View.cxx
@@ -93,9 +93,7 @@ D3DHost_View::~D3DHost_View()
 // purpose  :
 // =======================================================================
 void D3DHost_View::SetWindow (const Handle(Aspect_Window)& theWindow,
-                              const Aspect_RenderingContext theContext,
-                              const Aspect_GraphicCallbackProc& theDisplayCB,
-                              const Standard_Address theClientData)
+                              const Aspect_RenderingContext theContext)
 {
   if (!myD3dWglFbo.IsNull())
   {
@@ -108,7 +106,7 @@ void D3DHost_View::SetWindow (const Handle(Aspect_Window)& theWindow,
     myD3dDevice = NULL;
   }
 
-  OpenGl_View::SetWindow (theWindow, theContext, theDisplayCB, theClientData);
+  OpenGl_View::SetWindow (theWindow, theContext);
 
   if (!myWindow.IsNull())
   {

diff --git a/src/D3DHost/D3DHost_View.hxx b/src/D3DHost/D3DHost_View.hxx
index 1c2d4cf78b3189484b5836253d8ee29b3ce64eef..c37c578b6f39347eda99a0dd59a2d6f38377e01b 100644 (file)
--- a/src/D3DHost/D3DHost_View.hxx
+++ b/src/D3DHost/D3DHost_View.hxx
@@ -46,10 +46,8 @@ public:
   //! @param theDisplayCB [in] the display callback function. If is not a NULL value, then the callback will be
   //! invoked at the end of the OCC graphic traversal and just before the swap of buffers.
   //! @param theClientData [in] the client data for the callback.
-  Standard_EXPORT virtual void SetWindow (const Handle(Aspect_Window)& theWindow,
-                                          const Aspect_RenderingContext theContext,
-                                          const Aspect_GraphicCallbackProc& theDisplayCB,
-                                          const Standard_Address theClientData) Standard_OVERRIDE;
+  Standard_EXPORT virtual void SetWindow (const Handle(Aspect_Window)&  theWindow,
+                                          const Aspect_RenderingContext theContext) Standard_OVERRIDE;
 
   //! Resizes the window.
   Standard_EXPORT virtual void Resized() Standard_OVERRIDE;

diff --git a/tests/boolean/volumemaker/C9 b/tests/boolean/volumemaker/C9
index 8276bb005f1d64f9b6502b2d9bc84497e2da530d..24fdc7656bafc97f874c275e7d0313a9c693dd70 100644 (file)
--- a/tests/boolean/volumemaker/C9
+++ b/tests/boolean/volumemaker/C9
@@ -2,7 +2,6 @@
 # cylinder plane unstable
 
 puts "TODO OCC26020 Linux: Error: bopcheck failed"
-puts "TODO OCC26020 Linux: Error : The area of the resulting shape is"
 
 # planar face 
 plane pln_f1 0 -875 -1.4432899320127035e-014 0 1 1.1102230246251565e-016