summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-08 08:05:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-09-08 13:43:25 +0100
commitfbc634d448000089376cf5fbde4413093ea9ed2d (patch)
treec81e2608fe27032e8a901b20f1491aa482a42760
parentae2efbf125052fad12ecb799ba45992c8ff56c2e (diff)
make this ctor of MessageDialog for the builder only
Change-Id: Ic92f6e46164bdb2e15a0a23876fce5be10a73324
-rw-r--r--include/vcl/layout.hxx4
-rw-r--r--vcl/source/window/layout.cxx1
2 files changed, 3 insertions, 2 deletions
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 6c4ce283d12d..cddac9ed8e87 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -719,6 +719,9 @@ private:
void setButtonHandlers(VclButtonBox *pButtonBox);
short get_response(const Window *pWindow) const;
void create_owned_areas();
+
+ friend class VclBuilder;
+ MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE);
public:
MessageDialog(Window* pParent,
@@ -726,7 +729,6 @@ public:
VclMessageType eMessageType = VCL_MESSAGE_ERROR,
VclButtonsType eButtonsType = VCL_BUTTONS_OK,
WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE);
- MessageDialog(Window* pParent, WinBits nStyle = WB_MOVEABLE | WB_3DLOOK | WB_CLOSEABLE);
MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription);
virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
virtual short Execute() SAL_OVERRIDE;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 3c7132789a22..fb9903456b32 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1946,7 +1946,6 @@ MessageDialog::MessageDialog(Window* pParent, WinBits nStyle)
, m_pSecondaryMessage(NULL)
{
SetType(WINDOW_MESSBOX);
- create_owned_areas();
}
MessageDialog::MessageDialog(Window* pParent,