Menu
▾
▴
SF.net SVN: jazzplusplus:[678] trunk/jazz
|
From: <pst...@us...> - 2009-01-01 06:21:04
|
Revision: 678
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=678&view=rev
Author: pstieber
Date: 2009-01-01 06:20:59 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
Removed the unused KeyDialog code.
Modified Paths:
--------------
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Makefile.am
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Removed Paths:
-------------
trunk/jazz/src/KeyDialog.cpp
trunk/jazz/src/KeyDialog.h
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2009-01-01 04:22:58 UTC (rev 677)
+++ trunk/jazz/src/Dialogs.cpp 2009-01-01 06:20:59 UTC (rev 678)
@@ -30,7 +30,6 @@
#include "EventWindow.h"
#include "Globals.h"
#include "Help.h"
-#include "KeyDialog.h"
#include "NamedChoice.h"
#include "PianoFrame.h"
#include "PianoWindow.h"
@@ -88,8 +87,16 @@
void tShiftDlg::AddProperties()
{
//send wxPropertyValue REFERENCE not POINTER
- sheet->AddProperty(new wxProperty("Snaps", wxPropertyValue(&mSteps), "integer", new wxIntegerListValidator(-16, 16)));
- sheet->AddProperty(new wxProperty("clocks per snap", (long)mUnit, "integer"));//informational only
+ sheet->AddProperty(new wxProperty(
+ "Snaps",
+ wxPropertyValue(&mSteps),
+ "integer",
+ new wxIntegerListValidator(-16, 16)));
+
+ sheet->AddProperty(new wxProperty(
+ "clocks per snap",
+ (long)mUnit,
+ "integer")); // informational only
}
Deleted: trunk/jazz/src/KeyDialog.cpp
===================================================================
--- trunk/jazz/src/KeyDialog.cpp 2009-01-01 04:22:58 UTC (rev 677)
+++ trunk/jazz/src/KeyDialog.cpp 2009-01-01 06:20:59 UTC (rev 678)
@@ -1,60 +0,0 @@
-//*****************************************************************************
-// The JAZZ++ Midi Sequencer
-//
-// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//*****************************************************************************
-
-#include "KeyDialog.h"
-
-#include "KeyStringConverters.h"
-#include "DeprecatedStringUtils.h"
-#include "DeprecatedWx/proplist.h"
-
-using namespace std;
-
-JZKeyDialog::JZKeyDialog(const char* pTitle, int Key)
-{
- string KeyString;
- KeyToString(Key, KeyString);
- mpString = copystring(KeyString.c_str());
- mpTitle = pTitle;
-}
-
-
-JZKeyDialog::~JZKeyDialog()
-{
- delete mpString;
-}
-
-#ifdef OBSOLETE
-wxFormItem *JZKeyDialog::mkFormItem(int w)
-{
- return wxMakeFormString(mpTitle, &mpString, wxFORM_DEFAULT, 0, 0, 0, w);
-}
-#endif
-
-wxProperty* JZKeyDialog::mkProperty()
-{
- return new wxProperty(mpTitle, wxPropertyValue((char**)&mpString), "string");
-}
-
-int JZKeyDialog::GetKey()
-{
- return StringToKey(mpString);
-}
Deleted: trunk/jazz/src/KeyDialog.h
===================================================================
--- trunk/jazz/src/KeyDialog.h 2009-01-01 04:22:58 UTC (rev 677)
+++ trunk/jazz/src/KeyDialog.h 2009-01-01 06:20:59 UTC (rev 678)
@@ -1,51 +0,0 @@
-//*****************************************************************************
-// The JAZZ++ Midi Sequencer
-//
-// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//*****************************************************************************
-
-#ifndef JZ_KEYDIALOG_H
-#define JZ_KEYDIALOG_H
-
-class wxProperty;
-
-//*****************************************************************************
-//*****************************************************************************
-class JZKeyDialog
-{
- public:
-
- JZKeyDialog(const char* pTitle, int Key);
-
- ~JZKeyDialog();
-
- //wxFormItem *mkFormItem(int w);
-
- wxProperty* mkProperty();
-
- int GetKey();
-
- private:
-
- char* mpString;
-
- const char* mpTitle;
-};
-
-#endif // !defined(JZ_KEYDIALOG_H)
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2009-01-01 04:22:58 UTC (rev 677)
+++ trunk/jazz/src/Makefile.am 2009-01-01 06:20:59 UTC (rev 678)
@@ -48,7 +48,6 @@
HarmonyP.cpp \
Help.cpp \
JazzPlusPlusApplication.cpp \
-KeyDialog.cpp \
KeyStringConverters.cpp \
Knob.cpp \
Mapper.cpp \
@@ -127,7 +126,6 @@
HarmonyP.cpp \
Help.cpp \
JazzPlusPlusApplication.cpp \
-KeyDialog.cpp \
KeyStringConverters.cpp \
Knob.cpp \
Mapper.cpp \
@@ -211,7 +209,6 @@
HarmonyP.h \
Help.h \
JazzPlusPlusApplication.h \
-KeyDialog.h \
KeyStringConverters.h \
Mapper.h \
MeasureChoice.h \
Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-01-01 04:22:58 UTC (rev 677)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-01-01 06:20:59 UTC (rev 678)
@@ -446,14 +446,6 @@
>
</File>
<File
- RelativePath="..\src\KeyDialog.cpp"
- >
- </File>
- <File
- RelativePath="..\src\KeyDialog.h"
- >
- </File>
- <File
RelativePath="..\src\KeyStringConverters.cpp"
>
</File>
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-01-01 04:22:58 UTC (rev 677)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-01-01 06:20:59 UTC (rev 678)
@@ -445,14 +445,6 @@
>
</File>
<File
- RelativePath="..\src\KeyDialog.cpp"
- >
- </File>
- <File
- RelativePath="..\src\KeyDialog.h"
- >
- </File>
- <File
RelativePath="..\src\KeyStringConverters.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
