X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Fwayland%2Fwindow-impl-wl.cpp;h=c3811f5b0abcc80b1c77b76dbfda842d9a53eb60;hb=18e20762d22e38c4e6ddffa9cfd53e1b14ce3c2c;hp=1cef07a86c5f6fdc343d9c1ce309b6476e938e78;hpb=8ea473596fb94e381acbefc656a9026fcd9e2350;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp index 1cef07a..c3811f5 100644 --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -63,15 +63,10 @@ struct Window::EventHandler */ EventHandler( Window* window ) : mWindow( window ), + mWindowPropertyHandler( NULL ), + mClientMessagehandler( NULL ), mEcoreWindow( 0 ) { - // store ecore window handle - ECore::WindowRenderSurface* wlWindow( dynamic_cast< ECore::WindowRenderSurface * >( mWindow->mSurface ) ); - if( wlWindow ) - { - mEcoreWindow = wlWindow->GetWlWindow(); - } - DALI_ASSERT_ALWAYS( mEcoreWindow != 0 && "There is no ecore wl window"); } /** @@ -111,11 +106,11 @@ struct Window::EventHandler }; -Window* Window::New(const PositionSize& posSize, const std::string& name, bool isTransparent) +Window* Window::New(const PositionSize& posSize, const std::string& name, const std::string& className, bool isTransparent) { Window* window = new Window(); window->mIsTransparent = isTransparent; - window->Initialize(posSize, name); + window->Initialize(posSize, name, className); return window; } @@ -221,11 +216,12 @@ Window::~Window() delete mSurface; } -void Window::Initialize(const PositionSize& windowPosition, const std::string& name) +void Window::Initialize(const PositionSize& windowPosition, const std::string& name, const std::string& className) { // create an Wayland window by default Any surface; ECore::WindowRenderSurface* windowSurface = new ECore::WindowRenderSurface( windowPosition, surface, name, mIsTransparent ); + SetClass( name, className ); windowSurface->Map(); mSurface = windowSurface;