Change-Id: I2cd7e2990bdb9a1a674ddc3ff3cafa41d12f213f
*/
EventHandler( Window* window )
: mWindow( window ),
*/
EventHandler( Window* window )
: mWindow( window ),
+ mWindowPropertyHandler( NULL ),
+ mClientMessageHandler( NULL ),
{
ecore_event_handler_del( mWindowPropertyHandler );
}
{
ecore_event_handler_del( mWindowPropertyHandler );
}
- if ( mClientMessagehandler )
+ if ( mClientMessageHandler )
- ecore_event_handler_del( mClientMessagehandler );
+ ecore_event_handler_del( mClientMessageHandler );
// Data
Window* mWindow;
Ecore_Event_Handler* mWindowPropertyHandler;
// Data
Window* mWindow;
Ecore_Event_Handler* mWindowPropertyHandler;
- Ecore_Event_Handler* mClientMessagehandler;
+ Ecore_Event_Handler* mClientMessageHandler;
Ecore_Wl_Window* mEcoreWindow;
};
Ecore_Wl_Window* mEcoreWindow;
};
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
+#include <ecore-wl-types.h>
#include <trigger-event.h>
#include <gl/egl-implementation.h>
#include <base/display-connection.h>
#include <trigger-event.h>
#include <gl/egl-implementation.h>
#include <base/display-connection.h>
const std::string& name,
bool isTransparent)
: EcoreWlRenderSurface( positionSize, surface, name, isTransparent ),
const std::string& name,
bool isTransparent)
: EcoreWlRenderSurface( positionSize, surface, name, isTransparent ),
- mNeedToApproveDeiconify(false)
+ mEglWindow( NULL ),
+ mNeedToApproveDeiconify( false )
{
DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
Init( surface );
{
DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
Init( surface );
WindowRenderSurface::~WindowRenderSurface()
{
WindowRenderSurface::~WindowRenderSurface()
{
+ if( mEglWindow != NULL )
+ {
+ wl_egl_window_destroy(mEglWindow);
+ mEglWindow = NULL;
+ }
+
if( mOwnSurface )
{
ecore_wl_window_free( mWlWindow );
if( mOwnSurface )
{
ecore_wl_window_free( mWlWindow );
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( eglIf );
eglImpl.DestroySurface();
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( eglIf );
eglImpl.DestroySurface();
- wl_egl_window_destroy(mEglWindow);
- mEglWindow = NULL;
+
+ if( mEglWindow != NULL )
+ {
+ wl_egl_window_destroy(mEglWindow);
+ mEglWindow = NULL;
+ }
}
bool WindowRenderSurface::ReplaceEGLSurface( EglInterface& egl )
}
bool WindowRenderSurface::ReplaceEGLSurface( EglInterface& egl )