X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fnavigation-frame%2Fpage-impl.cpp;h=ea7d40568a6deadd8a2da07fb2dc4d4993291e2e;hp=0b15d129ce59a5673799f26b856e4e9feefcc9e7;hb=680c5587a1478717393d3a03cf6a17801edd00e0;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp index 0b15d12..ea7d405 100644 --- a/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp +++ b/optional/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp @@ -1,24 +1,26 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // CLASS HEADER #include "page-impl.h" // EXTERNAL INCLUDES +#include // INTERNAL INCLUDES @@ -44,7 +46,7 @@ TypeRegistration mType( typeid(Toolkit::Page), typeid(CustomActor), Create ); } // unnamed namespace Page::Page() -: ControlImpl(false), +: Control( CONTROL_BEHAVIOUR_NONE ), mTitle(""), mSubTitle("") {