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%2Fnavigation-title-bar.h;h=c8200ed6701a82a641d15a03a6d1b1e5ddcf2ced;hp=35cdfd3c763e7a4e00649c2696da3fb51b5357e8;hb=5ff76a127dce1541de4f27d29db5e019d80363e0;hpb=e2eda444afbe82e9591fe198eef339227f90a616 diff --git a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h index 35cdfd3..c8200ed 100644 --- a/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h +++ b/dali-toolkit/internal/controls/navigation-frame/navigation-title-bar.h @@ -1,28 +1,29 @@ #ifndef __DALI_TOOLKIT_INTERNAL_NAVIGATION_TITLE_BAR_H__ #define __DALI_TOOLKIT_INTERNAL_NAVIGATION_TITLE_BAR_H__ -// -// 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. -// - -#include +/* + * 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. + * + */ + +// INTERNAL INCLUDES +#include #include -#include +#include #include #include -#include namespace Dali { @@ -80,8 +81,8 @@ private: Toolkit::TableView mTitleLayout; Toolkit::TableView mTitleIconLayout; - Toolkit::TextView mTitle; - Toolkit::TextView mSubTitle; + Toolkit::TextLabel mTitle; + Toolkit::TextLabel mSubTitle; };