X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcanvas%2Fcanvas_fwd.hxx;h=3b1b464690dcd8c1783d71de27c4853f2394b5fe;hb=519326f7518b6e8760a53db6ebebd692655ef7be;hp=e90f590786d73582263fb48a1e7e434b5797e399;hpb=6deb77dd4db931d8dfc8cc612dd492ddfe18df44;p=simgear.git diff --git a/simgear/canvas/canvas_fwd.hxx b/simgear/canvas/canvas_fwd.hxx index e90f5907..3b1b4646 100644 --- a/simgear/canvas/canvas_fwd.hxx +++ b/simgear/canvas/canvas_fwd.hxx @@ -39,8 +39,8 @@ namespace canvas #define SG_FWD_DECL(name)\ class name;\ - typedef boost::shared_ptr name##Ptr;\ - typedef boost::weak_ptr name##WeakPtr; + typedef SGSharedPtr name##Ptr;\ + typedef SGWeakPtr name##WeakPtr; SG_FWD_DECL(Canvas) SG_FWD_DECL(Element) @@ -49,9 +49,21 @@ namespace canvas SG_FWD_DECL(Map) SG_FWD_DECL(Path) SG_FWD_DECL(Text) + SG_FWD_DECL(Window) SG_FWD_DECL(Event) + SG_FWD_DECL(CustomEvent) + SG_FWD_DECL(DeviceEvent) + SG_FWD_DECL(KeyboardEvent) SG_FWD_DECL(MouseEvent) + +#undef SG_FWD_DECL + +#define SG_FWD_DECL(name)\ + class name;\ + typedef boost::shared_ptr name##Ptr;\ + typedef boost::weak_ptr name##WeakPtr; + SG_FWD_DECL(Placement) SG_FWD_DECL(SystemAdapter) @@ -60,6 +72,9 @@ namespace canvas class EventManager; class EventVisitor; + struct EventTarget; + typedef std::deque EventPropagationPath; + typedef std::map Style; typedef ElementPtr (*ElementFactory)( const CanvasWeakPtr&, const SGPropertyNode_ptr&,