Skip to content

Commit

Permalink
Fix small style issues for #258
Browse files Browse the repository at this point in the history
  • Loading branch information
jhasse committed Feb 8, 2017
1 parent e769c8e commit d0f3342
Showing 1 changed file with 14 additions and 11 deletions.
25 changes: 14 additions & 11 deletions plugins/layout/layout.cpp
Expand Up @@ -210,15 +210,18 @@ class WrapSizerComponent : public ComponentBase
public:
wxObject* Create(IObject *obj, wxObject * /*parent*/)
{
wxWrapSizer *sizer = new wxWrapSizer(obj->GetPropertyAsInteger(_("orient")));
const auto sizer = new wxWrapSizer(obj->GetPropertyAsInteger(_("orient")));
sizer->SetMinSize( obj->GetPropertyAsSize(_("minimum_size")) );
return sizer;
}

ticpp::Element* ExportToXrc(IObject *obj)
{
ObjectToXrcFilter xrc(obj, _("wxWrapSizer"));
if( obj->GetPropertyAsSize(_("minimum_size")) != wxDefaultSize ) xrc.AddProperty(_("minimum_size"), _("minsize"), XRC_TYPE_SIZE);
if (obj->GetPropertyAsSize(_("minimum_size")) != wxDefaultSize)
{
xrc.AddProperty(_("minimum_size"), _("minsize"), XRC_TYPE_SIZE);
}
xrc.AddProperty(_("orient"), _("orient"), XRC_TYPE_TEXT);
return xrc.GetXrcObject();
}
Expand All @@ -227,7 +230,7 @@ class WrapSizerComponent : public ComponentBase
{
XrcToXfbFilter filter(xrcObj, _("wxWrapSizer"));
filter.AddProperty(_("minsize"), _("minsize"), XRC_TYPE_SIZE);
filter.AddProperty(_("orient"),_("orient"),XRC_TYPE_TEXT);
filter.AddProperty(_("orient"), _("orient"), XRC_TYPE_TEXT);
return filter.GetXfbObject();
}
};
Expand All @@ -250,7 +253,7 @@ class StaticBoxSizerComponent : public ComponentBase
obj->GetPropertyAsInteger(_("orient")));

sizer->SetMinSize( obj->GetPropertyAsSize(_("minimum_size")) );

return sizer;
}

Expand Down Expand Up @@ -283,9 +286,9 @@ class GridSizerComponent : public ComponentBase
obj->GetPropertyAsInteger(_("cols")),
obj->GetPropertyAsInteger(_("vgap")),
obj->GetPropertyAsInteger(_("hgap")));

sizer->SetMinSize( obj->GetPropertyAsSize(_("minimum_size")) );

return sizer;
}

Expand Down Expand Up @@ -327,7 +330,7 @@ class FlexGridSizerBase : public ComponentBase

for (i=0; i < grows.GetCount() ; i++)
sizer->AddGrowableRow(grows[i]);

sizer->SetMinSize( obj->GetPropertyAsSize(_("minimum_size")) );
sizer->SetFlexibleDirection( obj->GetPropertyAsInteger(_("flexible_direction")) );
sizer->SetNonFlexibleGrowMode( (wxFlexSizerGrowMode )obj->GetPropertyAsInteger(_("non_flexible_grow_mode")) );
Expand Down Expand Up @@ -589,9 +592,9 @@ class StdDialogButtonSizerComponent : public ComponentBase
wxObject* Create(IObject *obj, wxObject *parent)
{
wxStdDialogButtonSizer* sizer = new wxStdDialogButtonSizer();

sizer->SetMinSize( obj->GetPropertyAsSize(_("minimum_size")) );

if ( obj->GetPropertyAsInteger( _("OK") ) )
{
sizer->AddButton( new wxButton( (wxWindow*)parent, wxID_OK ) );
Expand Down Expand Up @@ -624,7 +627,7 @@ class StdDialogButtonSizerComponent : public ComponentBase
{
sizer->AddButton( new wxButton( (wxWindow*)parent, wxID_CONTEXT_HELP ) );
}

sizer->Realize();
return sizer;
}
Expand All @@ -633,7 +636,7 @@ class StdDialogButtonSizerComponent : public ComponentBase
{
ObjectToXrcFilter xrc(obj, _("wxStdDialogButtonSizer"));
ticpp::Element* sizer = xrc.GetXrcObject();

if( obj->GetPropertyAsSize(_("minimum_size")) != wxDefaultSize )
{
xrc.AddProperty(_("minimum_size"), _("minsize"), XRC_TYPE_SIZE);
Expand Down

0 comments on commit d0f3342

Please sign in to comment.