From e58cac52b258e64c2cc88b0044bf9cfbaecedce2 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 00:23:07 +0200 Subject: Started conversion of SPEventContext tree; added virtual pads to all classes. (bzr r11608.1.89) --- src/gradient-context.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index 464b95ad4..a0d6d5a07 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -25,7 +25,11 @@ #define SP_IS_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_GRADIENT_CONTEXT)) #define SP_IS_GRADIENT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_GRADIENT_CONTEXT)) -struct SPGradientContext : public SPEventContext { +class CGradientContext; + +class SPGradientContext : public SPEventContext { +public: + CGradientContext* cgradientcontext; Geom::Point origin; @@ -45,6 +49,17 @@ struct SPGradientContextClass { SPEventContextClass parent_class; }; +class CGradientContext : public CEventContext { +public: + CGradientContext(SPGradientContext* gradientcontext); + + virtual void setup(); + virtual gint root_handler(GdkEvent* event); + +private: + SPGradientContext* spgradientcontext; +}; + /* Standard Gtk function */ GType sp_gradient_context_get_type(); -- cgit v1.2.3 From 1d8f1753cd8cab38d19fcc26a4ad70ba2e794ac8 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 9 Apr 2013 22:12:07 +0200 Subject: Added constructors to EventContext tree / some missing virtual pads. (bzr r11608.1.90) --- src/gradient-context.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index a0d6d5a07..1746c9a73 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -29,6 +29,7 @@ class CGradientContext; class SPGradientContext : public SPEventContext { public: + SPGradientContext(); CGradientContext* cgradientcontext; Geom::Point origin; -- cgit v1.2.3 From fbb85064cfaaf03cc09bacedb16a8561f61f2b3d Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 00:37:18 +0200 Subject: Added prefPaths to contexts; modified SPFactory (bzr r11608.1.94) --- src/gradient-context.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index 1746c9a73..c6bbdc491 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -44,6 +44,8 @@ public: sigc::connection *selcon; sigc::connection *subselcon; + + static const std::string prefsPath; }; struct SPGradientContextClass { -- cgit v1.2.3 From fbdc8b84ff670c684dafc7d7d403ed01e7077e70 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 13 Apr 2013 18:13:17 +0200 Subject: Replaced casting macros for EventContext tree; added contructors. (bzr r11608.1.96) --- src/gradient-context.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index c6bbdc491..b53f2da20 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -20,10 +20,12 @@ #include "event-context.h" #define SP_TYPE_GRADIENT_CONTEXT (sp_gradient_context_get_type()) -#define SP_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_GRADIENT_CONTEXT, SPGradientContext)) +//#define SP_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_GRADIENT_CONTEXT, SPGradientContext)) #define SP_GRADIENT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SP_TYPE_GRADIENT_CONTEXT, SPGradientContextClass)) -#define SP_IS_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_GRADIENT_CONTEXT)) +//#define SP_IS_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_GRADIENT_CONTEXT)) #define SP_IS_GRADIENT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_GRADIENT_CONTEXT)) +#define SP_GRADIENT_CONTEXT(obj) ((SPGradientContext*)obj) +#define SP_IS_GRADIENT_CONTEXT(obj) (((SPEventContext*)obj)->types.count(typeid(SPGradientContext))) class CGradientContext; @@ -59,6 +61,7 @@ public: virtual void setup(); virtual gint root_handler(GdkEvent* event); + virtual const std::string& getPrefsPath(); private: SPGradientContext* spgradientcontext; }; -- cgit v1.2.3 From 65ba6ad9a82f8f47974eb10665478fd783692bb5 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 20 Apr 2013 23:19:46 +0200 Subject: Merging of EventContext classes complete. (bzr r11608.1.98) --- src/gradient-context.h | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index b53f2da20..798647bf3 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -19,20 +19,13 @@ #include #include "event-context.h" -#define SP_TYPE_GRADIENT_CONTEXT (sp_gradient_context_get_type()) -//#define SP_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_GRADIENT_CONTEXT, SPGradientContext)) -#define SP_GRADIENT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), SP_TYPE_GRADIENT_CONTEXT, SPGradientContextClass)) -//#define SP_IS_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_GRADIENT_CONTEXT)) -#define SP_IS_GRADIENT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_GRADIENT_CONTEXT)) #define SP_GRADIENT_CONTEXT(obj) ((SPGradientContext*)obj) -#define SP_IS_GRADIENT_CONTEXT(obj) (((SPEventContext*)obj)->types.count(typeid(SPGradientContext))) - -class CGradientContext; +#define SP_IS_GRADIENT_CONTEXT(obj) (dynamic_cast((const SPEventContext*)obj)) class SPGradientContext : public SPEventContext { public: SPGradientContext(); - CGradientContext* cgradientcontext; + virtual ~SPGradientContext(); Geom::Point origin; @@ -48,27 +41,13 @@ public: sigc::connection *subselcon; static const std::string prefsPath; -}; - -struct SPGradientContextClass { - SPEventContextClass parent_class; -}; - -class CGradientContext : public CEventContext { -public: - CGradientContext(SPGradientContext* gradientcontext); virtual void setup(); virtual gint root_handler(GdkEvent* event); virtual const std::string& getPrefsPath(); -private: - SPGradientContext* spgradientcontext; }; -/* Standard Gtk function */ -GType sp_gradient_context_get_type(); - void sp_gradient_context_select_next (SPEventContext *event_context); void sp_gradient_context_select_prev (SPEventContext *event_context); void sp_gradient_context_add_stops_between_selected_stops (SPGradientContext *rc); -- cgit v1.2.3 From 389b871cdea29ace85567863c439eb0537a36f54 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 21 Apr 2013 20:45:27 +0200 Subject: Cleaned up a bit. (bzr r11608.1.102) --- src/gradient-context.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index 798647bf3..21418f89e 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -46,6 +46,9 @@ public: virtual gint root_handler(GdkEvent* event); virtual const std::string& getPrefsPath(); + +private: + void selection_changed(Inkscape::Selection*); }; void sp_gradient_context_select_next (SPEventContext *event_context); -- cgit v1.2.3 From b2dd3583e7372d23d18bbc6e861f4f645ec3dc37 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Tue, 30 Jul 2013 23:17:21 +0200 Subject: Further refactoring of EventContexts. (bzr r11608.1.109) --- src/gradient-context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index 21418f89e..0c2a7eb3d 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -43,7 +43,7 @@ public: static const std::string prefsPath; virtual void setup(); - virtual gint root_handler(GdkEvent* event); + virtual bool root_handler(GdkEvent* event); virtual const std::string& getPrefsPath(); -- cgit v1.2.3 From 989abbac025a8b3349748d19a613a08586c5fdcd Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Wed, 31 Jul 2013 21:11:20 +0200 Subject: Fixed SPObject ctor and dtor; removed singleton.h; some smaller changes. (bzr r11608.1.110) --- src/gradient-context.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index 0c2a7eb3d..fb964f904 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -35,8 +35,6 @@ public: Geom::Point mousepoint_doc; // stores mousepoint when over_line in doc coords - Inkscape::MessageContext *_message_context; - sigc::connection *selcon; sigc::connection *subselcon; -- cgit v1.2.3 From bb4246887ab6a0833cc4d2263b31f951ce314061 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sat, 14 Sep 2013 22:43:15 +0200 Subject: Modified SP_IS_ macros. (bzr r11608.1.122) --- src/gradient-context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index fb964f904..a49ea305a 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -20,7 +20,7 @@ #include "event-context.h" #define SP_GRADIENT_CONTEXT(obj) ((SPGradientContext*)obj) -#define SP_IS_GRADIENT_CONTEXT(obj) (dynamic_cast((const SPEventContext*)obj)) +#define SP_IS_GRADIENT_CONTEXT(obj) (dynamic_cast((const SPEventContext*)obj) != NULL) class SPGradientContext : public SPEventContext { public: -- cgit v1.2.3 From 5cf6efefbfd06d723973b6517b442f0ee64416b7 Mon Sep 17 00:00:00 2001 From: Markus Engel Date: Sun, 15 Sep 2013 02:43:49 +0200 Subject: Added runtime check in SP_-cast macros. (bzr r11608.1.123) --- src/gradient-context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gradient-context.h') diff --git a/src/gradient-context.h b/src/gradient-context.h index a49ea305a..7a2918f3d 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -19,7 +19,7 @@ #include #include "event-context.h" -#define SP_GRADIENT_CONTEXT(obj) ((SPGradientContext*)obj) +#define SP_GRADIENT_CONTEXT(obj) (dynamic_cast((SPEventContext*)obj)) #define SP_IS_GRADIENT_CONTEXT(obj) (dynamic_cast((const SPEventContext*)obj) != NULL) class SPGradientContext : public SPEventContext { -- cgit v1.2.3