Merge branch 'master' into pu/font

Origin commit data
------------------
Commit: 8c0c273de0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
This commit is contained in:
vanhofen
2017-01-29 21:42:58 +01:00
12 changed files with 124 additions and 45 deletions

View File

@@ -157,7 +157,7 @@ void CComponentsWindow::initVarWindow( const int& x_pos, const int& y_pos, const
ccw_col_head = COL_MENUHEAD_PLUS_0;
ccw_col_head_text = COL_MENUHEAD_TEXT;
ccw_col_footer = COL_MENUFOOT_PLUS_0;
cc_parent = NULL;
page_scroll_mode = PG_SCROLL_M_OFF; //permanent disabled here, only in body used!
initCCWItems();

View File

@@ -50,6 +50,7 @@ CComponentsItem::CComponentsItem(CComponentsForm* parent)
cc_item_selected = false;
cc_page_number = 0;
cc_has_focus = true;
cc_parent = NULL;
initParent(parent);
}