added defaults to switch blocks to avoid warnings when compiling with -Wall
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@960 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
f4bc95371b
commit
966b8bedc7
|
@ -47,7 +47,6 @@ CDefaultGUIElementFactory::~CDefaultGUIElementFactory()
|
|||
//! adds an element to the env based on its type id
|
||||
IGUIElement* CDefaultGUIElementFactory::addGUIElement(EGUI_ELEMENT_TYPE type, IGUIElement* parent)
|
||||
{
|
||||
|
||||
switch(type)
|
||||
{
|
||||
case EGUIET_BUTTON:
|
||||
|
@ -92,9 +91,9 @@ IGUIElement* CDefaultGUIElementFactory::addGUIElement(EGUI_ELEMENT_TYPE type, IG
|
|||
return Environment->addWindow(core::rect<s32>(0,0,100,100),false,0,parent);
|
||||
case EGUIET_SPIN_BOX:
|
||||
return Environment->addSpinBox(L"0.0", core::rect<s32>(0,0,100,100), parent);
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -191,6 +191,8 @@ bool CGUIButton::OnEvent(SEvent event)
|
|||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -119,6 +119,8 @@ bool CGUICheckBox::OnEvent(SEvent event)
|
|||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -383,14 +383,10 @@ bool CGUIColorSelectDialog::OnEvent(SEvent event)
|
|||
break;
|
||||
|
||||
case EGET_LISTBOX_CHANGED:
|
||||
{
|
||||
}
|
||||
break;
|
||||
|
||||
case EGET_LISTBOX_SELECTED_AGAIN:
|
||||
{
|
||||
}
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
break;
|
||||
case EET_MOUSE_INPUT_EVENT:
|
||||
|
@ -423,8 +419,11 @@ bool CGUIColorSelectDialog::OnEvent(SEvent event)
|
|||
DragStart.Y = event.MouseInput.Y;
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -247,6 +247,8 @@ bool CGUIComboBox::OnEvent(SEvent event)
|
|||
sendSelectionChangedEvent();
|
||||
}
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case EET_MOUSE_INPUT_EVENT:
|
||||
|
@ -298,8 +300,12 @@ bool CGUIComboBox::OnEvent(SEvent event)
|
|||
if (Selected != oldSelected)
|
||||
sendSelectionChangedEvent();
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -235,6 +235,9 @@ bool CGUIContextMenu::OnEvent(SEvent event)
|
|||
{
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case EET_MOUSE_INPUT_EVENT:
|
||||
|
@ -256,8 +259,12 @@ bool CGUIContextMenu::OnEvent(SEvent event)
|
|||
if (Environment->hasFocus(this))
|
||||
highlight(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y), true);
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -186,6 +186,8 @@ bool CGUIEditBox::OnEvent(SEvent event)
|
|||
if (processMouse(event))
|
||||
return true;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
@ -942,6 +944,8 @@ bool CGUIEditBox::processMouse(const SEvent& event)
|
|||
return true;
|
||||
}
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
@ -530,6 +530,8 @@ bool CGUIEnvironment::postEventFromUser(SEvent event)
|
|||
return Focus->OnEvent(event);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
} // end switch
|
||||
|
||||
return false;
|
||||
|
@ -778,6 +780,8 @@ void CGUIEnvironment::readGUIElement(io::IXMLReader* reader, IGUIElement* parent
|
|||
core::stringc(reader->getNodeName()).c_str());
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -193,6 +193,8 @@ bool CGUIFileOpenDialog::OnEvent(SEvent event)
|
|||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case EET_MOUSE_INPUT_EVENT:
|
||||
|
@ -227,7 +229,11 @@ bool CGUIFileOpenDialog::OnEvent(SEvent event)
|
|||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -113,6 +113,8 @@ bool CGUIMenu::OnEvent(SEvent event)
|
|||
Parent->bringToFront(this);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case EET_MOUSE_INPUT_EVENT:
|
||||
|
@ -146,8 +148,12 @@ bool CGUIMenu::OnEvent(SEvent event)
|
|||
if (Environment->hasFocus(this))
|
||||
highlight(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y), hasOpenSubMenu());
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -386,6 +386,8 @@ bool CGUIMessageBox::OnEvent(SEvent event)
|
|||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return CGUIWindow::OnEvent(event);
|
||||
|
|
|
@ -64,14 +64,16 @@ bool CGUIModalScreen::OnEvent(SEvent event)
|
|||
case EGET_ELEMENT_CLOSED:
|
||||
// do not interfere with children being removed
|
||||
return IGUIElement::OnEvent(event);
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
case EET_MOUSE_INPUT_EVENT:
|
||||
switch(event.MouseInput.Event)
|
||||
if (event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
|
||||
{
|
||||
case EMIE_LMOUSE_PRESSED_DOWN:
|
||||
MouseDownTime = os::Timer::getTime();
|
||||
}
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
IGUIElement::OnEvent(event);
|
||||
|
|
|
@ -175,8 +175,12 @@ bool CGUIScrollBar::OnEvent(SEvent event)
|
|||
}
|
||||
return true;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return IGUIElement::OnEvent(event);
|
||||
|
|
|
@ -255,8 +255,12 @@ bool CGUITabControl::OnEvent(SEvent event)
|
|||
Environment->removeFocus(this);
|
||||
selectTab(core::position2d<s32>(event.MouseInput.X, event.MouseInput.Y));
|
||||
return true;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return Parent ? Parent->OnEvent(event) : false;
|
||||
|
|
|
@ -192,7 +192,11 @@ bool CGUIWindow::OnEvent(SEvent event)
|
|||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return IGUIElement::OnEvent(event);
|
||||
|
|
|
@ -215,7 +215,7 @@ void COctTreeSceneNode::render()
|
|||
}
|
||||
}
|
||||
break;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -50,6 +50,8 @@ IAnimatedMesh* CXMeshFileLoader::createMesh(irr::io::IReadFile* f)
|
|||
if (!f)
|
||||
return 0;
|
||||
|
||||
u32 time = os::Timer::getRealTime();
|
||||
|
||||
AnimatedMesh = new CSkinnedMesh();
|
||||
|
||||
if ( load(f) )
|
||||
|
@ -61,7 +63,15 @@ IAnimatedMesh* CXMeshFileLoader::createMesh(irr::io::IReadFile* f)
|
|||
AnimatedMesh->drop();
|
||||
AnimatedMesh = 0;
|
||||
}
|
||||
|
||||
#ifdef _XREADER_DEBUG
|
||||
time = os::Timer::getRealTime() - time;
|
||||
core::stringc tmpString = "Time to load ";
|
||||
tmpString += BinaryFormat ? "binary" : "ascii";
|
||||
tmpString += " X file: ";
|
||||
tmpString += time;
|
||||
tmpString += "ms";
|
||||
os::Printer::log(tmpString.c_str());
|
||||
#endif
|
||||
//Clear up
|
||||
|
||||
MajorVersion=0;
|
||||
|
|
Loading…
Reference in New Issue