krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

should now compile warning free

Browse source
This commit is contained in:
scrawl 2012-03-21 13:48:57 +01:00
parent 97ab48993e
commit b0b41a9199
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/class.cpp
View file

@ -267,7 +267,7 @@ void InfoBoxDialog::layoutVertically(MyGUI::WidgetPtr widget, int margin)
for (unsigned i = 0; i < count; ++i) for (unsigned i = 0; i < count; ++i)
{ {
MyGUI::WidgetPtr child = widget->getChildAt(i); MyGUI::WidgetPtr child = widget->getChildAt(i);
if (!child->isVisible()) if (!child->getVisible())
continue; continue;
child->setPosition(child->getLeft(), pos); child->setPosition(child->getLeft(), pos);

2
apps/openmw/mwgui/dialogue.cpp
View file

@ -72,7 +72,7 @@ void DialogueWindow::onHistoryClicked(MyGUI::Widget* _sender)
if(t == nullptr) if(t == nullptr)
return; return;
const IntPoint& lastPressed = InputManager::getInstance().getLastLeftPressed(); const IntPoint& lastPressed = InputManager::getInstance().getLastPressedPosition(MyGUI::MouseButton::Left);
size_t cursorPosition = t->getCursorPosition(lastPressed); size_t cursorPosition = t->getCursorPosition(lastPressed);
MyGUI::UString color = history->getColorAtPos(cursorPosition); MyGUI::UString color = history->getColorAtPos(cursorPosition);

14
libs/openengine/gui/events.cpp
View file

@ -11,8 +11,8 @@ EventInjector::EventInjector(MyGUI::Gui *g)
: gui(g), mouseX(0), mouseY(0), enabled(true) : gui(g), mouseX(0), mouseY(0), enabled(true)
{ {
assert(gui); assert(gui);
maxX = gui->getViewSize().width; maxX = MyGUI::RenderManager::getInstance().getViewSize().width;
maxY = gui->getViewSize().height; maxY = MyGUI::RenderManager::getInstance().getViewSize().height;
} }
template <typename X> template <typename X>
@ -51,11 +51,11 @@ void EventInjector::event(Type type, int index, const void *p)
is still pretty significant.) is still pretty significant.)
*/ */
MyGUI::Char text = (MyGUI::Char)key->text; MyGUI::Char text = (MyGUI::Char)key->text;
gui->injectKeyPress(code,text); MyGUI::InputManager::getInstance().injectKeyPress(code,text);
} }
else else
{ {
gui->injectKeyRelease(code); MyGUI::InputManager::getInstance().injectKeyRelease(code);
} }
} }
else if(type & EV_Mouse) else if(type & EV_Mouse)
@ -71,10 +71,10 @@ void EventInjector::event(Type type, int index, const void *p)
setRange(mouseY,0,maxY); setRange(mouseY,0,maxY);
if(type == EV_MouseDown) if(type == EV_MouseDown)
gui->injectMousePress(mouseX, mouseY, id); MyGUI::InputManager::getInstance().injectMousePress(mouseX, mouseY, id);
else if(type == EV_MouseUp) else if(type == EV_MouseUp)
gui->injectMouseRelease(mouseX, mouseY, id); MyGUI::InputManager::getInstance().injectMouseRelease(mouseX, mouseY, id);
else else
gui->injectMouseMove(mouseX, mouseY, mouse->state.Z.abs); MyGUI::InputManager::getInstance().injectMouseMove(mouseX, mouseY, mouse->state.Z.abs);
} }
} }

2
libs/openengine/gui/manager.cpp
View file

@ -32,7 +32,7 @@ void MyGUIManager::setup(Ogre::RenderWindow *wnd, Ogre::SceneManager *mgr, bool
// Create GUI // Create GUI
mGui = new Gui(); mGui = new Gui();
mGui->initialise("core.xml", theLogFile); mGui->initialise("core.xml");
} }
void MyGUIManager::shutdown() void MyGUIManager::shutdown()