vcl/source/window/builder.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 201f5fb6367a67cd39fa8e4396f5f86589db6be0 Author: Caolán McNamara <caol...@redhat.com> Date: Thu May 2 16:23:10 2013 +0100 allow custom pushbutton subclasses to set images via builder Change-Id: I639120393fec6fc0c5aa58cbefffe511742383f9 diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 2f3b364..362786a 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -937,6 +937,8 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri if (bIsPlaceHolder || name == "GtkTreeSelection") return NULL; + extractButtonImage(id, rMap, name == "GtkRadioButton"); + Window *pWindow = NULL; if (name == "GtkDialog") { @@ -986,7 +988,6 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri pWindow = new VclAlignment(pParent); else if (name == "GtkButton") { - extractButtonImage(id, rMap, false); OString sMenu = extractCustomProperty(rMap); if (sMenu.isEmpty()) pWindow = extractStockAndBuildPushButton(pParent, rMap); @@ -999,7 +1000,6 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri else if (name == "GtkRadioButton") { extractGroup(id, rMap); - extractButtonImage(id, rMap, true); WinBits nBits = WB_CENTER|WB_VCENTER|WB_3DLOOK; OString sWrap = extractCustomProperty(rMap); if (!sWrap.isEmpty())
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits