From: <gua...@us...> - 2012-03-06 12:25:24
|
Revision: 1931 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1931&view=rev Author: guanlisheng Date: 2012-03-06 11:25:05 +0000 (Tue, 06 Mar 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/budgetentrydialog.cpp trunk/mmex/src/budgetyeardialog.cpp trunk/mmex/src/budgetyearentrydialog.cpp trunk/mmex/src/categdialog.cpp trunk/mmex/src/currencydialog.cpp trunk/mmex/src/customreportdialog.cpp trunk/mmex/src/filtertransdialog.cpp trunk/mmex/src/maincurrencydialog.cpp trunk/mmex/src/mmhelppanel.cpp trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/budgetentrydialog.cpp =================================================================== --- trunk/mmex/src/budgetentrydialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/budgetentrydialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -123,16 +123,14 @@ void mmBudgetEntryDialog::CreateControls() { - mmBudgetEntryDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); - wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, wxT("")); // ,_("Budget Entry Details")); + wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(this, wxID_ANY, wxT("")); // ,_("Budget Entry Details")); wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxVERTICAL); itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxTOP|wxRIGHT, 10); - wxPanel* itemPanel7 = new wxPanel(itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* itemPanel7 = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemStaticBoxSizer4->Add(itemPanel7, 0, wxGROW|wxALL, 10); wxFlexGridSizer* itemGridSizer2 = new wxFlexGridSizer(4, 2, 10, 10); @@ -214,11 +212,11 @@ wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton7 = new wxButton( itemDialog1, + wxButton* itemButton7 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer9->Add(itemButton7, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton8 = new wxButton( itemDialog1, wxID_CANCEL, + wxButton* itemButton8 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer9->Add(itemButton8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); } Modified: trunk/mmex/src/budgetyeardialog.cpp =================================================================== --- trunk/mmex/src/budgetyeardialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/budgetyeardialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -90,32 +90,30 @@ void mmBudgetYearDialog::CreateControls() { - mmBudgetYearDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW|wxALL, 5); - listBox_ = new wxListBox( itemDialog1, ID_DIALOG_BUDGETYEAR_LISTBOX_BUDGETYEARS , + listBox_ = new wxListBox( this, ID_DIALOG_BUDGETYEAR_LISTBOX_BUDGETYEARS , wxDefaultPosition, wxSize(100, 200)); itemBoxSizer3->Add(listBox_, 1, wxGROW|wxALL, 1); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 1, wxGROW|wxALL, 5); - wxButton* itemButton7 = new wxButton( itemDialog1, ID_DIALOG_BUDGETYEAR_BUTTON_ADD, + wxButton* itemButton7 = new wxButton( this, ID_DIALOG_BUDGETYEAR_BUTTON_ADD, _("&Add Year"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL); itemButton7->SetToolTip(_("Add a new budget year")); - wxButton* itemBudgetMonth = new wxButton( itemDialog1, ID_DIALOG_BUDGETYEAR_BUTTON_ADD_MONTH, + wxButton* itemBudgetMonth = new wxButton( this, ID_DIALOG_BUDGETYEAR_BUTTON_ADD_MONTH, _("&Add Month"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemBudgetMonth, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5); itemBudgetMonth->SetToolTip(_("Add a new budget month")); - wxButton* itemButtonDelete = new wxButton( itemDialog1, ID_DIALOG_BUDGETYEAR_BUTTON_DELETE, + wxButton* itemButtonDelete = new wxButton( this, ID_DIALOG_BUDGETYEAR_BUTTON_DELETE, _("&Delete"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButtonDelete, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5); itemButtonDelete->SetToolTip(_("Delete existing budget")); @@ -123,7 +121,7 @@ wxStaticLine* line = new wxStaticLine ( this, wxID_STATIC, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); itemBoxSizer2->Add(line, 0, wxGROW|wxALL, 5); - wxPanel* itemPanel25 = new wxPanel( itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* itemPanel25 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemBoxSizer2->Add(itemPanel25, 0, wxALIGN_RIGHT, 5); wxBoxSizer* itemButtonSizer = new wxBoxSizer(wxHORIZONTAL); Modified: trunk/mmex/src/budgetyearentrydialog.cpp =================================================================== --- trunk/mmex/src/budgetyearentrydialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/budgetyearentrydialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -63,40 +63,38 @@ void mmBudgetYearEntryDialog::CreateControls() { - mmBudgetYearEntryDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); wxFlexGridSizer* itemGridSizer2 = new wxFlexGridSizer(2, 2, 0, 0); itemBoxSizer2->Add(itemGridSizer2, 0, wxALL, 5); - wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Budget Year:")); + wxStaticText* itemStaticText3 = new wxStaticText( this, wxID_STATIC, _("Budget Year:")); itemGridSizer2->Add(itemStaticText3, 0, wxALIGN_LEFT |wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxDateTime today(wxDateTime::Now()); int year = today.GetYear(); - textYear_ = new wxSpinCtrl( itemDialog1, ID_DIALOG_BUDGETYEARENTRY_TEXTCTRL_YEAR, + textYear_ = new wxSpinCtrl( this, ID_DIALOG_BUDGETYEARENTRY_TEXTCTRL_YEAR, wxEmptyString, wxDefaultPosition, wxSize(100,-1), wxSP_ARROW_KEYS, 1900, 3000, year); textYear_->SetToolTip(_("Specify the required year.\nUse Spin buttons to increase or decrease the year.")); itemGridSizer2->Add(textYear_, 0, wxALIGN_LEFT |wxALIGN_CENTER_VERTICAL|wxALL, 5); if (withMonth_) { - wxStaticText* itemStaticTextMonth = new wxStaticText( itemDialog1, + wxStaticText* itemStaticTextMonth = new wxStaticText( this, wxID_STATIC, _("Budget Month:"), wxDefaultPosition, wxDefaultSize, 0 ); itemGridSizer2->Add(itemStaticTextMonth, 0, wxALIGN_LEFT |wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); int month = today.GetMonth() + 1; // we require months(1..12) - textMonth_ = new wxSpinCtrl( itemDialog1, ID_DIALOG_BUDGETYEARENTRY_TEXTCTRL_MONTH, + textMonth_ = new wxSpinCtrl( this, ID_DIALOG_BUDGETYEARENTRY_TEXTCTRL_MONTH, wxEmptyString, wxDefaultPosition, wxSize(textYear_->GetSize()), wxSP_ARROW_KEYS, 1, 12, month); textMonth_->SetToolTip(_("Specify the required month.\nUse Spin buttons to increase or decrease the month.")); itemGridSizer2->Add(textMonth_, 0, wxALIGN_LEFT |wxALIGN_CENTER_VERTICAL|wxALL, 5); } - wxStaticText* itemStaticText51 = new wxStaticText( itemDialog1, wxID_STATIC, _("Base Budget On:"), + wxStaticText* itemStaticText51 = new wxStaticText( this, wxID_STATIC, _("Base Budget On:"), wxDefaultPosition, wxDefaultSize, 0 ); itemGridSizer2->Add(itemStaticText51, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); @@ -104,7 +102,7 @@ wxArrayString itemYearStrings; itemYearStrings.Add(wxT("None")); - itemChoice_ = new wxChoice( itemDialog1, ID_DIALOG_BUDGETYEARENTRY_COMBO_YEARS, + itemChoice_ = new wxChoice( this, ID_DIALOG_BUDGETYEARENTRY_COMBO_YEARS, wxDefaultPosition, wxSize(textYear_->GetSize()), itemYearStrings ); itemGridSizer2->Add(itemChoice_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); itemChoice_->SetToolTip(_("Specify year to base budget on.")); @@ -129,10 +127,10 @@ wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButtonOK = new wxButton( itemDialog1, wxID_OK, _("OK") ); + wxButton* itemButtonOK = new wxButton( this, wxID_OK, _("OK") ); itemBoxSizer9->Add(itemButtonOK, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButtonCancel = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel") ); + wxButton* itemButtonCancel = new wxButton( this, wxID_CANCEL, _("Cancel") ); itemBoxSizer9->Add(itemButtonCancel, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); } Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/categdialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -128,26 +128,24 @@ void mmCategDialog::CreateControls() { - mmCategDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); #if defined (__WXGTK__) || defined (__WXMAC__) - treeCtrl_ = new wxTreeCtrl( itemDialog1, ID_DIALOG_CATEG_TREECTRL_CATS, + treeCtrl_ = new wxTreeCtrl( this, ID_DIALOG_CATEG_TREECTRL_CATS, wxDefaultPosition, wxSize(200, 380)); #else - treeCtrl_ = new wxTreeCtrl( itemDialog1, ID_DIALOG_CATEG_TREECTRL_CATS, + treeCtrl_ = new wxTreeCtrl( this, ID_DIALOG_CATEG_TREECTRL_CATS, wxDefaultPosition, wxSize(200, 380), wxTR_SINGLE | wxTR_HAS_BUTTONS | wxTR_ROW_LINES ); #endif itemBoxSizer3->Add(treeCtrl_, 1, wxGROW|wxALL, 1); - wxTextCtrl* itemTextCtrl6 = new wxTextCtrl( itemDialog1, + wxTextCtrl* itemTextCtrl6 = new wxTextCtrl( this, ID_DIALOG_CATEG_TEXTCTRL_CATNAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer2->Add(itemTextCtrl6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 1); itemTextCtrl6->SetToolTip(_("Enter the name of the category to add or edit here")); @@ -155,17 +153,17 @@ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); - wxButton* itemButton7 = new wxButton( itemDialog1, wxID_ADD, + wxButton* itemButton7 = new wxButton( this, wxID_ADD, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton7->SetToolTip(_("Add a new category")); - wxButton* itemButton71 = new wxButton( itemDialog1, wxID_EDIT, + wxButton* itemButton71 = new wxButton( this, wxID_EDIT, _("&Edit"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButton71, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton71->SetToolTip(_("Edit the name of an existing category")); - wxButton* itemButton8 = new wxButton( itemDialog1, wxID_REMOVE, + wxButton* itemButton8 = new wxButton( this, wxID_REMOVE, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButton8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton8->SetToolTip(_("Delete an existing category. The category cannot be used by existing transactions.")); @@ -173,13 +171,13 @@ wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW|wxALL, 5); - wxButton* itemButton11 = new wxButton( itemDialog1, wxID_OK, + wxButton* itemButton11 = new wxButton( this, wxID_OK, _("&Select"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer9->Add(itemButton11, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton11->SetToolTip(_("Select the currently selected category as the selected category for the transaction")); //Some interfaces has no any close buttons, it may confuse user. Cancel button added - wxButton* itemCancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel")); + wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL, _("&Cancel")); itemBoxSizer9->Add(itemCancelButton); } Modified: trunk/mmex/src/currencydialog.cpp =================================================================== --- trunk/mmex/src/currencydialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/currencydialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -152,31 +152,29 @@ void mmCurrencyDialog::CreateControls() { - mmCurrencyDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(2, 2, 0, 0); itemFlexGridSizer3->AddGrowableCol(1); itemBoxSizer2->Add(itemFlexGridSizer3, 0, wxALL, 5); //-------------------------- - wxStaticText* itemStaticText4 = new wxStaticText( itemDialog1, wxID_STATIC, _("Currency Name"), + wxStaticText* itemStaticText4 = new wxStaticText( this, wxID_STATIC, _("Currency Name"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText4, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxString* itemChoice5Strings = NULL; - currencyChoice_ = new wxChoice( itemDialog1, ID_DIALOG_CURRENCY_CHOICE, + currencyChoice_ = new wxChoice( this, ID_DIALOG_CURRENCY_CHOICE, wxDefaultPosition, wxDefaultSize, 0, itemChoice5Strings, 0 ); itemFlexGridSizer3->Add(currencyChoice_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); currencyChoice_->Enable(false); - wxStaticText* itemStaticText26 = new wxStaticText( itemDialog1, wxID_STATIC, _("Currency Symbol"), + wxStaticText* itemStaticText26 = new wxStaticText( this, wxID_STATIC, _("Currency Symbol"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText26, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxComboBox* itemComboBox27 = new wxComboBox( itemDialog1, ID_DIALOG_CURRENCY_TEXT_SYMBOL, wxT(""), + wxComboBox* itemComboBox27 = new wxComboBox( this, ID_DIALOG_CURRENCY_TEXT_SYMBOL, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, 0); itemFlexGridSizer3->Add(itemComboBox27, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); // add existing currency symbols @@ -217,93 +215,93 @@ itemComboBox27->Append(wxT("THB")); itemComboBox27->Append(wxT("ZAR")); - wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("Unit Name"), + wxStaticText* itemStaticText14 = new wxStaticText( this, wxID_STATIC, _("Unit Name"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText14, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl15 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_UNIT, wxT(""), + wxTextCtrl* itemTextCtrl15 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_UNIT, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemTextCtrl15, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); - wxStaticText* itemStaticText16 = new wxStaticText( itemDialog1, wxID_STATIC, _("Cents Name"), + wxStaticText* itemStaticText16 = new wxStaticText( this, wxID_STATIC, _("Cents Name"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText16, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl17 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_CENTS, wxT(""), + wxTextCtrl* itemTextCtrl17 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_CENTS, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemTextCtrl17, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); - wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("Prefix Symbol"), + wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("Prefix Symbol"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText6, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl7 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_PFX, wxT(""), + wxTextCtrl* itemTextCtrl7 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_PFX, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemTextCtrl7, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); - wxStaticText* itemStaticText8 = new wxStaticText( itemDialog1, wxID_STATIC, _("Suffix Symbol"), + wxStaticText* itemStaticText8 = new wxStaticText( this, wxID_STATIC, _("Suffix Symbol"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText8, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl9 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_SFX, wxT(""), + wxTextCtrl* itemTextCtrl9 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_SFX, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemTextCtrl9, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); - wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("Decimal Char"), + wxStaticText* itemStaticText10 = new wxStaticText( this, wxID_STATIC, _("Decimal Char"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText10, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl11 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_DECIMAL, wxT(""), + wxTextCtrl* itemTextCtrl11 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_DECIMAL, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemTextCtrl11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); - wxStaticText* itemStaticText12 = new wxStaticText( itemDialog1, wxID_STATIC, _("Grouping Char"), + wxStaticText* itemStaticText12 = new wxStaticText( this, wxID_STATIC, _("Grouping Char"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText12, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl13 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_GROUP, wxT(""), + wxTextCtrl* itemTextCtrl13 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_GROUP, wxT(""), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemTextCtrl13, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); - wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Scale"), + wxStaticText* itemStaticText18 = new wxStaticText( this, wxID_STATIC, _("Scale"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText18, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl19 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_SCALE, wxT(""), + wxTextCtrl* itemTextCtrl19 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_SCALE, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); itemFlexGridSizer3->Add(itemTextCtrl19, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); - wxStaticText* itemStaticText81 = new wxStaticText( itemDialog1, wxID_STATIC, _("Conversion to Base Rate"), + wxStaticText* itemStaticText81 = new wxStaticText( this, wxID_STATIC, _("Conversion to Base Rate"), wxDefaultPosition, wxDefaultSize, 0 ); itemFlexGridSizer3->Add(itemStaticText81, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxTextCtrl* itemTextCtrl82 = new wxTextCtrl( itemDialog1, ID_DIALOG_CURRENCY_TEXT_BASECONVRATE, wxT(""), + wxTextCtrl* itemTextCtrl82 = new wxTextCtrl( this, ID_DIALOG_CURRENCY_TEXT_BASECONVRATE, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxTE_PROCESS_ENTER , doubleValidator() ); itemFlexGridSizer3->Add(itemTextCtrl82, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5); itemTextCtrl82->SetToolTip(_("Other currency conversion rate. Set Base Currency to 1.")); //-------------------------- - wxStaticBox* itemStaticBox_02 = new wxStaticBox(itemDialog1, wxID_ANY, _("Base Rate Conversion Sample:")); + wxStaticBox* itemStaticBox_02 = new wxStaticBox(this, wxID_ANY, _("Base Rate Conversion Sample:")); wxStaticBoxSizer* itemStaticBoxSizer_02 = new wxStaticBoxSizer(itemStaticBox_02, wxHORIZONTAL); itemBoxSizer2->Add(itemStaticBoxSizer_02, 0, wxGROW|wxALL, 5); - wxStaticText* itemStaticText220 = new wxStaticText( itemDialog1, wxID_STATIC, _("1000 Converted to:"), + wxStaticText* itemStaticText220 = new wxStaticText( this, wxID_STATIC, _("1000 Converted to:"), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticBoxSizer_02->Add(itemStaticText220, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxStaticText* sampleText2_ = new wxStaticText( itemDialog1, ID_DIALOG_CURRENCY_STATIC_CONVERSION, _("1000"), + wxStaticText* sampleText2_ = new wxStaticText( this, ID_DIALOG_CURRENCY_STATIC_CONVERSION, _("1000"), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticBoxSizer_02->Add(sampleText2_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); //-------------------------- - wxStaticBox* itemStaticBox_01 = new wxStaticBox(itemDialog1, wxID_ANY, _("Value Display Sample:")); + wxStaticBox* itemStaticBox_01 = new wxStaticBox(this, wxID_ANY, _("Value Display Sample:")); wxStaticBoxSizer* itemStaticBoxSizer_01 = new wxStaticBoxSizer(itemStaticBox_01, wxHORIZONTAL); itemBoxSizer2->Add(itemStaticBoxSizer_01, 0, wxGROW|wxALL, 5); - wxStaticText* itemStaticText20 = new wxStaticText( itemDialog1, wxID_STATIC, _("123456.78 Shown As:"), + wxStaticText* itemStaticText20 = new wxStaticText( this, wxID_STATIC, _("123456.78 Shown As:"), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticBoxSizer_01->Add(itemStaticText20, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxStaticText* sampleText_ = new wxStaticText( itemDialog1, ID_DIALOG_CURRENCY_STATIC_SAMPLE, _("123456.78"), + wxStaticText* sampleText_ = new wxStaticText( this, ID_DIALOG_CURRENCY_STATIC_SAMPLE, _("123456.78"), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticBoxSizer_01->Add(sampleText_, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); @@ -311,7 +309,7 @@ wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton24 = new wxButton( itemDialog1, ID_DIALOG_CURRENCY_BUTTON_UPDATE, _("&Update"), + wxButton* itemButton24 = new wxButton( this, ID_DIALOG_CURRENCY_BUTTON_UPDATE, _("&Update"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer22->Add(itemButton24, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); itemButton24->SetToolTip(_("Save any changes made")); Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/customreportdialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -65,14 +65,13 @@ void mmCustomSQLDialog::CreateControls() { - mmCustomSQLDialog* customSQLDialog = this; wxBoxSizer* mainBoxSizer = new wxBoxSizer(wxVERTICAL); - customSQLDialog->SetSizer(mainBoxSizer); + this->SetSizer(mainBoxSizer); /**************************************** Heading Panel ***************************************/ - wxPanel* headingPanel = new wxPanel( customSQLDialog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* headingPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); mainBoxSizer->Add(headingPanel, 0, wxALIGN_LEFT|wxALL, 5); wxBoxSizer* headingPanelSizerH = new wxBoxSizer(wxHORIZONTAL); @@ -94,26 +93,26 @@ /**************************************** Center Area ***************************************/ - wxStaticText* sourceTitleText = new wxStaticText( customSQLDialog, wxID_STATIC, _("SQL Source Script:")); + wxStaticText* sourceTitleText = new wxStaticText( this, wxID_STATIC, _("SQL Source Script:")); mainBoxSizer->Add(sourceTitleText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP|wxADJUST_MINSIZE, 9); wxBoxSizer* centerHorizontalBoxSizer = new wxBoxSizer(wxHORIZONTAL); mainBoxSizer->Add(centerHorizontalBoxSizer, 1, wxGROW|wxALL, 5); - wxPanel* centerPanel = new wxPanel( customSQLDialog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* centerPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); centerHorizontalBoxSizer->Add(centerPanel, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); wxBoxSizer* centerVerticalBoxSizer = new wxBoxSizer(wxVERTICAL); centerPanel->SetSizer(centerVerticalBoxSizer); // ListBox for source code - sqlSourceTxtCtrl_ = new wxTextCtrl( customSQLDialog, DIALOG_CUSTOM_SQL_TXTCTRL_SOURCE, _T(""), wxDefaultPosition, wxSize(-1, sourceTextHeight), wxTE_MULTILINE ); + sqlSourceTxtCtrl_ = new wxTextCtrl( this, DIALOG_CUSTOM_SQL_TXTCTRL_SOURCE, _T(""), wxDefaultPosition, wxSize(-1, sourceTextHeight), wxTE_MULTILINE ); centerHorizontalBoxSizer->Add(sqlSourceTxtCtrl_, 1, wxGROW|wxALL, 1); /**************************************** Bottom Panel ***************************************/ - wxPanel* buttonPanel = new wxPanel( customSQLDialog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* buttonPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); mainBoxSizer->Add(buttonPanel, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 0); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); Modified: trunk/mmex/src/filtertransdialog.cpp =================================================================== --- trunk/mmex/src/filtertransdialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/filtertransdialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -119,24 +119,23 @@ void mmFilterTransactionsDialog::CreateControls() { int fieldWidth = 210; - mmFilterTransactionsDialog* mainDialog = this; wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxHORIZONTAL); - mainDialog->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(mainDialog, wxID_ANY, _(" Specify ")); + wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(this, wxID_ANY, _(" Specify ")); wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxVERTICAL); itemBoxSizer3->Add(itemStaticBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - mainDialog->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); /****************************************************************************** Items Panel *******************************************************************************/ - wxPanel* itemPanel = new wxPanel( mainDialog, ID_PANEL11, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* itemPanel = new wxPanel( this, ID_PANEL11, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemStaticBoxSizer4->Add(itemPanel, 1, wxGROW|wxALL, 5); wxFlexGridSizer* itemPanelSizer = new wxFlexGridSizer(2, 2, 0, 0); @@ -274,7 +273,7 @@ /****************************************************************************** Button Panel with OK/Cancel buttons *******************************************************************************/ - wxPanel* buttonPanel = new wxPanel( mainDialog, ID_PANEL12, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxPanel* buttonPanel = new wxPanel( this, ID_PANEL12, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemBoxSizer3->Add(buttonPanel, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); Modified: trunk/mmex/src/maincurrencydialog.cpp =================================================================== --- trunk/mmex/src/maincurrencydialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/maincurrencydialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -94,23 +94,21 @@ void mmMainCurrencyDialog::CreateControls() { - mmMainCurrencyDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); - wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, + wxStaticText* itemStaticText3 = new wxStaticText( this, wxID_STATIC, _("Currency List"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer2->Add(itemStaticText3, 0, wxGROW|wxALL|wxADJUST_MINSIZE, 5); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - currencyListBox_ = new wxListBox( itemDialog1, ID_LISTBOX, + currencyListBox_ = new wxListBox( this, ID_LISTBOX, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_NEEDED_SB ); itemBoxSizer3->Add(currencyListBox_, 1, wxGROW|wxALL, 1); - wxPanel* itemPanel5 = new wxPanel( itemDialog1, ID_PANEL10, + wxPanel* itemPanel5 = new wxPanel( this, ID_PANEL10, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemBoxSizer2->Add(itemPanel5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 1); Modified: trunk/mmex/src/mmhelppanel.cpp =================================================================== --- trunk/mmex/src/mmhelppanel.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/mmhelppanel.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -67,12 +67,10 @@ void mmHelpPanel::CreateControls() { - mmHelpPanel* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + this->SetSizer(itemBoxSizer2); - wxPanel* itemPanel3 = new wxPanel( itemDialog1, ID_PANEL_REPORTS_HEADER_PANEL, + wxPanel* itemPanel3 = new wxPanel( this, ID_PANEL_REPORTS_HEADER_PANEL, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); itemBoxSizer2->Add(itemPanel3, 0, wxGROW|wxALL, 5); @@ -91,7 +89,7 @@ itemBoxSizerHeader->Add(buttonFordward, 0, wxLEFT|wxRIGHT, 5); itemBoxSizerHeader->Add(itemStaticText9, 0, wxLEFT|wxTOP, 5); - htmlWindow_ = new wxHtmlWindow( itemDialog1, ID_PANEL_REPORTS_HTMLWINDOW, + htmlWindow_ = new wxHtmlWindow( this, ID_PANEL_REPORTS_HTMLWINDOW, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL ); itemBoxSizer2->Add(htmlWindow_, 1, wxGROW|wxALL, 1); Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-06 11:17:40 UTC (rev 1930) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-06 11:25:05 UTC (rev 1931) @@ -273,11 +273,10 @@ m_imageList->Add(wxBitmap(preferences_other_xpm)); m_imageList->Add(wxBitmap(export_import_xpm)); - mmOptionsDialog* mainDialog = this; wxBoxSizer* mainDialogSizer = new wxBoxSizer(wxVERTICAL); - mainDialog->SetSizer(mainDialogSizer); + this->SetSizer(mainDialogSizer); - wxPanel* mainDialogPanel = new wxPanel(mainDialog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + wxPanel* mainDialogPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); mainDialogSizer->Add(mainDialogPanel, 1, wxGROW|wxALL, 5); wxBoxSizer* mainDialogPanelSizer = new wxBoxSizer(wxVERTICAL); @@ -904,10 +903,10 @@ /********************************************************************************************** Button Panel with OK and Cancel Buttons **********************************************************************************************/ - wxStaticLine* panelSeparatorLine = new wxStaticLine(mainDialog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + wxStaticLine* panelSeparatorLine = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); mainDialogSizer->Add(panelSeparatorLine,0,wxGROW|wxLEFT|wxRIGHT, 10); - wxPanel* buttonPanel = new wxPanel(mainDialog, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + wxPanel* buttonPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); buttonPanel->SetSizer(buttonPanelSizer); mainDialogSizer->Add(buttonPanel, 0, wxALIGN_RIGHT|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |