OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0022590: Migration to FreeImage - revision of Xw and WNT packages

Browse Source 
Clean up Xw package from outdated and unused functionality
Adjusting test case for current state of master
This commit is contained in:
kgv
2013-04-17 16:36:16 +04:00
parent b659a6dc19
commit ed97f43c0c
168 changed files with 445 additions and 32731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ViewerTest/ViewerTest_Tool.cxx
View File

@@ -59,7 +59,6 @@
#else
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <Xw_WindowQuality.hxx>
#include <Xw_Window.hxx>
#endif
@@ -96,8 +95,7 @@ Handle(V3d_Viewer) ViewerTest_Tool::MakeViewer (const Standard_CString theTitle)
#elif defined(__APPLE__) && !defined(MACOSX_USE_GLX)
Handle(Aspect_Window) window = new Cocoa_Window (theTitle, 0, 460, 409, 409);
#else
Handle(Aspect_Window) window = new Xw_Window (GetDisplayConnection(), theTitle,
0, 460, 409, 409, Quantity_NOC_BLACK);
Handle(Aspect_Window) window = new Xw_Window (GetDisplayConnection(), theTitle, 0, 460, 409, 409);
#endif
window->SetVirtual (Draw_VirtualWindows);
window->Map();
@@ -122,7 +120,7 @@ Handle(V3d_Viewer) ViewerTest_Tool::MakeViewer (const Standard_CString theTitle)
//=======================================================================
//function : MakeContext
//purpose :
//purpose :
//=======================================================================
Handle(AIS_InteractiveContext) ViewerTest_Tool::MakeContext (const Standard_CString title)
@@ -134,7 +132,7 @@ Handle(AIS_InteractiveContext) ViewerTest_Tool::MakeContext (const Standard_CSt
//=======================================================================
//function : InitViewerTest
//purpose :
//purpose :
//=======================================================================
// ********* next method is defined in ViewerTest_ViewerCommands.hxx ****
@@ -142,7 +140,7 @@ extern void ViewerTest_InitViewerTest (const Handle(AIS_InteractiveContext)&);
// **********************************************************************
void ViewerTest_Tool::InitViewerTest (const Handle(AIS_InteractiveContext)& context)
{
{
ViewerTest_InitViewerTest (context);
}
}

4
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@@ -88,7 +88,6 @@
#include <Cocoa_Window.hxx>
#include <tk.h>
#else
#include <Xw_WindowQuality.hxx>
#include <Xw_Window.hxx>
#include <X11/Xlib.h> /* contains some dangerous #defines such as Status, True etc. */
#include <X11/Xutil.h>
@@ -247,8 +246,7 @@ void ViewerTest::ViewerInit (const Standard_Integer thePxLeft, const Standard_I
VT_GetWindow() = new Xw_Window (aDisplayConnection,
"Test3d",
aPxLeft, aPxTop,
aPxWidth, aPxHeight,
Quantity_NOC_BLACK);
aPxWidth, aPxHeight);
}
#endif
VT_GetWindow()->SetVirtual (Draw_VirtualWindows);