SF.net SVN: jazzplusplus:[977] trunk/jazz/src

[<pst...@us...>]

Revision: 977
          http://sourceforge.net/p/jazzplusplus/code/977
Author:   pstieber
Date:     2013-03-18 19:00:06 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
1. Made JZEventWindow::AreEventsSelected constant.
2. Made JZEventWindow::mpSnapSel protected.
3. Fixed a bug in JZEventWindow::OnMouseEvent.  The prior version
was inadvertently deleting the mpSnapSel data member.

Modified Paths:
--------------
    trunk/jazz/src/EventWindow.cpp
    trunk/jazz/src/EventWindow.h

Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp	2013-03-18 18:57:43 UTC (rev 976)
+++ trunk/jazz/src/EventWindow.cpp	2013-03-18 19:00:06 UTC (rev 977)
@@ -118,7 +118,7 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-bool JZEventWindow::AreEventsSelected()
+bool JZEventWindow::AreEventsSelected() const
 {
   return mpSnapSel->IsSelected();
 }
@@ -585,8 +585,11 @@
         // inefficient, invalidate rect first instead.
         Refresh();
       }
+      else
+      {
+        delete mpMouseAction;
+      }
 
-      delete mpMouseAction;
       mpMouseAction = 0;
     }
   }

Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h	2013-03-18 18:57:43 UTC (rev 976)
+++ trunk/jazz/src/EventWindow.h	2013-03-18 19:00:06 UTC (rev 977)
@@ -50,7 +50,7 @@
     // WARNING: non-constant access.
     JZProject* GetProject() const;
 
-    bool AreEventsSelected();
+    bool AreEventsSelected() const;
 
     bool EventsSelected(const wxString& Message) const;
 
@@ -117,10 +117,12 @@
 
     void OnMouseEvent(wxMouseEvent& MouseEvent);
 
-  public:
+  protected:
 
     JZSnapSelection* mpSnapSel;
 
+  public:
+
     JZFilter* mpFilter;
 
     JZMouseAction* mpMouseAction;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.