X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fnavigation-frame%2Fpage-impl.cpp;h=615f3a62fe729af863832459931f32a190cd9382;hp=0b15d129ce59a5673799f26b856e4e9feefcc9e7;hb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;hpb=e2eda444afbe82e9591fe198eef339227f90a616 diff --git a/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp b/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp index 0b15d12..615f3a6 100644 --- a/dali-toolkit/internal/controls/navigation-frame/page-impl.cpp +++ b/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,9 +46,11 @@ TypeRegistration mType( typeid(Toolkit::Page), typeid(CustomActor), Create ); } // unnamed namespace Page::Page() -: ControlImpl(false), +: Control( CONTROL_BEHAVIOUR_NONE ), mTitle(""), - mSubTitle("") + mSubTitle(""), + mPropertyTitle(Property::INVALID_INDEX), + mPropertySubTitle(Property::INVALID_INDEX) { }