diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 19:08:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 10:44:08 +0000 |
| commit | 8c00536d87010b14a95e9c81f2f5f1d683e5fa70 (patch) | |
| tree | 92ac779cef9c4f5adb1421f8eee51a301dc8ef61 /vcl/source/window/layout.cxx | |
| parent | ChartDumpTest: Avoid using Arial font in test documents (diff) | |
| download | core-8c00536d87010b14a95e9c81f2f5f1d683e5fa70.tar.gz core-8c00536d87010b14a95e9c81f2f5f1d683e5fa70.zip | |
Convert WindowType to scoped enum
Change-Id: I85cfe02f28729e13f2c0dd3d91cd89e6f3e3b6a9
Reviewed-on: https://gerrit.libreoffice.org/34219
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/window/layout.cxx')
| -rw-r--r-- | vcl/source/window/layout.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 77dbf1990dc4..785ec06f13bb 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -25,7 +25,7 @@ #include <svids.hrc> VclContainer::VclContainer(vcl::Window *pParent, WinBits nStyle) - : Window(WINDOW_CONTAINER) + : Window(WindowType::CONTAINER) , IPrioritable() , m_bLayoutDirty(true) { @@ -1825,7 +1825,7 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window *pParent) , m_pHScroll(VclPtr<ScrollBar>::Create(this, WB_HIDE | WB_HORZ)) , m_aScrollBarBox(VclPtr<ScrollBarBox>::Create(this, WB_HIDE)) { - SetType(WINDOW_SCROLLWINDOW); + SetType(WindowType::SCROLLWINDOW); Link<ScrollBar*,void> aLink( LINK( this, VclScrolledWindow, ScrollBarHdl ) ); m_pVScroll->SetScrollHdl(aLink); @@ -2185,7 +2185,7 @@ MessageDialog::MessageDialog(vcl::Window* pParent, WinBits nStyle) , m_pPrimaryMessage(nullptr) , m_pSecondaryMessage(nullptr) { - SetType(WINDOW_MESSBOX); + SetType(WindowType::MESSBOX); } MessageDialog::MessageDialog(vcl::Window* pParent, @@ -2201,12 +2201,12 @@ MessageDialog::MessageDialog(vcl::Window* pParent, , m_pSecondaryMessage(nullptr) , m_sPrimaryString(rMessage) { - SetType(WINDOW_MESSBOX); + SetType(WindowType::MESSBOX); create_owned_areas(); } MessageDialog::MessageDialog(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription) - : Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WINDOW_MESSBOX) + : Dialog(pParent, OStringToOUString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription, WindowType::MESSBOX) , m_eButtonsType(VclButtonsType::NONE) , m_eMessageType(VclMessageType::Info) , m_pOwnedContentArea(nullptr) @@ -2267,7 +2267,7 @@ void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) { switch (pChild->GetType()) { - case WINDOW_PUSHBUTTON: + case WindowType::PUSHBUTTON: { PushButton* pButton = static_cast<PushButton*>(pChild); pButton->SetClickHdl(LINK(this, MessageDialog, ButtonHdl)); @@ -2275,13 +2275,13 @@ void MessageDialog::setButtonHandlers(VclButtonBox *pButtonBox) } //insist that the response ids match the default actions for those //widgets, and leave their default handlers in place - case WINDOW_OKBUTTON: + case WindowType::OKBUTTON: assert(get_response(pChild) == RET_OK); break; - case WINDOW_CANCELBUTTON: + case WindowType::CANCELBUTTON: assert(get_response(pChild) == RET_CANCEL); break; - case WINDOW_HELPBUTTON: + case WindowType::HELPBUTTON: assert(get_response(pChild) == RET_HELP); break; default: |