mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow custom pushbutton subclasses to set images via builder

Browse Source 
Change-Id: I639120393fec6fc0c5aa58cbefffe511742383f9
This commit is contained in:
Caolán McNamara
2013-05-02 16:23:10 +01:00
parent b701650c92
commit 201f5fb636
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/source/window/builder.cxx
View File

@@ -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())