Commit 31afde95 authored by bitplane's avatar bitplane

Fixed modal screen flicker, removed remainders of the old focus code, tidied vc8 project

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1003 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 429220da
...@@ -273,13 +273,6 @@ bool CGUIComboBox::OnEvent(const SEvent& event) ...@@ -273,13 +273,6 @@ bool CGUIComboBox::OnEvent(const SEvent& event)
openCloseMenu(); openCloseMenu();
return true; return true;
} }
// TODO: This is dead code
if (!AbsoluteClippingRect.isPointInside(p))
{
Environment->removeFocus(this);
return false;
}
} }
break; break;
case EMIE_MOUSE_WHEEL: case EMIE_MOUSE_WHEEL:
......
...@@ -60,6 +60,7 @@ bool CGUIModalScreen::OnEvent(const SEvent& event) ...@@ -60,6 +60,7 @@ bool CGUIModalScreen::OnEvent(const SEvent& event)
default: default:
break; break;
} }
break;
case EET_MOUSE_INPUT_EVENT: case EET_MOUSE_INPUT_EVENT:
if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
{ {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "CSceneManager.h" #include "CSceneManager.h"
#include "IVideoDriver.h" #include "IVideoDriver.h"
#include "IFileSystem.h" #include "IFileSystem.h"
#include "IAnimatedMesh.h" #include "SAnimatedMesh.h"
#include "CMeshCache.h" #include "CMeshCache.h"
#include "IWriteFile.h" #include "IWriteFile.h"
#include "IXMLWriter.h" #include "IXMLWriter.h"
......
...@@ -560,39 +560,15 @@ ...@@ -560,39 +560,15 @@
Name="scene" Name="scene"
> >
<File <File
RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.cpp" RelativePath="..\..\include\ECullingTypes.h"
>
</File>
<File
RelativePath=".\CParticleAttractionAffector.cpp"
>
</File>
<File
RelativePath=".\CParticleCylinderEmitter.cpp"
>
</File>
<File
RelativePath=".\CParticleMeshEmitter.cpp"
>
</File>
<File
RelativePath=".\CParticleRingEmitter.cpp"
>
</File>
<File
RelativePath=".\CParticleRotationAffector.cpp"
>
</File>
<File
RelativePath=".\CParticleSphereEmitter.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\include\ECullingTypes.h" RelativePath="..\..\include\EDebugSceneTypes.h"
> >
</File> </File>
<File <File
RelativePath="..\..\include\EDebugSceneTypes.h" RelativePath="..\..\include\EMeshWriterEnums.h"
> >
</File> </File>
<File <File
...@@ -663,10 +639,6 @@ ...@@ -663,10 +639,6 @@
RelativePath="..\..\include\IMeshWriter.h" RelativePath="..\..\include\IMeshWriter.h"
> >
</File> </File>
<File
RelativePath="..\..\include\EMeshWriterEnums.h"
>
</File>
<File <File
RelativePath=".\..\..\include\IMetaTriangleSelector.h" RelativePath=".\..\..\include\IMetaTriangleSelector.h"
> >
...@@ -1856,19 +1828,19 @@ ...@@ -1856,19 +1828,19 @@
> >
</File> </File>
<File <File
RelativePath="CXMeshFileLoader.cpp" RelativePath="CSTLMeshFileLoader.cpp"
> >
</File> </File>
<File <File
RelativePath="CXMeshFileLoader.h" RelativePath="CSTLMeshFileLoader.h"
> >
</File> </File>
<File <File
RelativePath="CSTLMeshFileLoader.cpp" RelativePath="CXMeshFileLoader.cpp"
> >
</File> </File>
<File <File
RelativePath="CSTLMeshFileLoader.h" RelativePath="CXMeshFileLoader.h"
> >
</File> </File>
<File <File
...@@ -2043,6 +2015,14 @@ ...@@ -2043,6 +2015,14 @@
<Filter <Filter
Name="particleSystem" Name="particleSystem"
> >
<File
RelativePath=".\CParticleAnimatedMeshSceneNodeEmitter.cpp"
>
</File>
<File
RelativePath=".\CParticleAttractionAffector.cpp"
>
</File>
<File <File
RelativePath="CParticleBoxEmitter.cpp" RelativePath="CParticleBoxEmitter.cpp"
> >
...@@ -2051,6 +2031,10 @@ ...@@ -2051,6 +2031,10 @@
RelativePath="CParticleBoxEmitter.h" RelativePath="CParticleBoxEmitter.h"
> >
</File> </File>
<File
RelativePath=".\CParticleCylinderEmitter.cpp"
>
</File>
<File <File
RelativePath="CParticleFadeOutAffector.cpp" RelativePath="CParticleFadeOutAffector.cpp"
> >
...@@ -2067,6 +2051,10 @@ ...@@ -2067,6 +2051,10 @@
RelativePath="CParticleGravityAffector.h" RelativePath="CParticleGravityAffector.h"
> >
</File> </File>
<File
RelativePath=".\CParticleMeshEmitter.cpp"
>
</File>
<File <File
RelativePath="CParticlePointEmitter.cpp" RelativePath="CParticlePointEmitter.cpp"
> >
...@@ -2075,6 +2063,18 @@ ...@@ -2075,6 +2063,18 @@
RelativePath="CParticlePointEmitter.h" RelativePath="CParticlePointEmitter.h"
> >
</File> </File>
<File
RelativePath=".\CParticleRingEmitter.cpp"
>
</File>
<File
RelativePath=".\CParticleRotationAffector.cpp"
>
</File>
<File
RelativePath=".\CParticleSphereEmitter.cpp"
>
</File>
<File <File
RelativePath="CParticleSystemSceneNode.cpp" RelativePath="CParticleSystemSceneNode.cpp"
> >
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment