summaryrefslogtreecommitdiffstats
path: root/src/event-context.cpp
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-07-31 19:11:20 +0000
committerMarkus Engel <markus.engel@tum.de>2013-07-31 19:11:20 +0000
commit989abbac025a8b3349748d19a613a08586c5fdcd (patch)
tree157b5f656c6344784aea3c498fa60199bd7d2958 /src/event-context.cpp
parentFurther refactoring of EventContexts. (diff)
downloadinkscape-989abbac025a8b3349748d19a613a08586c5fdcd.tar.gz
inkscape-989abbac025a8b3349748d19a613a08586c5fdcd.zip
Fixed SPObject ctor and dtor; removed singleton.h; some smaller changes.
(bzr r11608.1.110)
Diffstat (limited to 'src/event-context.cpp')
-rw-r--r--src/event-context.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event-context.cpp b/src/event-context.cpp
index bea5f63f6..e5ea85818 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -104,7 +104,7 @@ SPEventContext::SPEventContext() {
this->desktop = NULL;
this->cursor = NULL;
- this->_message_context = NULL;
+ this->message_context = NULL;
this->_selcue = NULL;
this->_grdrag = NULL;
this->space_panning = false;
@@ -115,8 +115,8 @@ SPEventContext::SPEventContext() {
}
SPEventContext::~SPEventContext() {
- if (this->_message_context) {
- delete this->_message_context;
+ if (this->message_context) {
+ delete this->message_context;
}
if (this->cursor != NULL) {
@@ -704,7 +704,7 @@ bool SPEventContext::root_handler(GdkEvent* event) {
panning = 4;
this->space_panning = true;
- this->_message_context->set(Inkscape::INFORMATION_MESSAGE,
+ this->message_context->set(Inkscape::INFORMATION_MESSAGE,
_("<b>Space+mouse move</b> to pan canvas"));
ret = TRUE;
@@ -728,7 +728,7 @@ bool SPEventContext::root_handler(GdkEvent* event) {
// Stop panning on any key release
if (this->space_panning) {
this->space_panning = false;
- this->_message_context->clear();
+ this->message_context->clear();
}
if (panning) {