Canvas: Fix warning and rename file.
This commit is contained in:
parent
766014883c
commit
e980178213
4 changed files with 21 additions and 21 deletions
|
@ -24,27 +24,28 @@
|
||||||
namespace canvas
|
namespace canvas
|
||||||
{
|
{
|
||||||
|
|
||||||
struct MouseEvent
|
class MouseEvent
|
||||||
{
|
{
|
||||||
typedef osgGA::GUIEventAdapter::EventType EventType;
|
public:
|
||||||
typedef osgGA::GUIEventAdapter::ScrollingMotion Scroll;
|
typedef osgGA::GUIEventAdapter::EventType EventType;
|
||||||
|
typedef osgGA::GUIEventAdapter::ScrollingMotion Scroll;
|
||||||
|
|
||||||
MouseEvent(EventType type):
|
MouseEvent(EventType type):
|
||||||
type(type),
|
type(type),
|
||||||
x(-1), y(-1),
|
x(-1), y(-1),
|
||||||
dx(0), dy(0),
|
dx(0), dy(0),
|
||||||
button(-1),
|
button(-1),
|
||||||
state(-1),
|
state(-1),
|
||||||
mod(-1)
|
mod(-1)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
EventType type;
|
EventType type;
|
||||||
int x, y,
|
int x, y,
|
||||||
dx, dy,
|
dx, dy,
|
||||||
button, //<! Button for this event
|
button, //<! Button for this event
|
||||||
state, //<! Current button state
|
state, //<! Current button state
|
||||||
mod; //<! Keyboard modifier state
|
mod; //<! Keyboard modifier state
|
||||||
Scroll scroll;
|
Scroll scroll;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace canvas
|
} // namespace canvas
|
|
@ -18,8 +18,8 @@
|
||||||
|
|
||||||
#include "canvas.hxx"
|
#include "canvas.hxx"
|
||||||
#include "elements/group.hxx"
|
#include "elements/group.hxx"
|
||||||
#include "mouse_event.hxx"
|
|
||||||
|
|
||||||
|
#include <Canvas/MouseEvent.hxx>
|
||||||
#include <Canvas/property_helper.hxx>
|
#include <Canvas/property_helper.hxx>
|
||||||
#include <Main/globals.hxx>
|
#include <Main/globals.hxx>
|
||||||
#include <Viewer/CameraGroup.hxx>
|
#include <Viewer/CameraGroup.hxx>
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
#include "gui_mgr.hxx"
|
#include "gui_mgr.hxx"
|
||||||
#include "mouse_event.hxx"
|
|
||||||
#include <Canvas/window.hxx>
|
#include <Canvas/window.hxx>
|
||||||
#include <Canvas/canvas.hxx>
|
#include <Canvas/canvas.hxx>
|
||||||
|
|
||||||
|
|
|
@ -19,9 +19,9 @@
|
||||||
#ifndef CANVAS_WINDOW_HXX_
|
#ifndef CANVAS_WINDOW_HXX_
|
||||||
#define CANVAS_WINDOW_HXX_
|
#define CANVAS_WINDOW_HXX_
|
||||||
|
|
||||||
#include "mouse_event.hxx"
|
|
||||||
#include "property_based_element.hxx"
|
#include "property_based_element.hxx"
|
||||||
#include "rect.hxx"
|
#include "rect.hxx"
|
||||||
|
#include <Canvas/MouseEvent.hxx>
|
||||||
|
|
||||||
#include <simgear/props/propertyObject.hxx>
|
#include <simgear/props/propertyObject.hxx>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue