Merged inn athile's work

gui/events.cpp

@@ -11,8 +11,8 @@ EventInjector::EventInjector(MyGUI::Gui *g)
   : gui(g), mouseX(0), mouseY(0), enabled(true)
 {
   assert(gui);
-  maxX = gui->getViewWidth();
-  maxY = gui->getViewHeight();
+  maxX = gui->getViewSize().width;
+  maxY = gui->getViewSize().height;
 }
 
 template <typename X>

sound/sndmanager.cpp

@@ -35,7 +35,6 @@ private:
       where we poll to check if a resource is still needed, but where
       manual references are allowed.
   */
-  typedef boost::weak_ptr<Mangle::Sound::Sound> WSoundPtr;
   WSoundPtr weak;
   SoundPtr self;