From 81a2800c0d73fbcf1749c5845e3f3bef51b2cb8e Mon Sep 17 00:00:00 2001
From: kgv <kgv@opencascade.com>
Date: Tue, 19 Dec 2017 14:00:10 +0300
Subject: [PATCH] 0029393: Samples - AndroidQt sample build fail

AndroidQt - dropped removed arguments within V3d_View::SetWindow() usage [0024776].
AndroidQt_Window - add missing NativeFBConfig() method declared in the interface [0026732].
---
 samples/qt/AndroidQt/AndroidQt.cxx      |  6 +++---
 samples/qt/AndroidQt/AndroidQt_Window.h | 11 +++--------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/samples/qt/AndroidQt/AndroidQt.cxx b/samples/qt/AndroidQt/AndroidQt.cxx
index 5b9aae375b..70026c13ca 100644
--- a/samples/qt/AndroidQt/AndroidQt.cxx
+++ b/samples/qt/AndroidQt/AndroidQt.cxx
@@ -170,7 +170,7 @@ void AndroidQt::sync()
       //myView->MustBeResized(); // can be used instead of SetWindow() when EGLsurface has not been changed
 
       EGLContext anEglContext = eglGetCurrentContext();
-      myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext, NULL, NULL);
+      myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext);
     }
   }
 }
@@ -247,7 +247,7 @@ bool AndroidQt::initViewer()
     }
 
     aWindow->SetSize (aWidth, aHeight);
-    myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext, NULL, NULL);
+    myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext);
   }
 
   Handle(OpenGl_GraphicDriver) aDriver = new OpenGl_GraphicDriver (NULL, Standard_False);
@@ -273,7 +273,7 @@ bool AndroidQt::initViewer()
   Handle(AndroidQt_Window) aWindow = new AndroidQt_Window (aWidth, aHeight);
   myView = myViewer->CreateView();
 
-  myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext, NULL, NULL);
+  myView->SetWindow (aWindow, (Aspect_RenderingContext )anEglContext);
   myView->TriedronDisplay (Aspect_TOTP_RIGHT_LOWER, Quantity_NOC_WHITE, 0.08, V3d_ZBUFFER);
 
   return true;
diff --git a/samples/qt/AndroidQt/AndroidQt_Window.h b/samples/qt/AndroidQt/AndroidQt_Window.h
index e2d9001d08..f0a0c0ec63 100644
--- a/samples/qt/AndroidQt/AndroidQt_Window.h
+++ b/samples/qt/AndroidQt/AndroidQt_Window.h
@@ -20,7 +20,7 @@
 //! The main functionality is viewport dimensions.
 class AndroidQt_Window : public Aspect_Window
 {
-
+  DEFINE_STANDARD_RTTIEXT(AndroidQt_Window, Aspect_Window)
 public:
 
   //! Creates a wrapper over existing Window handle
@@ -34,7 +34,8 @@ public:
   //! Returns parent of native Window handle.
   virtual Aspect_Drawable NativeParentHandle() const { return 0; }
 
-  virtual void Destroy() {}
+  //! Returns native Window FB config (GLXFBConfig on Xlib)
+  virtual Aspect_FBConfig NativeFBConfig() const { return 0; }
 
   //! Opens the window <me>
   virtual void Map() const {}
@@ -84,12 +85,6 @@ private:
   int myY1;
   int myY2;
 
-public:
-
-  DEFINE_STANDARD_RTTIEXT(AndroidQt_Window,Aspect_Window)
-
 };
 
-DEFINE_STANDARD_HANDLE(AndroidQt_Window, Aspect_Window)
-
 #endif // ANDROIDQT_WINDOW_H