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 487 by iritscen, Wed Dec 30 01:51:38 2009 UTC vs.
Revision 500 by iritscen, Sun Mar 14 23:31:14 2010 UTC

# Line 44 | Line 44 | ITaskbarList3 *pTaskbarList3;
44   ////@end XPM images
45  
46   bool busy = false;
47 + int updateStatus;
48 + bool installerJustUpdated = false;
49   vector<string> globalInstalledMods;
50   vector<ModPackage> globalPackages;
51   // Variable declarations
# Line 211 | Line 213 | void MainWindow::CreateControls()
213      wxMenu* itemMenu42 = new wxMenu;
214      itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK);
215      menuBar->Append(itemMenu42, _("Options"));
216 < #ifdef WIN32
217 <        itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
218 <        menuBar->Append(itemMenu44, _("Help"));
219 < #else
216 > //#ifdef WIN32
217 > //      itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
218 > //      menuBar->Append(itemMenu44, _("Help"));
219 > //#else
220          itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL);
221 < #endif  
221 > //#endif        
222  
223      itemFrame1->SetMenuBar(menuBar);
224  
# Line 354 | Line 356 | void MainWindow::CreateControls()
356          Handle = (HWND)GetHWND();
357          ::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList);
358   #endif
359 +
360 +        updateStatus = GetUpdateStatus(&currentAE, &updateAE, &installerJustUpdated);
361          
362          globalPackages = getPackages();
363          globalInstalledMods = getInstallString();
364 <        for (unsigned int i = 0; i < globalPackages.size(); i++) {
364 >        for (unsigned int i = 0; i < globalPackages.size(); i++)
365 >        {
366                  Mods_CheckboxList->Append(globalPackages[i].name.c_str());
367 <                if( binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i);
367 >                if (binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName)) Mods_CheckboxList->Check(i);
368          }
369  
370          TheStatusBar = &StatusArea;

Diff Legend

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