--- AE/Installer/trunk/source/main_window.cpp 2009/12/30 01:51:38 487 +++ AE/Installer/trunk/source/main_window.cpp 2010/03/14 23:31:14 500 @@ -44,6 +44,8 @@ ITaskbarList3 *pTaskbarList3; ////@end XPM images bool busy = false; +int updateStatus; +bool installerJustUpdated = false; vector globalInstalledMods; vector globalPackages; // Variable declarations @@ -211,12 +213,12 @@ void MainWindow::CreateControls() wxMenu* itemMenu42 = new wxMenu; itemMenu42->Append(wxID_OPTIONS, _("Show Advanced Options..."), wxEmptyString, wxITEM_CHECK); menuBar->Append(itemMenu42, _("Options")); -#ifdef WIN32 - itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL); - menuBar->Append(itemMenu44, _("Help")); -#else +//#ifdef WIN32 +// itemMenu44->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL); +// menuBar->Append(itemMenu44, _("Help")); +//#else itemMenu37->Append(wxID_ABOUT, _("About"), wxEmptyString, wxITEM_NORMAL); -#endif +//#endif itemFrame1->SetMenuBar(menuBar); @@ -354,12 +356,15 @@ void MainWindow::CreateControls() Handle = (HWND)GetHWND(); ::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_INPROC_SERVER, IID_ITaskbarList, (void **)&pTaskbarList); #endif + + updateStatus = GetUpdateStatus(¤tAE, &updateAE, &installerJustUpdated); globalPackages = getPackages(); globalInstalledMods = getInstallString(); - for (unsigned int i = 0; i < globalPackages.size(); i++) { + for (unsigned int i = 0; i < globalPackages.size(); i++) + { Mods_CheckboxList->Append(globalPackages[i].name.c_str()); - if( binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName ) ) Mods_CheckboxList->Check(i); + if (binary_search(globalInstalledMods.begin(), globalInstalledMods.end(), globalPackages[i].modStringName)) Mods_CheckboxList->Check(i); } TheStatusBar = &StatusArea;