From: Jens Lody <fedora@jenslody.de>
Date: Tue, 14 Feb 2017 14:04:51 +0100
Subject: Backport of changes for astyle 2.06
diff -Nru a/src/plugins/astyle/astyleconfigdlg.cpp b/src/plugins/astyle/astyleconfigdlg.cpp
--- a/src/plugins/astyle/astyleconfigdlg.cpp 2016-01-23 17:43:22.000000000 +0100
+++ b/src/plugins/astyle/astyleconfigdlg.cpp 2017-02-14 13:23:37.904786473 +0100
@@ -245,6 +245,20 @@
XRCCTRL(*this, "rbGoogle", wxRadioButton)->SetValue(true);
break;
#undef AS_GOOGLE
+#define AS_MOZILLA "\
+int Foo(bool isBar)\n\
+{\n\
+ if (isBar) {\n\
+ bar();\n\
+ return 1;\n\
+ } else\n\
+ return 0;\n\
+}"
+ case aspsMozilla:
+ sample = _T(AS_MOZILLA);
+ XRCCTRL(*this, "rbMozilla", wxRadioButton)->SetValue(true);
+ break;
+#undef AS_MOZILLA
#define AS_PICO "\
int Foo(bool isBar)\n\
{ if (isBar)\n\
@@ -305,6 +319,8 @@
SetStyle(asps1TBS);
else if (event.GetId() == XRCID("rbGoogle"))
SetStyle(aspsGoogle);
+ else if (event.GetId() == XRCID("rbMozilla"))
+ SetStyle(aspsMozilla);
else if (event.GetId() == XRCID("rbPico"))
SetStyle(aspsPico);
else if (event.GetId() == XRCID("rbLisp"))
@@ -362,6 +378,7 @@
XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->SetValue(cfg->ReadBool(_T("/attach_inlines"), false));
XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/indentation"), 4));
+ XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->SetValue(cfg->ReadInt(_T("/continuation"), 0));
XRCCTRL(*this, "chkUseTab", wxCheckBox)->SetValue(cfg->ReadBool(_T("/use_tabs"), false));
XRCCTRL(*this, "chkForceUseTabs", wxCheckBox)->SetValue(cfg->ReadBool(_T("/force_tabs"), false));
XRCCTRL(*this, "chkIndentCase", wxCheckBox)->SetValue(cfg->ReadBool(_T("/indent_case"), false));
@@ -383,7 +400,8 @@
XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/add_one_line_brackets"), false));
XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->SetValue(cfg->ReadBool(_T("/remove_brackets"), false));
XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_blocks"), false));
- XRCCTRL(*this, "chkKeepComplex", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_complex"), false));
+ XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_headers"), false));
+ XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->SetValue(cfg->ReadBool(_T("/keep_statements"), false));
XRCCTRL(*this, "chkConvertTabs", wxCheckBox)->SetValue(cfg->ReadBool(_T("/convert_tabs"), false));
XRCCTRL(*this, "chkCloseTemplates", wxCheckBox)->SetValue(cfg->ReadBool(_T("/close_templates"), false));
XRCCTRL(*this, "chkRemoveCommentPrefix", wxCheckBox)->SetValue(cfg->ReadBool(_T("/remove_comment_prefix"), false));
@@ -392,17 +410,26 @@
XRCCTRL(*this, "chkBreakAfterLogical", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_after_mode"), false));
if (XRCCTRL(*this, "chkBreakLines", wxCheckBox)->GetValue())
+ {
XRCCTRL(*this, "txtMaxLineLength", wxTextCtrl)->Enable();
+ XRCCTRL(*this, "chkBreakAfterLogical", wxCheckBox)->Enable();
+ }
else
+ {
XRCCTRL(*this, "txtMaxLineLength", wxTextCtrl)->Disable();
+ XRCCTRL(*this, "chkBreakAfterLogical", wxCheckBox)->Disable();
+ }
+
XRCCTRL(*this, "chkBreakBlocks", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_blocks"), false));
XRCCTRL(*this, "chkBreakBlocksAll", wxCheckBox)->SetValue(cfg->ReadBool(_T("/break_blocks_all"), false));
XRCCTRL(*this, "chkPadOperators", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_operators"), false));
- XRCCTRL(*this, "chkPadParensOut", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_parentheses_out"), false));
- XRCCTRL(*this, "chkPadParensIn", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_parentheses_in"), false));
+ XRCCTRL(*this, "chkPadParenOut", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_parentheses_out"), false));
+ XRCCTRL(*this, "chkPadParenIn", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_parentheses_in"), false));
+ XRCCTRL(*this, "chkPadFirstParenOut", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_first_paren_out"), false));
XRCCTRL(*this, "chkPadHeader", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_header"), false));
XRCCTRL(*this, "chkUnpadParens", wxCheckBox)->SetValue(cfg->ReadBool(_T("/unpad_parentheses"), false));
+ XRCCTRL(*this, "chkPadComma", wxCheckBox)->SetValue(cfg->ReadBool(_T("/pad_comma"), false));
XRCCTRL(*this, "chkDelEmptyLine", wxCheckBox)->SetValue(cfg->ReadBool(_T("/delete_empty_lines"), false));
XRCCTRL(*this, "chkFillEmptyLines", wxCheckBox)->SetValue(cfg->ReadBool(_T("/fill_empty_lines"), false));
XRCCTRL(*this, "cmbPointerAlign", wxComboBox)->SetValue(cfg->Read(_T("/pointer_align"), _T("None")));
@@ -455,6 +482,7 @@
cfg->Write(_T("/attach_inlines"), XRCCTRL(*this, "chkAttachInlines", wxCheckBox)->GetValue());
cfg->Write(_T("/indentation"), XRCCTRL(*this, "spnIndentation", wxSpinCtrl)->GetValue());
+ cfg->Write(_T("/continuation"), XRCCTRL(*this, "spnContinuation", wxSpinCtrl)->GetValue());
cfg->Write(_T("/use_tabs"), XRCCTRL(*this, "chkUseTab", wxCheckBox)->GetValue());
cfg->Write(_T("/force_tabs"), XRCCTRL(*this, "chkForceUseTabs", wxCheckBox)->GetValue());
cfg->Write(_T("/indent_case"), XRCCTRL(*this, "chkIndentCase", wxCheckBox)->GetValue());
@@ -465,7 +493,7 @@
cfg->Write(_T("/indent_switches"), XRCCTRL(*this, "chkIndentSwitches", wxCheckBox)->GetValue());
cfg->Write(_T("/indent_preproc_block"), XRCCTRL(*this, "chkIndentPreprocBlock", wxCheckBox)->GetValue());
cfg->Write(_T("/indent_preproc_define"), XRCCTRL(*this, "chkIndentPreprocDefine", wxCheckBox)->GetValue());
- cfg->Write(_T("/indent_preprocessor_cond"), XRCCTRL(*this, "chkIndentPreprocCond", wxCheckBox)->GetValue());
+ cfg->Write(_T("/indent_preproc_cond"), XRCCTRL(*this, "chkIndentPreprocCond", wxCheckBox)->GetValue());
cfg->Write(_T("/indent_col1_comments"), XRCCTRL(*this, "chkIndentCol1Comments", wxCheckBox)->GetValue());
cfg->Write(_T("/min_conditional_indent"), XRCCTRL(*this, "spnMinConditionalEvent", wxSpinCtrl)->GetValue());
cfg->Write(_T("/max_instatement_indent"), XRCCTRL(*this, "txtMaxInStatementIndent",wxTextCtrl)->GetValue());
@@ -476,7 +504,8 @@
cfg->Write(_T("/add_one_line_brackets"), XRCCTRL(*this, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
cfg->Write(_T("/remove_brackets"), XRCCTRL(*this, "chkRemoveBrackets", wxCheckBox)->GetValue());
cfg->Write(_T("/keep_blocks"), XRCCTRL(*this, "chkKeepBlocks", wxCheckBox)->GetValue());
- cfg->Write(_T("/keep_complex"), XRCCTRL(*this, "chkKeepComplex", wxCheckBox)->GetValue());
+ cfg->Write(_T("/keep_headers"), XRCCTRL(*this, "chkKeepHeaders", wxCheckBox)->GetValue());
+ cfg->Write(_T("/keep_statements"), XRCCTRL(*this, "chkKeepStatements", wxCheckBox)->GetValue());
cfg->Write(_T("/convert_tabs"), XRCCTRL(*this, "chkConvertTabs", wxCheckBox)->GetValue());
cfg->Write(_T("/close_templates"), XRCCTRL(*this, "chkCloseTemplates", wxCheckBox)->GetValue());
cfg->Write(_T("/remove_comment_prefix"), XRCCTRL(*this, "chkRemoveCommentPrefix", wxCheckBox)->GetValue());
@@ -487,10 +516,12 @@
cfg->Write(_T("/break_blocks"), XRCCTRL(*this, "chkBreakBlocks", wxCheckBox)->GetValue());
cfg->Write(_T("/break_blocks_all"), XRCCTRL(*this, "chkBreakBlocksAll", wxCheckBox)->GetValue());
cfg->Write(_T("/pad_operators"), XRCCTRL(*this, "chkPadOperators", wxCheckBox)->GetValue());
- cfg->Write(_T("/pad_parentheses_out"), XRCCTRL(*this, "chkPadParensOut", wxCheckBox)->GetValue());
- cfg->Write(_T("/pad_parentheses_in"), XRCCTRL(*this, "chkPadParensIn", wxCheckBox)->GetValue());
+ cfg->Write(_T("/pad_parentheses_out"), XRCCTRL(*this, "chkPadParenOut", wxCheckBox)->GetValue());
+ cfg->Write(_T("/pad_parentheses_in"), XRCCTRL(*this, "chkPadParenIn", wxCheckBox)->GetValue());
+ cfg->Write(_T("/pad_first_paren_out"), XRCCTRL(*this, "chkPadFirstParenOut", wxCheckBox)->GetValue());
cfg->Write(_T("/pad_header"), XRCCTRL(*this, "chkPadHeader", wxCheckBox)->GetValue());
cfg->Write(_T("/unpad_parentheses"), XRCCTRL(*this, "chkUnpadParens", wxCheckBox)->GetValue());
+ cfg->Write(_T("/pad_comma"), XRCCTRL(*this, "chkPadComma", wxCheckBox)->GetValue());
cfg->Write(_T("/delete_empty_lines"), XRCCTRL(*this, "chkDelEmptyLine", wxCheckBox)->GetValue());
cfg->Write(_T("/fill_empty_lines"), XRCCTRL(*this, "chkFillEmptyLines", wxCheckBox)->GetValue());
cfg->Write(_T("/pointer_align"), XRCCTRL(*this, "cmbPointerAlign", wxComboBox)->GetValue());
diff -Nru a/src/plugins/astyle/astylepredefinedstyles.h b/src/plugins/astyle/astylepredefinedstyles.h
--- a/src/plugins/astyle/astylepredefinedstyles.h 2016-01-23 17:43:22.000000000 +0100
+++ b/src/plugins/astyle/astylepredefinedstyles.h 2017-02-14 13:24:27.029238200 +0100
@@ -20,6 +20,7 @@
aspsHorstmann,
asps1TBS,
aspsGoogle,
+ aspsMozilla,
aspsPico,
aspsLisp,
aspsCustom
diff -Nru a/src/plugins/astyle/dlgformattersettings.cpp b/src/plugins/astyle/dlgformattersettings.cpp
--- a/src/plugins/astyle/dlgformattersettings.cpp 2016-01-23 17:43:22.000000000 +0100
+++ b/src/plugins/astyle/dlgformattersettings.cpp 2017-02-14 13:24:58.326167038 +0100
@@ -51,6 +51,8 @@
formatter.setFormattingStyle(astyle::STYLE_1TBS);
else if (XRCCTRL(*m_dlg, "rbGoogle", wxRadioButton)->GetValue())
formatter.setFormattingStyle(astyle::STYLE_GOOGLE);
+ else if (XRCCTRL(*m_dlg, "rbMozilla", wxRadioButton)->GetValue())
+ formatter.setFormattingStyle(astyle::STYLE_MOZILLA);
else if (XRCCTRL(*m_dlg, "rbPico", wxRadioButton)->GetValue())
formatter.setFormattingStyle(astyle::STYLE_PICO);
else if (XRCCTRL(*m_dlg, "rbLisp", wxRadioButton)->GetValue())
@@ -63,12 +65,15 @@
bool value = XRCCTRL(*m_dlg, "chkForceUseTabs", wxCheckBox)->GetValue();
int spaceNum = XRCCTRL(*m_dlg, "spnIndentation", wxSpinCtrl)->GetValue();
-
if (XRCCTRL(*m_dlg, "chkUseTab", wxCheckBox)->GetValue())
formatter.setTabIndentation(spaceNum, value);
else
formatter.setSpaceIndentation(spaceNum);
+ int contNum = XRCCTRL(*m_dlg, "spnContinuation", wxSpinCtrl)->GetValue();
+ if (contNum>0 && contNum<=4)
+ formatter.setContinuationIndentation(contNum);
+
formatter.setCaseIndent(XRCCTRL(*m_dlg, "chkIndentCase", wxCheckBox)->GetValue());
formatter.setClassIndent(XRCCTRL(*m_dlg, "chkIndentClasses", wxCheckBox)->GetValue());
formatter.setLabelIndent(XRCCTRL(*m_dlg, "chkIndentLabels", wxCheckBox)->GetValue());
@@ -89,7 +94,8 @@
formatter.setAddOneLineBracketsMode(XRCCTRL(*m_dlg, "chkAddOneLineBrackets", wxCheckBox)->GetValue());
formatter.setRemoveBracketsMode(XRCCTRL(*m_dlg, "chkRemoveBrackets", wxCheckBox)->GetValue());
formatter.setBreakOneLineBlocksMode(!XRCCTRL(*m_dlg, "chkKeepBlocks", wxCheckBox)->GetValue());
- formatter.setSingleStatementsMode(!XRCCTRL(*m_dlg, "chkKeepComplex", wxCheckBox)->GetValue());
+ formatter.setBreakOneLineHeadersMode(!XRCCTRL(*m_dlg, "chkKeepHeaders", wxCheckBox)->GetValue());
+ formatter.setBreakOneLineStatementsMode(!XRCCTRL(*m_dlg, "chkKeepStatements", wxCheckBox)->GetValue());
formatter.setTabSpaceConversionMode(XRCCTRL(*m_dlg, "chkConvertTabs", wxCheckBox)->GetValue());
formatter.setCloseTemplatesMode(XRCCTRL(*m_dlg, "chkCloseTemplates", wxCheckBox)->GetValue());
formatter.setStripCommentPrefix(XRCCTRL(*m_dlg, "chkRemoveCommentPrefix", wxCheckBox)->GetValue());
@@ -105,10 +111,12 @@
formatter.setBreakBlocksMode(XRCCTRL(*m_dlg, "chkBreakBlocks", wxCheckBox)->GetValue());
formatter.setBreakClosingHeaderBlocksMode(XRCCTRL(*m_dlg, "chkBreakBlocksAll", wxCheckBox)->GetValue());
formatter.setOperatorPaddingMode(XRCCTRL(*m_dlg, "chkPadOperators", wxCheckBox)->GetValue());
- formatter.setParensOutsidePaddingMode(XRCCTRL(*m_dlg, "chkPadParensOut", wxCheckBox)->GetValue());
- formatter.setParensInsidePaddingMode(XRCCTRL(*m_dlg, "chkPadParensIn", wxCheckBox)->GetValue());
+ formatter.setParensOutsidePaddingMode(XRCCTRL(*m_dlg, "chkPadParenOut", wxCheckBox)->GetValue());
+ formatter.setParensInsidePaddingMode(XRCCTRL(*m_dlg, "chkPadParenIn", wxCheckBox)->GetValue());
+ formatter.setParensFirstPaddingMode(XRCCTRL(*m_dlg, "chkPadFirstParenOut", wxCheckBox)->GetValue());
formatter.setParensHeaderPaddingMode(XRCCTRL(*m_dlg, "chkPadHeader", wxCheckBox)->GetValue());
formatter.setParensUnPaddingMode(XRCCTRL(*m_dlg, "chkUnpadParens", wxCheckBox)->GetValue());
+ formatter.setCommaPaddingMode(XRCCTRL(*m_dlg, "chkPadComma", wxCheckBox)->GetValue());
formatter.setDeleteEmptyLinesMode(XRCCTRL(*m_dlg, "chkDelEmptyLine", wxCheckBox)->GetValue());
formatter.setEmptyLineFill(XRCCTRL(*m_dlg, "chkFillEmptyLines", wxCheckBox)->GetValue());
diff -Nru a/src/plugins/astyle/formattersettings.cpp b/src/plugins/astyle/formattersettings.cpp
--- a/src/plugins/astyle/formattersettings.cpp 2016-01-23 17:43:22.000000000 +0100
+++ b/src/plugins/astyle/formattersettings.cpp 2017-02-14 13:25:30.889815288 +0100
@@ -78,6 +78,10 @@
formatter.setFormattingStyle(astyle::STYLE_GOOGLE);
break;
+ case aspsMozilla: // Mozilla
+ formatter.setFormattingStyle(astyle::STYLE_MOZILLA);
+ break;
+
case aspsPico: // Pico
formatter.setFormattingStyle(astyle::STYLE_PICO);
break;
@@ -102,6 +106,10 @@
else
formatter.setSpaceIndentation(spaceNum);
+ int contNum = cfg->ReadInt(_T("/continuation"), 0);
+ if (contNum>0 && contNum<=4)
+ formatter.setContinuationIndentation(contNum);
+
formatter.setCaseIndent(cfg->ReadBool(_T("/indent_case")));
formatter.setClassIndent(cfg->ReadBool(_T("/indent_classes")));
formatter.setLabelIndent(cfg->ReadBool(_T("/indent_labels")));
@@ -121,7 +129,8 @@
formatter.setAddOneLineBracketsMode(cfg->ReadBool(_T("/add_one_line_brackets")));
formatter.setRemoveBracketsMode(cfg->ReadBool(_T("/remove_brackets")));
formatter.setBreakOneLineBlocksMode(!cfg->ReadBool(_T("/keep_blocks")));
- formatter.setSingleStatementsMode(!cfg->ReadBool(_T("/keep_complex")));
+ formatter.setBreakOneLineHeadersMode(!cfg->ReadBool(_T("/keep_headers")));
+ formatter.setBreakOneLineStatementsMode(!cfg->ReadBool(_T("/keep_statements")));
formatter.setTabSpaceConversionMode(cfg->ReadBool(_T("/convert_tabs")));
formatter.setCloseTemplatesMode(cfg->ReadBool(_T("/close_templates")));
formatter.setStripCommentPrefix(cfg->ReadBool(_T("/remove_comment_prefix")));
@@ -139,8 +148,10 @@
formatter.setOperatorPaddingMode(cfg->ReadBool(_T("/pad_operators")));
formatter.setParensOutsidePaddingMode(cfg->ReadBool(_T("/pad_parentheses_out")));
formatter.setParensInsidePaddingMode(cfg->ReadBool(_T("/pad_parentheses_in")));
+ formatter.setParensFirstPaddingMode(cfg->ReadBool(_T("/pad_first_paren_out")));
formatter.setParensHeaderPaddingMode(cfg->ReadBool(_T("/pad_header")));
formatter.setParensUnPaddingMode(cfg->ReadBool(_T("/unpad_parentheses")));
+ formatter.setCommaPaddingMode(cfg->ReadBool(_T("/pad_comma")));
formatter.setDeleteEmptyLinesMode(cfg->ReadBool(_T("/delete_empty_lines")));
formatter.setEmptyLineFill(cfg->ReadBool(_T("/fill_empty_lines")));
diff -Nru a/src/plugins/astyle/resources/configuration.xrc b/src/plugins/astyle/resources/configuration.xrc
--- a/src/plugins/astyle/resources/configuration.xrc 2016-01-23 17:43:22.000000000 +0100
+++ b/src/plugins/astyle/resources/configuration.xrc 2017-02-14 13:22:06.261061943 +0100
@@ -109,6 +109,13 @@
<border>5</border>
</object>
<object class="sizeritem">
+ <object class="wxRadioButton" name="rbMozilla">
+ <label>Mozilla</label>
+ </object>
+ <flag>wxTOP|wxLEFT|wxRIGHT|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
<object class="wxRadioButton" name="rbPico">
<label>Pico</label>
<tooltip>Pico style uses run-in brackets and attached closing brackets. Opening brackets are broken and allow run-in statements. The closing bracket is attached to the last line in the block. Switches are indented to allow a run-in to the opening switch block. The style implies keep-one-line-blocks and keep-one-line-statements. If add-brackets is used they will be added as one-line brackets. This style frequently is used with an indent of 2 spaces.</tooltip>
@@ -257,8 +264,29 @@
<border>5</border>
</object>
<object class="sizeritem">
+ <object class="wxBoxSizer">
+ <object class="sizeritem">
+ <object class="wxStaticText" name="ID_STATICTEXT7">
+ <label>Continuation indent for line ending with '(' or assignment '='</label>
+ </object>
+ <flag>wxALIGN_CENTER_VERTICAL</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxSpinCtrl" name="spnContinuation">
+ <value>0</value>
+ <max>4</max>
+ </object>
+ <flag>wxLEFT|wxALIGN_CENTER_VERTICAL</flag>
+ <border>5</border>
+ </object>
+ </object>
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
<object class="wxCheckBox" name="chkIndentCase">
- <label>Indent case: statement in switches (commands under case:)</label>
+ <label>Indent case statement in switches (commands under case:)</label>
</object>
<flag>wxTOP|wxALIGN_LEFT</flag>
<border>5</border>
@@ -413,7 +441,7 @@
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="chkRemoveBrackets">
- <label>Remove brackets from conditional statements (ingle statement on a single line)</label>
+ <label>Remove brackets from conditional statements (single statement on a single line)</label>
</object>
<flag>wxTOP|wxALIGN_LEFT</flag>
<border>5</border>
@@ -426,8 +454,15 @@
<border>5</border>
</object>
<object class="sizeritem">
- <object class="wxCheckBox" name="chkKeepComplex">
- <label>Don't break complex statements and multiple statements residing in a single line</label>
+ <object class="wxCheckBox" name="chkKeepHeaders">
+ <label>Break one-line headers</label>
+ </object>
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="chkKeepStatements">
+ <label>Break one-line statements</label>
</object>
<flag>wxTOP|wxALIGN_LEFT</flag>
<border>5</border>
@@ -529,15 +564,22 @@
<border>5</border>
</object>
<object class="sizeritem">
- <object class="wxCheckBox" name="chkPadParensOut">
- <label>Insert space padding around parenthesies on the outside</label>
+ <object class="wxCheckBox" name="chkPadParenOut">
+ <label>Insert space padding around parentheses on the outside</label>
+ </object>
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="chkPadParenIn">
+ <label>Insert space padding around parentheses on the inside</label>
</object>
<flag>wxTOP|wxALIGN_LEFT</flag>
<border>5</border>
</object>
<object class="sizeritem">
- <object class="wxCheckBox" name="chkPadParensIn">
- <label>Insert space padding around parenthesies on the inside</label>
+ <object class="wxCheckBox" name="chkPadFirstParenOut">
+ <label>Insert space padding around the first paren in a series on the outside only</label>
</object>
<flag>wxTOP|wxALIGN_LEFT</flag>
<border>5</border>
@@ -551,7 +593,14 @@
</object>
<object class="sizeritem">
<object class="wxCheckBox" name="chkUnpadParens">
- <label>Remove extra space padding around parenthesis</label>
+ <label>Remove extra space padding around parentheses</label>
+ </object>
+ <flag>wxTOP|wxALIGN_LEFT</flag>
+ <border>5</border>
+ </object>
+ <object class="sizeritem">
+ <object class="wxCheckBox" name="chkPadComma">
+ <label>Insert space padding after commas (not needed if pad-operators is used)</label>
</object>
<flag>wxTOP|wxALIGN_LEFT</flag>
<border>5</border>