summaryrefslogtreecommitdiff
path: root/cui/source/dialogs/iconcdlg.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-06-23 16:16:45 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-06-24 10:05:23 +0100
commit35ec23fa290c877153cbf832526fa4d051a6981d (patch)
tree84114d4a4889c8028a70ac2bdc0866bdc8e2113c /cui/source/dialogs/iconcdlg.cxx
parentea3fc1dd4a208823488867491cfff66072678a38 (diff)
rename and rework SetCtrlPos to SetCtrlStyle
Change-Id: I5720f5f27ea5e7e9eefb6bfb53c30a52146c689e
Diffstat (limited to 'cui/source/dialogs/iconcdlg.cxx')
-rw-r--r--cui/source/dialogs/iconcdlg.cxx15
1 files changed, 4 insertions, 11 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index adc34ce3ee1b..a66bf09b730b 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -223,8 +223,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID,
get(m_pIconCtrl, "icon_control");
get(m_pTabContainer, "tab");
- m_pIconCtrl->SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN );
- SetCtrlPos();
+ SetCtrlStyle();
m_pIconCtrl->SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
m_pIconCtrl->Show();
m_pIconCtrl->SetChoiceWithCursor ( true );
@@ -249,11 +248,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const OString& rID,
m_pCancelBtn->Show();
m_pHelpBtn->Show();
m_pResetBtn->Show();
-
- m_pIconCtrl->ArrangeIcons();
}
-
IconChoiceDialog ::~IconChoiceDialog ()
{
// save configuration at INI-Manager
@@ -352,13 +348,10 @@ void IconChoiceDialog::Paint( const Rectangle& rRect )
}
}
-void IconChoiceDialog::SetCtrlPos()
+void IconChoiceDialog::SetCtrlStyle()
{
- WinBits aWinBits = m_pIconCtrl->GetStyle ();
- aWinBits &= ~WB_ALIGN_TOP & ~WB_NOVSCROLL;
- aWinBits |= WB_ALIGN_LEFT | WB_NOHSCROLL;
- m_pIconCtrl->SetStyle ( aWinBits );
-
+ WinBits aWinBits = WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN | WB_ALIGN_LEFT | WB_NOHSCROLL;
+ m_pIconCtrl->SetStyle(aWinBits);
m_pIconCtrl->ArrangeIcons();
}