Changeset 491 for trunk/src/Halite.cpp


Ignore:
Timestamp:
07/01/08 19:48:00 (12 years ago)
Author:
Eoin
Message:

Merging changes from branch into trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Halite.cpp

    r478 r491  
    9999        boost::filesystem::path::default_name_check(boost::filesystem::native); 
    100100 
    101         AtlInitCommonControls(ICC_COOL_CLASSES | ICC_BAR_CLASSES);       
    102         HINSTANCE hInstRich = ::LoadLibrary(CRichEditCtrl::GetLibraryName()); 
     101        WTL::AtlInitCommonControls(ICC_COOL_CLASSES | ICC_BAR_CLASSES);  
     102        HINSTANCE hInstRich = ::LoadLibrary(WTL::CRichEditCtrl::GetLibraryName()); 
    103103        ATLASSERT(hInstRich != NULL); 
    104104    
     
    150150                        new hal::EventMsg((wformat(L"Working Directory: %1%.") % hal::app().working_directory()), hal::event_logger::info)));            
    151151                 
    152                 CMessageLoop theLoop; 
     152                WTL::CMessageLoop theLoop; 
    153153                _Module.AddMessageLoop(&theLoop); 
    154154                         
     
    171171                _Module.RemoveMessageLoop(); 
    172172 
    173                 halite().save(); 
     173                halite().save_to_ini(); 
    174174                hal::ini().save_data();          
    175175        } 
Note: See TracChangeset for help on using the changeset viewer.