X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fgl-view%2Fgl-view-impl.h;h=306a53bccf25bb17a67fe0a45c633be1b4c852bd;hp=2dcb0b127447ce29b4d820d17bf37edc075f46d9;hb=refs%2Fchanges%2F13%2F273213%2F11;hpb=a0f89cffaeee6f6f92a3c3aba029547a7870493a

diff --git a/dali-toolkit/internal/controls/gl-view/gl-view-impl.h b/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
index 2dcb0b1..306a53b 100644
--- a/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
+++ b/dali-toolkit/internal/controls/gl-view/gl-view-impl.h
@@ -27,18 +27,18 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/gl-view/gl-view-render-thread.h>
+#include <dali-toolkit/internal/controls/gl-view/gl-view-interface-impl.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/gl-view/gl-view.h>
 
-namespace Dali
-{
-namespace Toolkit
+
+namespace Dali::Toolkit
 {
 class GlView;
 
 namespace Internal
 {
-class GlView : public Dali::Toolkit::Internal::Control
+class GlView : public Dali::Toolkit::Internal::GlViewImpl
 {
 protected:
   virtual ~GlView();
@@ -57,32 +57,32 @@ public:
   /**
    * @copydoc Dali::Toolkit::GlView::RegisterGlCallbacks()
    */
-  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback);
+  void RegisterGlCallbacks(CallbackBase* initCallback, CallbackBase* renderFrameCallback, CallbackBase* terminateCallback) override;
 
   /**
    * @copydoc Dali::Toolkit::GlView::SetResizeCallback()
    */
-  void SetResizeCallback(CallbackBase* resizeCallback);
+  void SetResizeCallback(CallbackBase* resizeCallback) override;
 
   /**
-   * @copydoc Dali::Toolkit::GlView::SetGraphisConfig()
+   * @copydoc Dali::Toolkit::GlView::SetGraphicsConfig()
    */
-  bool SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::Toolkit::GlView::GraphicsApiVersion version);
+  bool SetGraphicsConfig(bool depth, bool stencil, int msaa, Dali::Toolkit::GlView::GraphicsApiVersion version) override;
 
   /**
    * @copydoc Dali::Toolkit::GlView::SetRenderingMode()
    */
-  void SetRenderingMode(Dali::Toolkit::GlView::RenderingMode mode);
+  void SetRenderingMode(Dali::Toolkit::GlView::RenderingMode mode) override;
 
   /**
    * @copydoc Dali::Toolkit::GlView::GetRenderingMode()
    */
-  Dali::Toolkit::GlView::RenderingMode GetRenderingMode() const;
+  Dali::Toolkit::GlView::RenderingMode GetRenderingMode() const override;
 
   /**
    * @copydoc Dali::Toolkit::GlView::RenderOnce()
    */
-  void RenderOnce();
+  void RenderOnce() override;
 
 private: // From Control
   /**
@@ -155,22 +155,6 @@ private:
 
 } // namespace Internal
 
-inline Dali::Toolkit::Internal::GlView& GetImpl(Dali::Toolkit::GlView& handle)
-{
-  DALI_ASSERT_ALWAYS(handle);
-  Dali::RefObject& impl = handle.GetImplementation();
-  return static_cast<Dali::Toolkit::Internal::GlView&>(impl);
-}
-
-inline const Dali::Toolkit::Internal::GlView& GetImpl(const Dali::Toolkit::GlView& handle)
-{
-  DALI_ASSERT_ALWAYS(handle);
-  const Dali::RefObject& impl = handle.GetImplementation();
-  return static_cast<const Dali::Toolkit::Internal::GlView&>(impl);
-}
-
-} // namespace Toolkit
-
 } // namespace Dali
 
 #endif // DALI_TOOLKIT_INTERNAL_GL_VIEW_H