X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fcanvas%2Fcanvas_fwd.hxx;h=3b1b464690dcd8c1783d71de27c4853f2394b5fe;hb=519326f7518b6e8760a53db6ebebd692655ef7be;hp=4b0e41e10ccc2acca7011550fe0a992e817da118;hpb=77946585b1c9b54c4848b604eb1549e2ec55df12;p=simgear.git diff --git a/simgear/canvas/canvas_fwd.hxx b/simgear/canvas/canvas_fwd.hxx index 4b0e41e1..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,17 +49,32 @@ 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(EventListener) + 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) #undef SG_FWD_DECL + class EventManager; class EventVisitor; + struct EventTarget; + typedef std::deque EventPropagationPath; + typedef std::map Style; typedef ElementPtr (*ElementFactory)( const CanvasWeakPtr&, const SGPropertyNode_ptr&, @@ -72,6 +87,8 @@ namespace canvas typedef boost::function PlacementFactory; + typedef boost::function EventListener; + } // namespace canvas } // namespace simgear