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

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

Revision: 701
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=701&view=rev
Author:   pstieber
Date:     2009-02-16 21:03:09 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
Removed unused data from the event frame base class.

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

Modified: trunk/jazz/src/EventFrame.cpp
===================================================================
--- trunk/jazz/src/EventFrame.cpp	2009-02-16 20:49:52 UTC (rev 700)
+++ trunk/jazz/src/EventFrame.cpp	2009-02-16 21:03:09 UTC (rev 701)
@@ -4,7 +4,6 @@
 #include "Dialogs.h"
 #include "EventWindow.h"
 #include "Filter.h"
-#include "MouseAction.h"
 #include "Resources.h"
 #include "ToolBar.h"
 
@@ -38,28 +37,18 @@
   const wxSize& Size,
   long WindowStyle)
   : wxFrame(pParent, wxID_ANY, Title, Position, Size, WindowStyle),
-    Song(pSong),
     mpFilter(0),
-    mTopInfoHeight(40),
-    mEventsX(),
-    mEventsY(mTopInfoHeight),
-    mEventsWidth(0),
-    mEventsHeight(0),
-    SnapSel(0),
-    MouseAction(0),
     MixerForm(0),
     mpToolBar(0),
     mpEventWindow(0)
 {
-  mpFilter = new JZFilter(Song);
+  mpFilter = new JZFilter(pSong);
 }
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 JZEventFrame::~JZEventFrame()
 {
-  delete SnapSel;
-
   delete mpFilter;
 
   delete mpToolBar;
@@ -81,76 +70,6 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-//void JZEventFrame::SnapSelStart(wxMouseEvent& MouseEvent)
-//{
-//}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//void JZEventFrame::SnapSelStop(wxMouseEvent& MouseEvent)
-//{
-//}
-
-//-----------------------------------------------------------------------------
-// seems to handle the "selection" rectangle. normally called from the base
-// class onmouseevent handler
-//-----------------------------------------------------------------------------
-/*
-int JZEventFrame::OnMouseEvent(wxMouseEvent& MouseEvent)
-{
-//  cout << "JZEventFrame::OnMouseEvent" << endl;
-  if (!MouseAction)
-  {
-    // create SnapSel?
-    int x;
-    int y;
-    MouseEvent.GetPosition(&x, &y);
-    if (
-      mEventsX < x &&
-      x < mEventsX + mEventsWidth &&
-      mEventsY < y &&
-      y < mEventsY + mEventsHeight)
-    {
-      if (MouseEvent.LeftDown())
-      {
-        {
-          SnapSelStart(MouseEvent);
-
-          if (SnapSel->IsSelected())
-          {
-            Refresh(); //redraw the whole window instead(inefficient, we should rather invalidate a rect)
-          }
-          SnapSel->ProcessMouseEvent(MouseEvent);
-          MouseAction = SnapSel;
-        }
-      }
-    }
-  }
-  else
-  {
-    // MouseAction active
-
-    if (MouseAction->ProcessMouseEvent(MouseEvent))
-    {
-      // MouseAction finished
-
-      if (MouseAction == SnapSel)
-      {
-        SnapSelStop(MouseEvent);
-        Redraw(); //ineficcient, invalidate rect first instead
-        MouseAction = 0;
-        return 1;
-      }
-
-      MouseAction = 0;
-    }
-  }
-  return 0;
-}
-*/
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
 bool JZEventFrame::OnKeyEvent(wxKeyEvent& KeyEvent)
 {
   return false;

Modified: trunk/jazz/src/EventFrame.h
===================================================================
--- trunk/jazz/src/EventFrame.h	2009-02-16 20:49:52 UTC (rev 700)
+++ trunk/jazz/src/EventFrame.h	2009-02-16 21:03:09 UTC (rev 701)
@@ -27,10 +27,8 @@
 
 class JZEventWindow;
 class JZFilter;
-class JZSnapSelection;
 class JZSong;
 class JZToolBar;
-class tMouseAction;
 class wxDialog;
 
 //*****************************************************************************
@@ -40,7 +38,6 @@
 // class.
 // Functionality:
 //   - Settings dialog
-//   - Selection via Snapsel
 //*****************************************************************************
 class JZEventFrame : public wxFrame
 {
@@ -59,11 +56,7 @@
 
     virtual void SetEventWindow(JZEventWindow* pEventWindow);
 
-//    virtual void SnapSelStart(wxMouseEvent &e);
-//    virtual void SnapSelStop(wxMouseEvent &e);
-
     // Events
-//    virtual int  OnMouseEvent(wxMouseEvent& Event);
     virtual bool OnKeyEvent(wxKeyEvent& Event); // true = processed by eventwin
     virtual bool OnClose();
 
@@ -71,20 +64,8 @@
     virtual void Redraw();
 
 
-
-
-    JZSong* Song;
-
     JZFilter* mpFilter;
 
-    int mTopInfoHeight;
-
-    int mEventsX, mEventsY, mEventsWidth, mEventsHeight;
-
-    // Mouse handling
-    JZSnapSelection* SnapSel;
-    tMouseAction* MouseAction;
-
     // Mixer-Dialog
     wxDialog* MixerForm;
 


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