ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/main_window.cpp
(Generate patch)

Comparing AE/Installer/trunk/source/main_window.cpp (file contents):
Revision 325 by iritscen, Tue May 26 18:51:14 2009 UTC vs.
Revision 328 by gumby, Mon Jun 1 02:04:33 2009 UTC

# Line 936 | Line 936 | BEGIN_EVENT_TABLE( MainWindow, wxFrame )
936  
937      EVT_RADIOBUTTON( NoSep_RadioButton, MainWindow::OnNoSepRadioButtonSelected )
938  
939 <    EVT_RADIOBUTTON( Separated_RadioButton, MainWindow::OnSeparatedRadioButtonSelected )
939 >    EVT_RADIOBUTTON( Seperated_RadioButton, MainWindow::OnSeperatedRadioButtonSelected )
940  
941      EVT_RADIOBUTTON( Complete_RadioButton, MainWindow::OnCompleteRadioButtonSelected )
942  
# Line 1021 | Line 1021 | void MainWindow::Init()
1021      OptionsPanel = NULL;
1022      SepRadio = NULL;
1023      NoSepRadio = NULL;
1024 <    SeparatedRadio = NULL;
1024 >    SeperatedRadio = NULL;
1025      CompleteRadio = NULL;
1026      ReglobalizeButton = NULL;
1027   ////@end MainWindow member initialisation
# Line 1038 | Line 1038 | wxGauge* TheProgressBar;
1038   void MainWindow::CreateControls()
1039   {    
1040   ////@begin MainWindow content construction
1041 +    // Generated by DialogBlocks, 31/05/2009 19:03:55 (unregistered)
1042 +
1043      MainWindow* itemFrame1 = this;
1044  
1045      wxMenuBar* menuBar = new wxMenuBar;
# Line 1123 | Line 1125 | void MainWindow::CreateControls()
1125      itemStaticLine17->Show(false);
1126      itemBoxSizer11->Add(itemStaticLine17, 0, wxGROW|wxALL, 5);
1127  
1128 <    descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_RICH2 );
1128 >    descriptionText = new wxTextCtrl( itemPanel10, Description_Text, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH|wxTE_AUTO_URL );
1129      descriptionText->SetName(_T("DescriptionName"));
1130      descriptionText->SetBackgroundColour(wxColour(240, 240, 240));
1131      itemBoxSizer11->Add(descriptionText, 1, wxGROW|wxLEFT|wxRIGHT, 5);
# Line 1140 | Line 1142 | void MainWindow::CreateControls()
1142      wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL);
1143      itemBoxSizer2->Add(itemBoxSizer20, 0, wxGROW|wxALL, 0);
1144  
1145 <    ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxDefaultSize, wxGA_SMOOTH );
1145 >    ProgressBar = new wxGauge( itemFrame1, ProgressBar_Gauge, 1000, wxDefaultPosition, wxSize(-1, 30), wxGA_SMOOTH );
1146      ProgressBar->SetValue(0);
1147      itemBoxSizer20->Add(ProgressBar, 1, wxGROW|wxALL, 0);
1148  
1149 <    InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxDefaultSize, 0 );
1149 >    InstallButton = new wxButton( itemFrame1, Install_Button, _("Install!"), wxDefaultPosition, wxSize(-1, 30), 0 );
1150      itemBoxSizer20->Add(InstallButton, 0, wxGROW|wxALL, 0);
1151  
1152      wxBoxSizer* itemBoxSizer23 = new wxBoxSizer(wxVERTICAL);
# Line 1177 | Line 1179 | void MainWindow::CreateControls()
1179      wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxVERTICAL);
1180      itemBoxSizer25->Add(itemBoxSizer30, 0, wxGROW|wxALL, 5);
1181  
1182 <    SeparatedRadio = new wxRadioButton( OptionsPanel, Separated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1183 <    SeparatedRadio->SetValue(false);
1184 <    SeparatedRadio->SetName(_T("Separated_RadioButton"));
1185 <    itemBoxSizer30->Add(SeparatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1182 >    SeperatedRadio = new wxRadioButton( OptionsPanel, Seperated_RadioButton, _("Separated Level0"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
1183 >    SeperatedRadio->SetValue(false);
1184 >    SeperatedRadio->SetName(_T("Seperated_RadioButton"));
1185 >    itemBoxSizer30->Add(SeperatedRadio, 0, wxALIGN_LEFT|wxALL, 5);
1186  
1187      CompleteRadio = new wxRadioButton( OptionsPanel, Complete_RadioButton, _("Complete Level0"), wxDefaultPosition, wxDefaultSize, 0 );
1188      CompleteRadio->SetValue(false);
# Line 1336 | Line 1338 | wxIcon MainWindow::GetIconResource( cons
1338   void MainWindow::OnModsCheckboxList1Selected( wxCommandEvent& event )
1339   {
1340          //event.GetSelection
1341 <        titleText->SetLabel(wxT(globalPackages[event.GetSelection()].name.c_str()));
1342 <        creatorText->SetLabel(globalPackages[event.GetSelection()].creator.c_str());
1343 <        descriptionText->SetLabel(globalPackages[event.GetSelection()].readme.c_str());
1341 >        titleText->SetValue(globalPackages[event.GetSelection()].name.c_str());
1342 >        creatorText->SetValue(globalPackages[event.GetSelection()].creator.c_str());
1343 >        descriptionText->SetValue(globalPackages[event.GetSelection()].readme.c_str());
1344  
1345          creatorText->Refresh();
1346   }
# Line 1633 | Line 1635 | globalizeData();
1635                  setStatusArea("Done!");
1636   }
1637  
1638 +
1639 + /*
1640 + * wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton
1641 + */
1642 +
1643 + void MainWindow::OnSeperatedRadioButtonSelected( wxCommandEvent& event )
1644 + {
1645 + ////@begin wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton in MainWindow.
1646 +    // Before editing this code, remove the block markers.
1647 +    event.Skip();
1648 + ////@end wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for Seperated_RadioButton in MainWindow.
1649 + }
1650 +

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)