Menu
▾
▴
[Codelite-git] codelite git: codelite branch master updated. 26bdfe4b53d218513dcaffd530f914754a4738f6
|
From: David H. <no...@so...> - 2013-12-21 16:40:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 26bdfe4b53d218513dcaffd530f914754a4738f6 (commit)
from 78aa2841b779c1325707ec6003a4094e359df047 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/26bdfe4b53d218513dcaffd530f914754a4738f6
commit 26bdfe4b53d218513dcaffd530f914754a4738f6
Author: dghart <da...@4P...>
Date: Sat Dec 21 16:33:12 2013 +0000
Fixed assertions in the CodeFormatter options dialog
Three growable columns were being specified in single-column flexgridsizers. Also, imported the UI into wxCrafter.
diff --git a/CodeFormatter/codeforammaterbasedlg.cpp b/CodeFormatter/codeforammaterbasedlg.cpp
deleted file mode 100644
index c300165..0000000
--- a/CodeFormatter/codeforammaterbasedlg.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "codeforammaterbasedlg.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-CodeFormatterBaseDlg::CodeFormatterBaseDlg( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
- this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
-
- wxBoxSizer* bSizerMain;
- bSizerMain = new wxBoxSizer( wxVERTICAL );
-
- m_splitterSettingsPreview = new wxSplitterWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSP_3DSASH|wxSP_LIVE_UPDATE|wxSP_NO_XP_THEME );
- m_splitterSettingsPreview->SetSashGravity( 0.5 );
- m_splitterSettingsPreview->Connect( wxEVT_IDLE, wxIdleEventHandler( CodeFormatterBaseDlg::m_splitterSettingsPreviewOnIdle ), NULL, this );
-
- m_panelSettings = new wxPanel( m_splitterSettingsPreview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxBoxSizer* bSizerSettings;
- bSizerSettings = new wxBoxSizer( wxVERTICAL );
-
- m_notebookSettings = new wxNotebook( m_panelSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
- m_panelPredefinedStyles = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxBoxSizer* bSizerPredefinedStyles;
- bSizerPredefinedStyles = new wxBoxSizer( wxVERTICAL );
-
- wxStaticBoxSizer* bSizerPredefinedStylesText;
- bSizerPredefinedStylesText = new wxStaticBoxSizer( new wxStaticBox( m_panelPredefinedStyles, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
- m_staticText2 = new wxStaticText( m_panelPredefinedStyles, wxID_ANY, _("Choose one of the following predefined styles.\nYou may optionally override one or more of its settings from the next pages"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText2->Wrap( -1 );
- bSizerPredefinedStylesText->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );
-
- bSizerPredefinedStyles->Add( bSizerPredefinedStylesText, 0, wxEXPAND|wxALL, 5 );
-
- wxString m_radioBoxPredefinedStyleChoices[] = { _("GNU"), _("Java"), _("K&&R"), _("Linux"), _("ANSI") };
- int m_radioBoxPredefinedStyleNChoices = sizeof( m_radioBoxPredefinedStyleChoices ) / sizeof( wxString );
- m_radioBoxPredefinedStyle = new wxRadioBox( m_panelPredefinedStyles, wxID_ANY, _("Predefined Style:"), wxDefaultPosition, wxDefaultSize, m_radioBoxPredefinedStyleNChoices, m_radioBoxPredefinedStyleChoices, 1, wxRA_SPECIFY_COLS );
- m_radioBoxPredefinedStyle->SetSelection( 0 );
- bSizerPredefinedStyles->Add( m_radioBoxPredefinedStyle, 0, wxALL|wxEXPAND, 5 );
-
- wxStaticBoxSizer* sbPredefineHelpSizer;
- sbPredefineHelpSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelPredefinedStyles, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
- m_staticTextPredefineHelp = new wxStaticText( m_panelPredefinedStyles, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- m_staticTextPredefineHelp->Wrap( -1 );
- sbPredefineHelpSizer->Add( m_staticTextPredefineHelp, 1, wxALL|wxEXPAND, 5 );
-
- bSizerPredefinedStyles->Add( sbPredefineHelpSizer, 1, wxEXPAND|wxALL, 5 );
-
- m_panelPredefinedStyles->SetSizer( bSizerPredefinedStyles );
- m_panelPredefinedStyles->Layout();
- bSizerPredefinedStyles->Fit( m_panelPredefinedStyles );
- m_notebookSettings->AddPage( m_panelPredefinedStyles, _("Predefined Styles"), true );
- m_panelBrackets = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxBoxSizer* bBracketsSizer;
- bBracketsSizer = new wxBoxSizer( wxVERTICAL );
-
- wxString m_radioBoxBracketsChoices[] = { _("Break Closing"), _("Attach"), _("Linux"), _("Break"), _("None") };
- int m_radioBoxBracketsNChoices = sizeof( m_radioBoxBracketsChoices ) / sizeof( wxString );
- m_radioBoxBrackets = new wxRadioBox( m_panelBrackets, wxID_ANY, _("Brackets:"), wxDefaultPosition, wxDefaultSize, m_radioBoxBracketsNChoices, m_radioBoxBracketsChoices, 1, wxRA_SPECIFY_COLS );
- m_radioBoxBrackets->SetSelection( 3 );
- bBracketsSizer->Add( m_radioBoxBrackets, 0, wxALL|wxEXPAND, 5 );
-
- m_panelBrackets->SetSizer( bBracketsSizer );
- m_panelBrackets->Layout();
- bBracketsSizer->Fit( m_panelBrackets );
- m_notebookSettings->AddPage( m_panelBrackets, _("Brackets"), false );
- m_panelIndentation = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxStaticBoxSizer* sbIndentationSizer;
- sbIndentationSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelIndentation, wxID_ANY, _("Indentation:") ), wxVERTICAL );
-
- wxFlexGridSizer* fgIdentationSizer;
- fgIdentationSizer = new wxFlexGridSizer( 0, 1, 0, 0 );
- fgIdentationSizer->AddGrowableCol( 0 );
- fgIdentationSizer->AddGrowableCol( 1 );
- fgIdentationSizer->AddGrowableCol( 2 );
- fgIdentationSizer->SetFlexibleDirection( wxBOTH );
- fgIdentationSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
-
- m_checkBoxIndetClass = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Class"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndetClass, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndentBrackets = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Brackets"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndentBrackets, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndetSwitch = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Switches"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndetSwitch, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndentNamespaces = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Namespaces"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndentNamespaces, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndetCase = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Case"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndetCase, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndentLabels = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Labels"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndentLabels, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndetBlocks = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Blocks"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndetBlocks, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndentPreprocessors = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Preprocessors"), wxDefaultPosition, wxDefaultSize, 0 );
- m_checkBoxIndentPreprocessors->SetValue(true);
- fgIdentationSizer->Add( m_checkBoxIndentPreprocessors, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndentMaxInst = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Max Instatement Indent"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndentMaxInst, 0, wxALL|wxEXPAND, 5 );
-
- m_checkBoxIndentMinCond = new wxCheckBox( m_panelIndentation, wxID_ANY, _("Min Conditional Indent"), wxDefaultPosition, wxDefaultSize, 0 );
- fgIdentationSizer->Add( m_checkBoxIndentMinCond, 0, wxALL|wxEXPAND, 5 );
-
- sbIndentationSizer->Add( fgIdentationSizer, 1, wxEXPAND, 5 );
-
- m_panelIndentation->SetSizer( sbIndentationSizer );
- m_panelIndentation->Layout();
- sbIndentationSizer->Fit( m_panelIndentation );
- m_notebookSettings->AddPage( m_panelIndentation, _("Indentation"), false );
- m_panelFormatting = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxStaticBoxSizer* sbFormattingSizer;
- sbFormattingSizer = new wxStaticBoxSizer( new wxStaticBox( m_panelFormatting, wxID_ANY, _("Formatting Options:") ), wxVERTICAL );
-
- wxFlexGridSizer* fgFormattingSizer;
- fgFormattingSizer = new wxFlexGridSizer( 0, 1, 0, 0 );
- fgFormattingSizer->AddGrowableCol( 0 );
- fgFormattingSizer->AddGrowableCol( 1 );
- fgFormattingSizer->AddGrowableCol( 2 );
- fgFormattingSizer->SetFlexibleDirection( wxBOTH );
- fgFormattingSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
- m_checkBoxFormatBreakBlocks = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Break Blocks"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatBreakBlocks, 0, wxALL, 5 );
-
- m_checkBoxFormatPadParenth = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Pad Parenthesis"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatPadParenth, 0, wxALL, 5 );
-
- m_checkBoxFormatBreakBlocksAll = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Break Blocks All"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatBreakBlocksAll, 0, wxALL, 5 );
-
- m_checkBoxFormatPadParentOut = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Pad Parenthesis Outside"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatPadParentOut, 0, wxALL, 5 );
-
- m_checkBoxFormatBreakElseif = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Break else-if"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatBreakElseif, 0, wxALL, 5 );
-
- m_checkBoxFormatPadParentIn = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Pad Parenthesis Inside"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatPadParentIn, 0, wxALL, 5 );
-
- m_checkBoxFormatPadOperators = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Pad Operators"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatPadOperators, 0, wxALL, 5 );
-
- m_checkBoxFormatUnPadParent = new wxCheckBox( m_panelFormatting, wxID_ANY, _("UnPad Parenthesis"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatUnPadParent, 0, wxALL, 5 );
-
- m_checkBoxFormatOneLineKeepStmnt = new wxCheckBox( m_panelFormatting, wxID_ANY, _("One Line Keep Statement"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatOneLineKeepStmnt, 0, wxALL, 5 );
-
- m_checkBoxFormatFillEmptyLines = new wxCheckBox( m_panelFormatting, wxID_ANY, _("Fill Empty Lines"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatFillEmptyLines, 0, wxALL, 5 );
-
- m_checkBoxFormatOneLineKeepBlocks = new wxCheckBox( m_panelFormatting, wxID_ANY, _("One Line Keep Blocks"), wxDefaultPosition, wxDefaultSize, 0 );
- fgFormattingSizer->Add( m_checkBoxFormatOneLineKeepBlocks, 0, wxALL, 5 );
-
- sbFormattingSizer->Add( fgFormattingSizer, 1, wxEXPAND, 5 );
-
- m_panelFormatting->SetSizer( sbFormattingSizer );
- m_panelFormatting->Layout();
- sbFormattingSizer->Fit( m_panelFormatting );
- m_notebookSettings->AddPage( m_panelFormatting, _("Formatting"), false );
- m_panelCustomSettings = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxBoxSizer* bCustomSettingsSizer;
- bCustomSettingsSizer = new wxBoxSizer( wxVERTICAL );
-
- m_staticText3 = new wxStaticText( m_panelCustomSettings, wxID_ANY, _("Custom user settings:"), wxDefaultPosition, wxDefaultSize, 0 );
- m_staticText3->Wrap( -1 );
- bCustomSettingsSizer->Add( m_staticText3, 0, wxALL|wxEXPAND, 5 );
-
- m_textCtrlUserFlags = new wxTextCtrl( m_panelCustomSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB|wxTE_RICH2 );
- m_textCtrlUserFlags->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 76, 90, 90, false, wxEmptyString ) );
-
- bCustomSettingsSizer->Add( m_textCtrlUserFlags, 1, wxALL|wxEXPAND, 5 );
-
- m_panelCustomSettings->SetSizer( bCustomSettingsSizer );
- m_panelCustomSettings->Layout();
- bCustomSettingsSizer->Fit( m_panelCustomSettings );
- m_notebookSettings->AddPage( m_panelCustomSettings, _("Custom Settings"), false );
-
- bSizerSettings->Add( m_notebookSettings, 3, wxEXPAND | wxALL, 5 );
-
- m_panelSettings->SetSizer( bSizerSettings );
- m_panelSettings->Layout();
- bSizerSettings->Fit( m_panelSettings );
- m_panelPreview = new wxPanel( m_splitterSettingsPreview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxBoxSizer* bPreviewSizer;
- bPreviewSizer = new wxBoxSizer( wxHORIZONTAL );
-
- m_textCtrlPreview = new wxStyledTextCtrl( m_panelPreview, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxNO_BORDER, wxEmptyString );
- m_textCtrlPreview->SetUseTabs( true );
- m_textCtrlPreview->SetTabWidth( 4 );
- m_textCtrlPreview->SetIndent( 4 );
- m_textCtrlPreview->SetTabIndents( true );
- m_textCtrlPreview->SetBackSpaceUnIndents( true );
- m_textCtrlPreview->SetViewEOL( false );
- m_textCtrlPreview->SetViewWhiteSpace( false );
- m_textCtrlPreview->SetMarginWidth( 2, 0 );
- m_textCtrlPreview->SetIndentationGuides( true );
- m_textCtrlPreview->SetMarginWidth( 1, 0 );
- m_textCtrlPreview->SetMarginWidth( 0, 0 );
- m_textCtrlPreview->MarkerDefine( wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS );
- m_textCtrlPreview->MarkerSetBackground( wxSTC_MARKNUM_FOLDER, wxColour( wxT("BLACK") ) );
- m_textCtrlPreview->MarkerSetForeground( wxSTC_MARKNUM_FOLDER, wxColour( wxT("WHITE") ) );
- m_textCtrlPreview->MarkerDefine( wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS );
- m_textCtrlPreview->MarkerSetBackground( wxSTC_MARKNUM_FOLDEROPEN, wxColour( wxT("BLACK") ) );
- m_textCtrlPreview->MarkerSetForeground( wxSTC_MARKNUM_FOLDEROPEN, wxColour( wxT("WHITE") ) );
- m_textCtrlPreview->MarkerDefine( wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_EMPTY );
- m_textCtrlPreview->MarkerDefine( wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_BOXPLUS );
- m_textCtrlPreview->MarkerSetBackground( wxSTC_MARKNUM_FOLDEREND, wxColour( wxT("BLACK") ) );
- m_textCtrlPreview->MarkerSetForeground( wxSTC_MARKNUM_FOLDEREND, wxColour( wxT("WHITE") ) );
- m_textCtrlPreview->MarkerDefine( wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUS );
- m_textCtrlPreview->MarkerSetBackground( wxSTC_MARKNUM_FOLDEROPENMID, wxColour( wxT("BLACK") ) );
- m_textCtrlPreview->MarkerSetForeground( wxSTC_MARKNUM_FOLDEROPENMID, wxColour( wxT("WHITE") ) );
- m_textCtrlPreview->MarkerDefine( wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY );
- m_textCtrlPreview->MarkerDefine( wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY );
- m_textCtrlPreview->SetSelBackground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
- m_textCtrlPreview->SetSelForeground( true, wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
- m_textCtrlPreview->SetMinSize( wxSize( 300,-1 ) );
-
- bPreviewSizer->Add( m_textCtrlPreview, 1, wxEXPAND | wxALL, 5 );
-
- m_panelPreview->SetSizer( bPreviewSizer );
- m_panelPreview->Layout();
- bPreviewSizer->Fit( m_panelPreview );
- m_splitterSettingsPreview->SplitVertically( m_panelSettings, m_panelPreview, 450 );
- bSizerMain->Add( m_splitterSettingsPreview, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizerButtons;
- bSizerButtons = new wxBoxSizer( wxHORIZONTAL );
-
- m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
- m_buttonOK->SetDefault();
- bSizerButtons->Add( m_buttonOK, 0, wxALL, 5 );
-
- m_buttonClose = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizerButtons->Add( m_buttonClose, 0, wxALL, 5 );
-
- m_buttonHelp = new wxButton( this, wxID_ANY, _("&Help"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizerButtons->Add( m_buttonHelp, 0, wxALL, 5 );
-
- bSizerMain->Add( bSizerButtons, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
- this->SetSizer( bSizerMain );
- this->Layout();
-
- this->Centre( wxBOTH );
-
- // Connect Events
- m_radioBoxPredefinedStyle->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( CodeFormatterBaseDlg::OnRadioBoxPredefinedStyle ), NULL, this );
- m_radioBoxBrackets->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( CodeFormatterBaseDlg::OnRadioBoxBrackets ), NULL, this );
- m_checkBoxIndetClass->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentBrackets->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndetSwitch->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentNamespaces->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndetCase->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentLabels->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndetBlocks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentPreprocessors->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentMaxInst->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentMinCond->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatBreakBlocks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadParenth->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatBreakBlocksAll->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadParentOut->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatBreakElseif->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadParentIn->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadOperators->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatUnPadParent->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatOneLineKeepStmnt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatFillEmptyLines->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatOneLineKeepBlocks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
-}
-
-CodeFormatterBaseDlg::~CodeFormatterBaseDlg()
-{
- // Disconnect Events
- m_radioBoxPredefinedStyle->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( CodeFormatterBaseDlg::OnRadioBoxPredefinedStyle ), NULL, this );
- m_radioBoxBrackets->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( CodeFormatterBaseDlg::OnRadioBoxBrackets ), NULL, this );
- m_checkBoxIndetClass->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentBrackets->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndetSwitch->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentNamespaces->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndetCase->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentLabels->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndetBlocks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentPreprocessors->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentMaxInst->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxIndentMinCond->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatBreakBlocks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadParenth->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatBreakBlocksAll->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadParentOut->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatBreakElseif->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadParentIn->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatPadOperators->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatUnPadParent->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatOneLineKeepStmnt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatFillEmptyLines->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
- m_checkBoxFormatOneLineKeepBlocks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CodeFormatterBaseDlg::OnCheckBox ), NULL, this );
-
-}
diff --git a/CodeFormatter/codeforammaterbasedlg.h b/CodeFormatter/codeforammaterbasedlg.h
deleted file mode 100644
index f98dc85..0000000
--- a/CodeFormatter/codeforammaterbasedlg.h
+++ /dev/null
@@ -1,109 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 30 2011)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __CODEFORAMMATERBASEDLG_H__
-#define __CODEFORAMMATERBASEDLG_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
-#include <wx/radiobox.h>
-#include <wx/panel.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/checkbox.h>
-#include <wx/textctrl.h>
-#include <wx/notebook.h>
-#include <wx/stc/stc.h>
-#ifdef __VISUALC__
-#include <wx/link_additions.h>
-#endif //__VISUALC__
-#include <wx/splitter.h>
-#include <wx/button.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class CodeFormatterBaseDlg
-///////////////////////////////////////////////////////////////////////////////
-class CodeFormatterBaseDlg : public wxDialog
-{
- private:
-
- protected:
- wxSplitterWindow* m_splitterSettingsPreview;
- wxPanel* m_panelSettings;
- wxNotebook* m_notebookSettings;
- wxPanel* m_panelPredefinedStyles;
- wxStaticText* m_staticText2;
- wxRadioBox* m_radioBoxPredefinedStyle;
- wxStaticText* m_staticTextPredefineHelp;
- wxPanel* m_panelBrackets;
- wxRadioBox* m_radioBoxBrackets;
- wxPanel* m_panelIndentation;
- wxCheckBox* m_checkBoxIndetClass;
- wxCheckBox* m_checkBoxIndentBrackets;
- wxCheckBox* m_checkBoxIndetSwitch;
- wxCheckBox* m_checkBoxIndentNamespaces;
- wxCheckBox* m_checkBoxIndetCase;
- wxCheckBox* m_checkBoxIndentLabels;
- wxCheckBox* m_checkBoxIndetBlocks;
- wxCheckBox* m_checkBoxIndentPreprocessors;
- wxCheckBox* m_checkBoxIndentMaxInst;
- wxCheckBox* m_checkBoxIndentMinCond;
- wxPanel* m_panelFormatting;
- wxCheckBox* m_checkBoxFormatBreakBlocks;
- wxCheckBox* m_checkBoxFormatPadParenth;
- wxCheckBox* m_checkBoxFormatBreakBlocksAll;
- wxCheckBox* m_checkBoxFormatPadParentOut;
- wxCheckBox* m_checkBoxFormatBreakElseif;
- wxCheckBox* m_checkBoxFormatPadParentIn;
- wxCheckBox* m_checkBoxFormatPadOperators;
- wxCheckBox* m_checkBoxFormatUnPadParent;
- wxCheckBox* m_checkBoxFormatOneLineKeepStmnt;
- wxCheckBox* m_checkBoxFormatFillEmptyLines;
- wxCheckBox* m_checkBoxFormatOneLineKeepBlocks;
- wxPanel* m_panelCustomSettings;
- wxStaticText* m_staticText3;
- wxTextCtrl* m_textCtrlUserFlags;
- wxPanel* m_panelPreview;
- wxStyledTextCtrl* m_textCtrlPreview;
- wxButton* m_buttonOK;
- wxButton* m_buttonClose;
- wxButton* m_buttonHelp;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnRadioBoxPredefinedStyle( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnRadioBoxBrackets( wxCommandEvent& event ) { event.Skip(); }
- virtual void OnCheckBox( wxCommandEvent& event ) { event.Skip(); }
-
-
- public:
-
- CodeFormatterBaseDlg( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Formatter Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,600 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
- ~CodeFormatterBaseDlg();
-
- void m_splitterSettingsPreviewOnIdle( wxIdleEvent& )
- {
- m_splitterSettingsPreview->SetSashPosition( 450 );
- m_splitterSettingsPreview->Disconnect( wxEVT_IDLE, wxIdleEventHandler( CodeFormatterBaseDlg::m_splitterSettingsPreviewOnIdle ), NULL, this );
- }
-
-};
-
-#endif //__CODEFORAMMATERBASEDLG_H__
diff --git a/CodeFormatter/codeformatterdlg.h b/CodeFormatter/codeformatterdlg.h
index 85afd6c..f46f43e 100644
--- a/CodeFormatter/codeformatterdlg.h
+++ b/CodeFormatter/codeformatterdlg.h
@@ -25,17 +25,12 @@
#ifndef __codeformatterdlg__
#define __codeformatterdlg__
-/**
-@file
-Subclass of CodeFormatterBaseDlg, which is generated by wxFormBuilder.
-*/
-#include "codeforammaterbasedlg.h"
+#include "codeformatterdlgbase.h"
#include "formatoptions.h"
class CodeFormatter;
-/** Implementing CodeFormatterBaseDlg */
class CodeFormatterDlg : public CodeFormatterBaseDlg
{
FormatOptions m_options;
diff --git a/CodeFormatter/codeformatterdlg.wxcp b/CodeFormatter/codeformatterdlg.wxcp
new file mode 100644
index 0000000..e947849
--- /dev/null
+++ b/CodeFormatter/codeformatterdlg.wxcp
@@ -0,0 +1,3744 @@
+{
+ "metadata": {
+ "m_generatedFilesDir": ".",
+ "m_objCounter": 0,
+ "m_includeFiles": [],
+ "m_bitmapFunction": "wxCrafterGgLOZbInitBitmapResources",
+ "m_bitmapsFile": "codeformatterdlg_codeformatter_bitmaps.cpp",
+ "m_GenerateCodeTypes": -15439,
+ "m_outputFileName": "codeformatterdlgbase",
+ "m_firstWindowId": 1000,
+ "m_useEnum": false,
+ "m_templateClasses": []
+ },
+ "windows": [{
+ "m_type": 4421,
+ "proportion": 0,
+ "border": 0,
+ "gbSpan": ",",
+ "gbPosition": ",",
... 8023 lines suppressed ...
hooks/post-receive
--
codelite
|
