--- AE/Installer/trunk/source/main_window.cpp 2009/05/26 18:51:14 325 +++ AE/Installer/trunk/source/main_window.cpp 2009/06/01 02:04:33 328 @@ -936,7 +936,7 @@ BEGIN_EVENT_TABLE( MainWindow, wxFrame ) EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected ) - EVT_RADIOBUTTON( Separated_RadioButton, MainWindow::OnSeparatedRadioButtonSelected ) + EVT_RADIOBUTTON( Seperated_RadioButton, MainWindow::OnSeperatedRadioButtonSelected ) EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected ) @@ -1021,7 +1021,7 @@ void MainWindow::Init() OptionsPanel = NULL; SepRadio = NULL; NoSepRadio = NULL; - SeparatedRadio = NULL; + SeperatedRadio = NULL; CompleteRadio = NULL; ReglobalizeButton = NULL; ////@end MainWindow member initialisation @@ -1038,6 +1038,8 @@ wxGauge* TheProgressBar; void MainWindow::CreateControls() { ////@begin MainWindow content construction + // Generated by DialogBlocks, 31/05/2009 19:03:55 (unregistered) + MainWindow* itemFrame1 = this; wxMenuBar* menuBar = new wxMenuBar; @@ -1123,7 +1125,7 @@ void MainWindow::CreateControls() itemStaticLine17->Show(false); itemBoxSizer11->Add(itemStaticLine17, 0, wxGROW|wxALL, 5); - descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_RICH2 ); + descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_AUTO_URL ); descriptionText->SetName(_T("DescriptionName")); descriptionText->SetBackgroundColour(wxColour(240, 240, 240)); itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5); @@ -1140,11 +1142,11 @@ void MainWindow::CreateControls() wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer20, 0, wxGROW|wxALL, 0); - ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxDefaultSize, wxGA_SMOOTH ); + ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxSize(-1, 30), wxGA_SMOOTH ); ProgressBar->SetValue(0); itemBoxSizer20->Add(ProgressBar, 1, wxGROW|wxALL, 0); - InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxDefaultSize, 0 ); + InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxSize(-1, 30), 0 ); itemBoxSizer20->Add(InstallButton, 0, wxGROW|wxALL, 0); wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxVERTICAL); @@ -1177,10 +1179,10 @@ void MainWindow::CreateControls() wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL); itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5); - SeparatedRadio = new wxRadioButton( OptionsPanel, Separated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - SeparatedRadio->SetValue(false); - SeparatedRadio->SetName(_T("Separated_RadioButton")); - itemBoxSizer30->Add(SeparatedRadio, 0, wxALIGN_LEFT|wxALL, 5); + SeperatedRadio = new wxRadioButton( OptionsPanel, Seperated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + SeperatedRadio->SetValue(false); + SeperatedRadio->SetName(_T("Seperated_RadioButton")); + itemBoxSizer30->Add(SeperatedRadio, 0, wxALIGN_LEFT|wxALL, 5); CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 ); CompleteRadio->SetValue(false); @@ -1336,9 +1338,9 @@ wxIcon MainWindow::GetIconResource( cons void MainWindow::OnModsCheckboxList1Selected( wxCommandEvent& event ) { //event.GetSelection - titleText->SetLabel(wxT(globalPackages[event.GetSelection()].name.c_str())); - creatorText->SetLabel(globalPackages[event.GetSelection()].creator.c_str()); - descriptionText->SetLabel(globalPackages[event.GetSelection()].readme.c_str()); + titleText->SetValue(globalPackages[event.GetSelection()].name.c_str()); + creatorText->SetValue(globalPackages[event.GetSelection()].creator.c_str()); + descriptionText->SetValue(globalPackages[event.GetSelection()].readme.c_str()); creatorText->Refresh(); } @@ -1633,3 +1635,16 @@ globalizeData(); setStatusArea("Done!"); } + +/* + * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton + */ + +void MainWindow::OnSeperatedRadioButtonSelected( wxCommandEvent& event ) +{ +////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton in MainWindow. + // Before editing this code, remove the block markers. + event.Skip(); +////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton in MainWindow. +} +