From 9102febc37475af113681eaaee02ecc2ea04b4da Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 28 Jun 2007 15:25:39 +0000 Subject: Minor various fixes, Dialog validation started, GUI fixes, String methods added git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@21 6ecfd1a5-f3ed-3746-8530-beee90d26b22 --- pokemodr/gui/dlgCheckLevels.cpp | 166 ++++++++++++++++++++-------------------- 1 file changed, 83 insertions(+), 83 deletions(-) (limited to 'pokemodr/gui/dlgCheckLevels.cpp') diff --git a/pokemodr/gui/dlgCheckLevels.cpp b/pokemodr/gui/dlgCheckLevels.cpp index 59d81173..93302435 100644 --- a/pokemodr/gui/dlgCheckLevels.cpp +++ b/pokemodr/gui/dlgCheckLevels.cpp @@ -58,7 +58,7 @@ IMPLEMENT_DYNAMIC_CLASS( CheckLevelsDialog, wxDialog ) BEGIN_EVENT_TABLE( CheckLevelsDialog, wxDialog ) ////@begin CheckLevelsDialog event table entries - EVT_INIT_DIALOG( CheckLevelsDialog::OnInitDialog ) + EVT_INIT_DIALOG( CheckLevelsDialog::OnInitDialog ) ////@end CheckLevelsDialog event table entries @@ -86,14 +86,14 @@ CheckLevelsDialog::CheckLevelsDialog( wxWindow* parent, wxWindowID id, const wxS bool CheckLevelsDialog::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { ////@begin CheckLevelsDialog creation - wxDialog::Create( parent, id, caption, pos, size, style ); - - CreateControls(); - if (GetSizer()) - { - GetSizer()->SetSizeHints(this); - } - Centre(); + wxDialog::Create( parent, id, caption, pos, size, style ); + + CreateControls(); + if (GetSizer()) + { + GetSizer()->SetSizeHints(this); + } + Centre(); ////@end CheckLevelsDialog creation return true; } @@ -115,11 +115,11 @@ CheckLevelsDialog::~CheckLevelsDialog() void CheckLevelsDialog::Init() { ////@begin CheckLevelsDialog member initialisation - m_Compare = NULL; - m_Level = NULL; - m_True = NULL; - m_False = NULL; - m_Mode = NULL; + m_Compare = NULL; + m_Level = NULL; + m_True = NULL; + m_False = NULL; + m_Mode = NULL; ////@end CheckLevelsDialog member initialisation } /*! @@ -129,92 +129,92 @@ void CheckLevelsDialog::Init() void CheckLevelsDialog::CreateControls() { ////@begin CheckLevelsDialog content construction - CheckLevelsDialog* itemDialog1 = this; + CheckLevelsDialog* itemDialog1 = this; - wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); - itemDialog1->SetSizer(itemBoxSizer2); + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); + itemDialog1->SetSizer(itemBoxSizer2); - wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the levels of the roster currently\nbeing carried and hands control over to\nanother dialog depending on its truth"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); - itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL|wxADJUST_MINSIZE, 0); + wxStaticText* itemStaticText3 = new wxStaticText( itemDialog1, wxID_STATIC, _("Checks the levels of the roster currently\nbeing carried and hands control over to\nanother dialog depending on its truth"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); + itemBoxSizer2->Add(itemStaticText3, 0, wxALIGN_CENTER_HORIZONTAL, 0); - wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); - wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL); - itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5); + wxStaticBox* itemStaticBoxSizer4Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); + wxStaticBoxSizer* itemStaticBoxSizer4 = new wxStaticBoxSizer(itemStaticBoxSizer4Static, wxHORIZONTAL); + itemBoxSizer2->Add(itemStaticBoxSizer4, 0, wxGROW, 5); - wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Constraints:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); + itemStaticBoxSizer4->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - wxString m_CompareStrings[] = { - _("><") - }; - m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, 1, m_CompareStrings, wxCB_DROPDOWN ); - m_Compare->SetStringSelection(_("=")); - itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); + wxArrayString m_CompareStrings; + m_CompareStrings.Add(_("=")); + m_CompareStrings.Add(_(">")); + m_CompareStrings.Add(_("<")); + m_Compare = new wxComboBox( itemDialog1, ID_COMPARE, _("="), wxDefaultPosition, wxDefaultSize, m_CompareStrings, wxCB_DROPDOWN ); + m_Compare->SetStringSelection(_("=")); + itemStaticBoxSizer4->Add(m_Compare, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); - m_Level = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 ); - itemStaticBoxSizer4->Add(m_Level, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); + m_Level = new wxSpinCtrl( itemDialog1, ID_NUMBER, _T("0"), wxDefaultPosition, wxSize(90, 20), wxSP_ARROW_KEYS|wxSP_WRAP, 0, 0, 0 ); + itemStaticBoxSizer4->Add(m_Level, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); - wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); - wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL); - itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5); + wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); + wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxHORIZONTAL); + itemBoxSizer2->Add(itemStaticBoxSizer9, 0, wxGROW, 5); - wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Meets:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticBoxSizer9->Add(itemStaticText10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); + itemStaticBoxSizer9->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - wxString* m_TrueStrings = NULL; - m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_TrueStrings, wxCB_READONLY|wxCB_SORT ); - if (ShowToolTips()) - m_True->SetToolTip(_("The Dialog to hand control over to if the Levels meet the constraints")); - itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); + wxArrayString m_TrueStrings; + m_True = new wxComboBox( itemDialog1, ID_MEETS, _T(""), wxDefaultPosition, wxDefaultSize, m_TrueStrings, wxCB_READONLY|wxCB_SORT ); + if (ShowToolTips()) + m_True->SetToolTip(_("The Dialog to hand control over to if the Levels meet the constraints")); + itemStaticBoxSizer9->Add(m_True, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); - wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); - wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL); - itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5); + wxStaticBox* itemStaticBoxSizer13Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); + wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(itemStaticBoxSizer13Static, wxHORIZONTAL); + itemBoxSizer2->Add(itemStaticBoxSizer13, 0, wxGROW, 5); - wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText14 = new wxStaticText( itemDialog1, wxID_STATIC, _("If Doesn't Meet:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticBoxSizer13->Add(itemStaticText14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); + itemStaticBoxSizer13->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - wxString* m_FalseStrings = NULL; - m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_FalseStrings, wxCB_READONLY|wxCB_SORT ); - if (ShowToolTips()) - m_False->SetToolTip(_("The Dialog to hand control over to if the Levels don't meet the requirements")); - itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); + wxArrayString m_FalseStrings; + m_False = new wxComboBox( itemDialog1, ID_DOESNT_MEET, _T(""), wxDefaultPosition, wxDefaultSize, m_FalseStrings, wxCB_READONLY|wxCB_SORT ); + if (ShowToolTips()) + m_False->SetToolTip(_("The Dialog to hand control over to if the Levels don't meet the requirements")); + itemStaticBoxSizer13->Add(m_False, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); - wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); - wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL); - itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5); + wxStaticBox* itemStaticBoxSizer17Static = new wxStaticBox(itemDialog1, wxID_ANY, _T("")); + wxStaticBoxSizer* itemStaticBoxSizer17 = new wxStaticBoxSizer(itemStaticBoxSizer17Static, wxHORIZONTAL); + itemBoxSizer2->Add(itemStaticBoxSizer17, 0, wxGROW, 5); - wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("Mode:"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticBoxSizer17->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); + itemStaticBoxSizer17->Add(5, 5, 1, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5); - wxString m_ModeStrings[] = { - _("Call"), - _("Goto") - }; - m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, 2, m_ModeStrings, wxCB_READONLY ); - m_Mode->SetStringSelection(_("Call")); - if (ShowToolTips()) - m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete")); - itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); + wxArrayString m_ModeStrings; + m_ModeStrings.Add(_("Call")); + m_ModeStrings.Add(_("Goto")); + m_Mode = new wxComboBox( itemDialog1, ID_MODE, _("Call"), wxDefaultPosition, wxDefaultSize, m_ModeStrings, wxCB_READONLY ); + m_Mode->SetStringSelection(_("Call")); + if (ShowToolTips()) + m_Mode->SetToolTip(_("Call-Returns when other Dialog is complete\n\nGoto-Exits all Dialogs once complete")); + itemStaticBoxSizer17->Add(m_Mode, 0, wxALIGN_TOP|wxLEFT|wxRIGHT, 5); - wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer; + wxStdDialogButtonSizer* itemStdDialogButtonSizer21 = new wxStdDialogButtonSizer; - itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStdDialogButtonSizer21->AddButton(itemButton22); + itemBoxSizer2->Add(itemStdDialogButtonSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + wxButton* itemButton22 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer21->AddButton(itemButton22); - wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStdDialogButtonSizer21->AddButton(itemButton23); + wxButton* itemButton23 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + itemStdDialogButtonSizer21->AddButton(itemButton23); - itemStdDialogButtonSizer21->Realize(); + itemStdDialogButtonSizer21->Realize(); ////@end CheckLevelsDialog content construction } @@ -226,8 +226,8 @@ void CheckLevelsDialog::CreateControls() void CheckLevelsDialog::OnInitDialog( wxInitDialogEvent& event ) { ////@begin wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_LEVELS in CheckLevelsDialog. - // Before editing this code, remove the block markers. - event.Skip(); + // Before editing this code, remove the block markers. + event.Skip(); ////@end wxEVT_INIT_DIALOG event handler for ID_DLG_CHECK_LEVELS in CheckLevelsDialog. } @@ -248,8 +248,8 @@ wxBitmap CheckLevelsDialog::GetBitmapResource( const wxString& name ) { // Bitmap retrieval ////@begin CheckLevelsDialog bitmap retrieval - wxUnusedVar(name); - return wxNullBitmap; + wxUnusedVar(name); + return wxNullBitmap; ////@end CheckLevelsDialog bitmap retrieval } @@ -261,7 +261,7 @@ wxIcon CheckLevelsDialog::GetIconResource( const wxString& name ) { // Icon retrieval ////@begin CheckLevelsDialog icon retrieval - wxUnusedVar(name); - return wxNullIcon; + wxUnusedVar(name); + return wxNullIcon; ////@end CheckLevelsDialog icon retrieval } -- cgit