dev-games/guichan/0.8.2: guichan-0.8.2.patch

include/guichan/allegro/allegrographics.hpp

@@ -61 +61 @@
     {
     public:
 
+#ifndef __HAIKU__
         // Needed so that drawImage(gcn::Image *, int, int) is visible.
         using Graphics::drawImage;
+#endif
 
         /**
          * Constructor.

include/guichan/graphics.hpp

@@ -46 +46 @@
 
 #include <iosfwd>
 #include <stack>
+#include <string>
 
 #include "guichan/cliprectangle.hpp"
 #include "guichan/platform.hpp"

include/guichan/opengl/openglgraphics.hpp

@@ -57 +57 @@
     {
     public:
 
+#ifndef __HAIKU__
         // Needed so that drawImage(gcn::Image *, int, int) is visible.
         using Graphics::drawImage;
+#endif
 
         /**
          * Constructor.

include/guichan/sdl/sdlgraphics.hpp

@@ -62 +62 @@
     {
     public:
 
+#ifndef __HAIKU__
         // Needed so that drawImage(gcn::Image *, int, int) is visible.
         using Graphics::drawImage;
+#endif
 
         /**
          * Constructor.

src/focushandler.cpp

@@ -94 +94 @@
         
         if (oldFocused != widget)
         {
-            mFocusedWidget = mWidgets.at(toBeFocusedIndex);
+            mFocusedWidget = mWidgets[toBeFocusedIndex];
             
             if (oldFocused != NULL)
             {
@@ -102 +102 @@
                 distributeFocusLostEvent(focusEvent);
             }
             
-            Event focusEvent(mWidgets.at(toBeFocusedIndex));
+            Event focusEvent(mWidgets[toBeFocusedIndex]);
             distributeFocusGainedEvent(focusEvent);
         }        
     }
@@ -203 +203 @@
                 return;
             }
         }
-        while (!mWidgets.at(focusedWidget)->isFocusable());
+        while (!mWidgets[focusedWidget]->isFocusable());
 
         if (focusedWidget >= 0)
         {
-            mFocusedWidget = mWidgets.at(focusedWidget);
+            mFocusedWidget = mWidgets[focusedWidget];
 
             Event focusEvent(mFocusedWidget);
             distributeFocusGainedEvent(focusEvent);
@@ -215 +215 @@
 
         if (focused >= 0)
         {
-            Event focusEvent(mWidgets.at(focused));
+            Event focusEvent(mWidgets[focused]);
             distributeFocusLostEvent(focusEvent);
         }
     }
@@ -264 +264 @@
                 return;
             }
         }
-        while (!mWidgets.at(focusedWidget)->isFocusable());
+        while (!mWidgets[focusedWidget]->isFocusable());
 
         if (focusedWidget >= 0)
         {
-            mFocusedWidget = mWidgets.at(focusedWidget);
+            mFocusedWidget = mWidgets[focusedWidget];
             Event focusEvent(mFocusedWidget);
             distributeFocusGainedEvent(focusEvent);
         }
 
         if (focused >= 0)
         {
-            Event focusEvent(mWidgets.at(focused));
+            Event focusEvent(mWidgets[focused]);
             distributeFocusLostEvent(focusEvent);
         }
     }
@@ -404 +404 @@
                 return;
             }
 
-            if (mWidgets.at(focusedWidget)->isFocusable() &&
-                mWidgets.at(focusedWidget)->isTabInEnabled() &&
+            if (mWidgets[focusedWidget]->isFocusable() &&
+                mWidgets[focusedWidget]->isTabInEnabled() &&
                 (mModalFocusedWidget == NULL ||
-                 mWidgets.at(focusedWidget)->isModalFocused()))
+                 mWidgets[focusedWidget]->isModalFocused()))
             {
                 done = true;
             }
@@ -416 +416 @@
 
         if (focusedWidget >= 0)
         {
-            mFocusedWidget = mWidgets.at(focusedWidget);
+            mFocusedWidget = mWidgets[focusedWidget];
             Event focusEvent(mFocusedWidget);
             distributeFocusGainedEvent(focusEvent);
         }
 
         if (focused >= 0)
         {
-            Event focusEvent(mWidgets.at(focused));
+            Event focusEvent(mWidgets[focused]);
             distributeFocusLostEvent(focusEvent);
         }
     }
@@ -481 +481 @@
                 return;
             }
 
-            if (mWidgets.at(focusedWidget)->isFocusable() &&
-                mWidgets.at(focusedWidget)->isTabInEnabled() &&
+            if (mWidgets[focusedWidget]->isFocusable() &&
+                mWidgets[focusedWidget]->isTabInEnabled() &&
                 (mModalFocusedWidget == NULL ||
-                 mWidgets.at(focusedWidget)->isModalFocused()))
+                 mWidgets[focusedWidget]->isModalFocused()))
             {
                 done = true;
             }
@@ -493 +493 @@
 
         if (focusedWidget >= 0)
         {
-            mFocusedWidget = mWidgets.at(focusedWidget);
+            mFocusedWidget = mWidgets[focusedWidget];
             Event focusEvent(mFocusedWidget);
             distributeFocusGainedEvent(focusEvent);
         }
 
         if (focused >= 0)
         {
-            Event focusEvent(mWidgets.at(focused));
+            Event focusEvent(mWidgets[focused]);
             distributeFocusLostEvent(focusEvent);
         }
     }