diff options
| author | Markus Engel <markus.engel@tum.de> | 2013-04-20 21:19:46 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2013-04-20 21:19:46 +0000 |
| commit | 65ba6ad9a82f8f47974eb10665478fd783692bb5 (patch) | |
| tree | 21ecad9197b19c636e7950503ea8f2a9a5366194 /src/pen-context.h | |
| parent | Further changes to EventContexts; they work without GObject (diff) | |
| download | inkscape-65ba6ad9a82f8f47974eb10665478fd783692bb5.tar.gz inkscape-65ba6ad9a82f8f47974eb10665478fd783692bb5.zip | |
Merging of EventContext classes complete.
(bzr r11608.1.98)
Diffstat (limited to 'src/pen-context.h')
| -rw-r--r-- | src/pen-context.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/pen-context.h b/src/pen-context.h index 0a2e41af6..6ae31eab0 100644 --- a/src/pen-context.h +++ b/src/pen-context.h @@ -8,13 +8,8 @@ #include "draw-context.h" #include "live_effects/effect.h" -#define SP_TYPE_PEN_CONTEXT (sp_pen_context_get_type()) -//#define SP_PEN_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_PEN_CONTEXT, SPPenContext)) -#define SP_PEN_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SP_TYPE_PEN_CONTEXT, SPPenContextClass)) -//#define SP_IS_PEN_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_PEN_CONTEXT)) -#define SP_IS_PEN_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_PEN_CONTEXT)) #define SP_PEN_CONTEXT(obj) ((SPPenContext*)obj) -#define SP_IS_PEN_CONTEXT(obj) (((SPEventContext*)obj)->types.count(typeid(SPPenContext))) +#define SP_IS_PEN_CONTEXT(obj) (dynamic_cast<const SPPenContext*>((const SPEventContext*)obj)) enum { SP_PEN_CONTEXT_POINT, @@ -30,15 +25,13 @@ enum { struct SPCtrlLine; -class CPenContext; - /** * SPPenContext: a context for pen tool events. */ class SPPenContext : public SPDrawContext { public: SPPenContext(); - CPenContext* cpencontext; + virtual ~SPPenContext(); Geom::Point p[5]; @@ -66,14 +59,6 @@ public: unsigned int events_disabled : 1; static const std::string prefsPath; -}; - -/// The SPPenContext vtable (empty). -struct SPPenContextClass : public SPEventContextClass { }; - -class CPenContext : public CDrawContext { -public: - CPenContext(SPPenContext* pencontext); virtual void setup(); virtual void finish(); @@ -82,13 +67,8 @@ public: virtual gint item_handler(SPItem* item, GdkEvent* event); virtual const std::string& getPrefsPath(); - -private: - SPPenContext* sppencontext; }; -GType sp_pen_context_get_type(); - inline bool sp_pen_context_has_waiting_LPE(SPPenContext *pc) { // note: waiting_LPE_type is defined in SPDrawContext return (pc->waiting_LPE != NULL || |