Menu
▾
▴
SF.net SVN: jazzplusplus:[754] trunk/jazz
|
From: <pst...@us...> - 2010-04-25 05:19:21
|
Revision: 754
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=754&view=rev
Author: pstieber
Date: 2010-04-25 05:19:15 +0000 (Sun, 25 Apr 2010)
Log Message:
-----------
1. Replaced old Controller dialog with a new version. This still isn't functional.
2. Removed the tNamedValueListValidator class.
Modified Paths:
--------------
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/Makefile.am
trunk/jazz/src/PropertyListDialog.cpp
trunk/jazz/src/PropertyListDialog.h
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Added Paths:
-----------
trunk/jazz/src/Dialogs/ControllerDialog.cpp
trunk/jazz/src/Dialogs/ControllerDialog.h
Added: trunk/jazz/src/Dialogs/ControllerDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/ControllerDialog.cpp (rev 0)
+++ trunk/jazz/src/Dialogs/ControllerDialog.cpp 2010-04-25 05:19:15 UTC (rev 754)
@@ -0,0 +1,58 @@
+#include "ControllerDialog.h"
+
+#include "../Configuration.h"
+#include "../Globals.h"
+
+#include <wx/button.h>
+#include <wx/listbox.h>
+#include <wx/sizer.h>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZControllerDialog, wxDialog)
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZControllerDialog::JZControllerDialog(wxWindow* pParent)
+ : wxDialog(pParent, wxID_ANY, wxString("Controller")),
+ mpControllerListBox(0)
+{
+ mpControllerListBox = new wxListBox(this, wxID_ANY);
+
+ const vector<pair<string, int> >& VoiceNames = gpConfig->GetControlNames();
+ for (
+ vector<pair<string, int> >::const_iterator iName = VoiceNames.begin();
+ iName != VoiceNames.end();
+ ++iName)
+ {
+ mpControllerListBox->Append(iName->first.c_str());
+ }
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ pTopSizer->Add(mpControllerListBox, 0, wxGROW | wxALL, 2);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
+}
Property changes on: trunk/jazz/src/Dialogs/ControllerDialog.cpp
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/jazz/src/Dialogs/ControllerDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/ControllerDialog.h (rev 0)
+++ trunk/jazz/src/Dialogs/ControllerDialog.h 2010-04-25 05:19:15 UTC (rev 754)
@@ -0,0 +1,44 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2010 Peter J. Stieber, all rights reserved.
+//
+// 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_CONTROLLERDIALOG_H
+#define JZ_CONTROLLERDIALOG_H
+
+
+#include <wx/dialog.h>
+
+class wxListBox;
+
+//*****************************************************************************
+//*****************************************************************************
+class JZControllerDialog : public wxDialog
+{
+ public:
+
+ JZControllerDialog(wxWindow* pParent);
+
+ private:
+
+ wxListBox* mpControllerListBox;
+
+ DECLARE_EVENT_TABLE();
+};
+
+#endif // !defined(JZ_CONTROLLERDIALOG_H)
Property changes on: trunk/jazz/src/Dialogs/ControllerDialog.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2010-04-25 05:07:21 UTC (rev 753)
+++ trunk/jazz/src/Dialogs.cpp 2010-04-25 05:19:15 UTC (rev 754)
@@ -25,6 +25,7 @@
#include "ClockDialog.h"
#include "Command.h"
#include "DeprecatedWx/proplist.h"
+#include "Dialogs/ControllerDialog.h"
#include "Dialogs/KeyOnDialog.h"
#include "Dialogs/ProgramChangeDialog.h"
//#include "EventFrame.h"
@@ -107,43 +108,43 @@
// SearchReplace
//*****************************************************************************
-int tSearchReplaceDlg::frCtrl = 1;
-int tSearchReplaceDlg::toCtrl = 1;
+//int tSearchReplaceDlg::frCtrl = 1;
+//int tSearchReplaceDlg::toCtrl = 1;
+//
+//tSearchReplaceDlg::tSearchReplaceDlg(JZEventWindow* w, JZFilter *f)
+// : tPropertyListDlg("Search and replace controller types" )
+//{
+// Filter = f;
+// Song = f->GetSong();
+//}
-tSearchReplaceDlg::tSearchReplaceDlg(JZEventWindow* w, JZFilter *f)
- : tPropertyListDlg("Search and replace controller types" )
-{
- Filter = f;
- Song = f->GetSong();
-}
+//bool tSearchReplaceDlg::OnClose()
+//{
+// tCmdSearchReplace sr(Filter, frCtrl - 1, toCtrl-1);
+// sr.Execute();
+//
+// JZProjectManager::Instance()->UpdateAllViews();
+//
+// return false;
+//}
-bool tSearchReplaceDlg::OnClose()
-{
- tCmdSearchReplace sr(Filter, frCtrl - 1, toCtrl-1);
- sr.Execute();
+//void tSearchReplaceDlg::AddProperties()
+//{
+// sheet->AddProperty(new wxProperty(
+// "Search",
+// tNamedValueListValue(&frCtrl, gpConfig->GetControlNames()),
+// "props",
+// new tNamedValueListValidator(gpConfig->GetControlNames())));
+//
+// sheet->AddProperty(new wxProperty(
+// "Replace",
+// tNamedValueListValue(&toCtrl, gpConfig->GetControlNames()),
+// "props",
+// new tNamedValueListValidator(gpConfig->GetControlNames())));
+//}
- JZProjectManager::Instance()->UpdateAllViews();
- return false;
-}
-void tSearchReplaceDlg::AddProperties()
-{
- sheet->AddProperty(new wxProperty(
- "Search",
- tNamedValueListValue(&frCtrl, gpConfig->GetControlNames()),
- "props",
- new tNamedValueListValidator(gpConfig->GetControlNames())));
-
- sheet->AddProperty(new wxProperty(
- "Replace",
- tNamedValueListValue(&toCtrl, gpConfig->GetControlNames()),
- "props",
- new tNamedValueListValidator(gpConfig->GetControlNames())));
-}
-
-
-
//*****************************************************************************
// seqLength
//*****************************************************************************
@@ -385,66 +386,6 @@
tChEventDlg::AddProperties();
}
-// -------------------------------- Controller ---------------------------
-
-class tControlDlg : public tChEventDlg
-{
- public:
-
- int Value;
- int Control;
- //tNamedChoice Choice;
-
- tControlDlg(tControl *e, JZPianoWindow* w, JZTrack *t);
-
- void AddProperties();
- bool OnClose();
-};
-
-
-tControlDlg::tControlDlg(tControl* pControl, JZPianoWindow* w, JZTrack *t)
- : tChEventDlg(pControl, w, t)//,
-// Choice("Controller", &gpConfig->GetCtrlName(0), &Control)
-{
- Event = pControl;
- Value = pControl->GetControlValue();
- Control = pControl->GetControl() + 1;
-}
-
-
-bool tControlDlg::OnClose()
-{
- ((tControl *)Copy)->SetControlValue(Value);
- // Choice.GetValue();
- ((tControl *)Copy)->SetControl(Control - 1);
- return tChEventDlg::OnClose();
-}
-
-void tControlDlg::AddProperties()
-{
- // Add(Choice.mkFormItem(300, 300));
-// Choice("Controller", &gpConfig->GetCtrlName(0), &Control)
- sheet->AddProperty(new wxProperty(
- "Controller",
- tNamedValueListValue(&Control, gpConfig->GetControlNames()),
- "props",
- new tNamedValueListValidator(gpConfig->GetControlNames())));
-
- sheet->AddProperty(new wxProperty(
- "Value",
- wxPropertyValue(&Value),
- "integer",
- new wxIntegerListValidator(0, 127)));
-
-// Add(wxMakeFormShort(
-// "Value:",
-// &Value,
-// wxFORM_DEFAULT,
-// new wxList(wxMakeConstraintRange(0.0, 127.0), 0)));
-
- tChEventDlg::AddProperties();
-}
-
// -------------------------------- Play track ---------------------------
class tPlayTrackDlg : public tEventDlg
@@ -591,56 +532,7 @@
}
-#ifdef DEPRECATED
-// -------------------------------- Program ---------------------------
-class tProgramDlg : public tEventDlg
-{
-public:
-
- int Program;
- // tNamedChoice Choice;
-
- tProgramDlg(tProgram *e, JZPianoWindow* w, JZTrack *t);
-
- void AddProperties();
- bool OnClose();
-};
-
-
-tProgramDlg::tProgramDlg(tProgram* pProgram, JZPianoWindow* w, JZTrack *t)
- : tEventDlg(pProgram, w, t),
- Program(pProgram->GetProgram() + 1)//,
-// Choice("Program", &gpConfig->GetVoiceName(0), &Program)
-{
- Event = pProgram;
-}
-
-
-bool tProgramDlg::OnClose()
-{
-// Choice.GetValue();
- if (Program <= 0)
- {
- Program = 1;
- }
- ((tProgram *)Copy)->SetProgram(Program - 1);
- return tEventDlg::OnClose();
-}
-
-void tProgramDlg::AddProperties()
-{
- //Add(Choice.mkFormItem(300, 300));
- sheet->AddProperty(new wxProperty(
- "Program",
- tNamedValueListValue(&Program, gpConfig->GetVoiceNames()),
- "props",
- new tNamedValueListValidator(gpConfig->GetVoiceNames())));
-}
-#endif // DEPRECATED
-
-
-
// -------------------------------- Set Tempo -------------------------------
class tSetTempoDlg : public tEventDlg
@@ -946,16 +838,20 @@
break;
case StatControl:
- str = "Controller";
- dlg = new tControlDlg(e->IsControl(), pPianoWindow, t);
+// str = "Controller";
+// dlg = new tControlDlg(e->IsControl(), pPianoWindow, t);
+ {
+ JZControllerDialog ControllerDialog(pPianoWindow);
+ ControllerDialog.ShowModal();
+ }
break;
case StatProgram:
- {
// str = "Program Change";
// dlg = new tProgramDlg(e->IsProgram(), pPianoWindow, t);
- JZProgramChangeDialog ProgramChangeDialog(pPianoWindow);
- ProgramChangeDialog.ShowModal();
+ {
+ JZProgramChangeDialog ProgramChangeDialog(pPianoWindow);
+ ProgramChangeDialog.ShowModal();
}
break;
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2010-04-25 05:07:21 UTC (rev 753)
+++ trunk/jazz/src/Dialogs.h 2010-04-25 05:19:15 UTC (rev 754)
@@ -50,24 +50,24 @@
// void OnHelp();
//};
-class tSearchReplaceDlg : public tPropertyListDlg
-{
- public:
+//class tSearchReplaceDlg : public tPropertyListDlg
+//{
+// public:
+//
+// static int frCtrl;
+// static int toCtrl;
+///* tNamedChoice frList; */
+///* tNamedChoice toList; */
+//
+// JZFilter *Filter;
+// JZSong *Song;
+//
+// tSearchReplaceDlg(JZEventWindow* w, JZFilter *f);
+// void AddProperties();
+// bool OnClose();
+// void OnHelp();
+//};
- static int frCtrl;
- static int toCtrl;
-/* tNamedChoice frList; */
-/* tNamedChoice toList; */
-
- JZFilter *Filter;
- JZSong *Song;
-
- tSearchReplaceDlg(JZEventWindow* w, JZFilter *f);
- void AddProperties();
- bool OnClose();
- void OnHelp();
-};
-
// seqLength
class tSeqLengthDlg : public tPropertyListDlg
{
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2010-04-25 05:07:21 UTC (rev 753)
+++ trunk/jazz/src/Makefile.am 2010-04-25 05:19:15 UTC (rev 754)
@@ -23,6 +23,7 @@
DeprecatedWx/propform.cpp \
DeprecatedWx/proplist.cpp \
Dialogs/CleanupDialog.cpp \
+Dialogs/ControllerDialog.cpp \
Dialogs/DeleteDialog.cpp \
Dialogs/FilterDialog.cpp \
Dialogs/IntegerEdit.cpp \
@@ -113,6 +114,7 @@
DeprecatedWx/propform.cpp \
DeprecatedWx/proplist.cpp \
Dialogs/CleanupDialog.cpp \
+Dialogs/ControllerDialog.cpp \
Dialogs/DeleteDialog.cpp \
Dialogs/FilterDialog.cpp \
Dialogs/IntegerEdit.cpp \
@@ -208,6 +210,7 @@
DeprecatedWx/proplist.h \
DeprecatedStringUtils.h \
Dialogs/CleanupDialog.h \
+Dialogs/ControllerDialog.h \
Dialogs/DeleteDialog.h \
Dialogs/FilterDialog.h \
Dialogs/IntegerEdit.h \
Modified: trunk/jazz/src/PropertyListDialog.cpp
===================================================================
--- trunk/jazz/src/PropertyListDialog.cpp 2010-04-25 05:07:21 UTC (rev 753)
+++ trunk/jazz/src/PropertyListDialog.cpp 2010-04-25 05:19:15 UTC (rev 754)
@@ -223,223 +223,3 @@
<< "tPropertyListDlg::AddProperties should never be called, override!"
<< endl;
}
-
-/////////////////////////////////////////////////////////////
-// in constructor: init the delegate with strings from the nam/value array
-
-// map integer on string and show it
-
-// map string on integer and store it
-
-tNamedValueListValidator::tNamedValueListValidator(
- const vector<pair<string, int> >& Values)
- : mValues(Values)
-{
- wxStringList* stringlist = new wxStringList();
- for (
- vector<pair<string, int> >::const_iterator iValue = mValues.begin();
- iValue != mValues.end();
- ++iValue)
- {
- // omit empty entries
- if (!iValue->first.empty())
- {
- stringlist->Add(wxString(iValue->first.c_str()));
- }
- }
-
- // copied from base(cant call base constructors)
- m_strings = stringlist;
-
- // If no constraint, we just allow the string to be edited.
- if (!m_strings && ((m_validatorFlags & wxPROP_ALLOW_TEXT_EDITING) == 0))
- {
- m_validatorFlags |= wxPROP_ALLOW_TEXT_EDITING;
- }
-}
-
-tNamedValueListValidator::~tNamedValueListValidator()
-{
-}
-
-int tNamedValueListValidator::MapName2Value(const char* Selection)
-{
- int Result = 0;
-
- if (Selection)
- {
- for (
- vector<pair<string, int> >::const_iterator iValue = mValues.begin();
- iValue != mValues.end();
- ++iValue)
- {
- if (!strcmp(Selection, iValue->first.c_str()))
- {
- Result = iValue->second;
- break;
- }
- }
- }
- return Result;
-}
-
-
-wxString tNamedValueListValidator::MapValue2Name(int value)
-{
- for (
- vector<pair<string, int> >::const_iterator iValue = mValues.begin();
- iValue != mValues.end();
- ++iValue)
- {
- if (value == iValue->second)
- {
- return wxString(iValue->first.c_str());
- }
- }
- return ::wxEmptyString;
-}
-
-// it appears not to be possible to get the validator to provide the value to
-// be displayed in the property list.
-// wxPropertyValue.GetStringRepresentation() is used for that.
-
-// fetch property value and display it
-bool tNamedValueListValidator::OnDisplayValue(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- if (!pView->GetValueText())
- {
- return false;
- }
-
- // fetch the int value of the property, convert it to a name
- wxString str=MapValue2Name(pProperty->GetValue().IntegerValue());
-
- pView->GetValueText()->SetValue(str);
- cout << "tNamedValueListValidator::OnDisplayValue " << str <<endl;
- if (
- m_strings &&
- pView->GetValueList() &&
- pView->GetValueList()->IsShown() &&
- pView->GetValueList()->GetCount() > 0)
- {
- pView->GetValueList()->SetStringSelection(str);
- }
- return true;
-
-// return wxStringListValidator::OnDisplayValue(pProperty, pView, pParent);
-}
-
-// update the property from the control
-bool tNamedValueListValidator::OnRetrieveValue(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- if (!pView->GetValueText())
- {
- return false;
- }
- wxString value(pView->GetValueText()->GetValue());
- pProperty->GetValue() = (long)MapName2Value(value);
- cout
- << "tNamedValueListValidator::OnRetrieveValue "
- << pProperty->GetValue().IntegerValue()
- << endl;
-// pView->GetValueText()->SetValue("apa!");
-
- return true;
-
-// return wxStringListValidator::OnRetrieveValue(pProperty, pView, pParent);
-}
-
-
-bool tNamedValueListValidator::OnSelect(
- bool select,
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnSelect(select, pProperty, pView, pParent);
-}
-
-bool tNamedValueListValidator::OnDoubleClick(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnDoubleClick(pProperty, pView, pParent);
-}
-
-bool tNamedValueListValidator::OnValueListSelect(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- wxString s(pView->GetValueList()->GetStringSelection());
- cout <<"tNamedValueListValidator::OnValueListSelect "<<s<<endl;
- if (s != wxT(""))
- {
- pView->GetValueText()->SetValue(s);
- pView->RetrieveProperty(pProperty); //i think this displays the prop
- }
- return true;
-
-// return wxStringListValidator::OnValueListSelect(pProperty, pView, pParent);
-}
-
-bool tNamedValueListValidator::OnPrepareControls(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnPrepareControls(pProperty, pView, pParent);
-}
-
-bool tNamedValueListValidator::OnClearControls(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnClearControls(pProperty, pView, pParent);
-}
-
-bool tNamedValueListValidator::OnPrepareDetailControls(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnPrepareDetailControls(
- pProperty,
- pView,
- pParent);
-}
-
-bool tNamedValueListValidator::OnClearDetailControls(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnClearDetailControls(
- pProperty,
- pView,
- pParent);
-}
-
-void tNamedValueListValidator::OnEdit(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnEdit(pProperty, pView, pParent);
-}
-
-bool tNamedValueListValidator::OnCheckValue(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParent)
-{
- return wxStringListValidator::OnCheckValue(pProperty, pView, pParent);
-}
Modified: trunk/jazz/src/PropertyListDialog.h
===================================================================
--- trunk/jazz/src/PropertyListDialog.h 2010-04-25 05:07:21 UTC (rev 753)
+++ trunk/jazz/src/PropertyListDialog.h 2010-04-25 05:19:15 UTC (rev 754)
@@ -35,140 +35,29 @@
#ifndef JZ_PROPERTYLISTDIALOG_H
#define JZ_PROPERTYLISTDIALOG_H
-#include "NamedValue.h"
#include "DeprecatedWx/proplist.h"
#include "DeprecatedWx/propform.h"
-#include <vector>
-#include <string>
-
-class tNamedValueListValue : public wxPropertyValue
+class tPropertyListDlg
{
-// DECLARE_DYNAMIC_CLASS(tNamedValueListValue)
-
public:
-// tNamedValueListValue()
-// : wxPropertyValue()
-// {
-// }
-
- tNamedValueListValue(
- int* pValue,
- const std::vector<std::pair<std::string, int> >& Pairs)
- : wxPropertyValue(pValue),
- mPairs(Pairs)
+ tPropertyListDlg(wxString title);
+ virtual ~tPropertyListDlg()
{
}
+ virtual void AddProperties();
+ void Create();
+ void CreateModal();
+ virtual bool OnClose();
+ virtual void OnPropertyChanged(wxProperty* pProperty);
- //overriding these doesnt really work in the display area
-/* virtual wxString GetStringRepresentation(void){ */
-/* cout <<"GetStringRepresentation"<<endl; */
-/* return wxString("apa"); */
-/* } */
-/* int IntegerValue(){ */
-/* return 42; */
-/* } */
+ protected:
- private:
-
-// tNamedValue* nval;
- const std::vector<std::pair<std::string, int> >& mPairs;
+ wxPropertySheet* sheet;
+ wxPropertyListView* view;
+ wxPropertyValidatorRegistry *myListValidatorRegistry;//cannot be a temporary! leads to a crash
+ wxString title;
};
-
-class tPropertyListDlg
-{
- public:
- tPropertyListDlg(wxString title);
- virtual ~tPropertyListDlg()
- {
- }
- virtual void AddProperties();
- void Create();
- void CreateModal();
- virtual bool OnClose();
- virtual void OnPropertyChanged(wxProperty* pProperty);
- protected:
- wxPropertySheet* sheet;
- wxPropertyListView* view;
- wxPropertyValidatorRegistry *myListValidatorRegistry;//cannot be a temporary! leads to a crash
- wxString title;
-
-};
-
-class tNamedValueListValidator : public wxStringListValidator
-{
- public:
-
- tNamedValueListValidator(
- const std::vector<std::pair<std::string, int> >& Values);
-
- ~tNamedValueListValidator();
-
- int MapName2Value(const char* pSelection);
-
- wxString MapValue2Name(int Value);
-
- virtual bool OnSelect(
- bool Select,
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParentWindow);
-
- virtual bool OnDoubleClick(
- wxProperty* WXUNUSED(pProperty),
- wxPropertyListView* WXUNUSED(pView),
- wxWindow* WXUNUSED(pParentWindow));
-
- virtual bool OnValueListSelect(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParentWindow);
-
- virtual bool OnPrepareControls(
- wxProperty* WXUNUSED(pProperty),
- wxPropertyListView* WXUNUSED(pView),
- wxWindow* WXUNUSED(pParentWindow));
-
- virtual bool OnClearControls(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParentWindow);
-
- virtual bool OnPrepareDetailControls(
- wxProperty* WXUNUSED(pProperty),
- wxPropertyListView* WXUNUSED(pView),
- wxWindow* WXUNUSED(pParentWindow));
-
- virtual bool OnClearDetailControls(
- wxProperty* WXUNUSED(pProperty),
- wxPropertyListView* WXUNUSED(pView),
- wxWindow* WXUNUSED(pParentWindow));
-
- virtual void OnEdit(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParentWindow);
-
- virtual bool OnCheckValue(
- wxProperty* WXUNUSED(pProperty),
- wxPropertyListView* WXUNUSED(pView),
- wxWindow* WXUNUSED(pParentWindow));
-
- virtual bool OnRetrieveValue(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow* pParentWindow);
-
- virtual bool OnDisplayValue(
- wxProperty* pProperty,
- wxPropertyListView* pView,
- wxWindow *pParentWindow);
-
- private:
-
- const std::vector<std::pair<std::string, int> >& mValues;
-};
-
#endif // !defined(JZ_PROPERTYLISTDIALOG_H)
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-04-25 05:07:21 UTC (rev 753)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2010-04-25 05:19:15 UTC (rev 754)
@@ -855,6 +855,14 @@
>
</File>
<File
+ RelativePath="..\src\Dialogs\ControllerDialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\src\Dialogs\ControllerDialog.h"
+ >
+ </File>
+ <File
RelativePath="..\src\Dialogs\DeleteDialog.cpp"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
