Changeset 1322
- Timestamp:
- 12/26/07 19:51:07 (10 months ago)
- Location:
- trunk
- Files:
-
- 8 modified
-
buze-vs.sln (modified) (2 diffs)
-
buzelib-vs.vcproj (modified) (6 diffs)
-
buzz2zzub-vs.vcproj (modified) (1 diff)
-
libzzub-vs.vcproj (modified) (3 diffs)
-
src/buzelib/PropertyList/PropertyItem.h (modified) (2 diffs)
-
src/buzelib/PropertyList/PropertyItemEditors.h (modified) (1 diff)
-
src/buzelib/PropertyList/PropertyList.h (modified) (3 diffs)
-
src/buzelib/PropertyListView.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/buze-vs.sln
r1284 r1322 49 49 EndProject 50 50 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zzub_miditracker", "zzub_miditracker-vs.vcproj", "{BE0235FD-81B4-448A-B058-5BCEB1B3793F}" 51 ProjectSection(ProjectDependencies) = postProject 52 EndProjectSection 53 EndProject 54 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_waveeditor", "src\test_waveeditor\test_waveeditor.vcproj", "{A0B4EF6D-2FB6-496E-968C-286FE21E36C0}" 55 ProjectSection(ProjectDependencies) = postProject 56 EndProjectSection 57 EndProject 58 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_patterneditor", "src\test_patterneditor\test_patterneditor.vcproj", "{36A7C95B-41BB-486E-B538-131FD4EE8FF1}" 51 59 ProjectSection(ProjectDependencies) = postProject 52 60 EndProjectSection … … 110 118 {BE0235FD-81B4-448A-B058-5BCEB1B3793F}.Release.ActiveCfg = Release|Win32 111 119 {BE0235FD-81B4-448A-B058-5BCEB1B3793F}.Release.Build.0 = Release|Win32 120 {A0B4EF6D-2FB6-496E-968C-286FE21E36C0}.Debug.ActiveCfg = Debug|Win32 121 {A0B4EF6D-2FB6-496E-968C-286FE21E36C0}.Debug.Build.0 = Debug|Win32 122 {A0B4EF6D-2FB6-496E-968C-286FE21E36C0}.Release.ActiveCfg = Release|Win32 123 {A0B4EF6D-2FB6-496E-968C-286FE21E36C0}.Release.Build.0 = Release|Win32 124 {36A7C95B-41BB-486E-B538-131FD4EE8FF1}.Debug.ActiveCfg = Debug|Win32 125 {36A7C95B-41BB-486E-B538-131FD4EE8FF1}.Debug.Build.0 = Debug|Win32 126 {36A7C95B-41BB-486E-B538-131FD4EE8FF1}.Release.ActiveCfg = Release|Win32 127 {36A7C95B-41BB-486E-B538-131FD4EE8FF1}.Release.Build.0 = Release|Win32 112 128 EndGlobalSection 113 129 GlobalSection(ExtensibilityGlobals) = postSolution -
trunk/buzelib-vs.vcproj
r1274 r1322 213 213 </File> 214 214 <File 215 RelativePath=".\src\buzelib\WaveTableEditTabView.cpp">216 </File>217 <File218 215 RelativePath=".\src\buzelib\WaveTableList.cpp"> 219 </File>220 <File221 RelativePath=".\src\buzelib\WaveTableRecordTabView.cpp">222 216 </File> 223 217 <File … … 293 287 </File> 294 288 <File 295 RelativePath=".\src\buzelib\MachineIndex.h">296 </File>297 <File298 289 RelativePath=".\src\buzelib\MachineParameterView.h"> 299 290 </File> … … 347 338 </File> 348 339 <File 349 RelativePath=".\src\buzelib\SplitterWindowKey.h">350 </File>351 <File352 340 RelativePath=".\src\buzelib\stdafx.h"> 353 </File>354 <File355 RelativePath=".\src\buzelib\ToolbarWindow.h">356 341 </File> 357 342 <File … … 446 431 RelativePath=".\src\wtl\atlwinx.h"> 447 432 </File> 448 <File449 RelativePath=".\src\wtl\WtlExt.h">450 </File>451 <File452 RelativePath=".\src\wtl\WTLTabViewCtrl.h">453 </File>454 433 </Filter> 455 434 <Filter … … 769 748 <File 770 749 RelativePath=".\src\buzelib\Utils\utils.h"> 750 </File> 751 <File 752 RelativePath=".\src\buzelib\Utils\WtlExt.h"> 753 </File> 754 <File 755 RelativePath=".\src\buzelib\Utils\WTLTabViewCtrl.h"> 771 756 </File> 772 757 </Filter> … … 775 760 Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" 776 761 UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> 762 <File 763 RelativePath=".\src\buzelib\res\about.txt"> 764 </File> 777 765 <File 778 766 RelativePath=".\src\buzelib\res\buze.ico"> -
trunk/buzz2zzub-vs.vcproj
r1229 r1322 147 147 </File> 148 148 <File 149 RelativePath=".\src\zzub\src\plugins\buzz2zzub\inifile.h"> 150 </File> 151 <File 149 152 RelativePath=".\src\zzub\src\plugins\buzz2zzub\MachineInterface.h"> 150 153 </File> -
trunk/libzzub-vs.vcproj
r1229 r1322 20 20 Name="VCCLCompilerTool" 21 21 Optimization="0" 22 AdditionalIncludeDirectories="src\zzub\include;src\zzub\include\win32;src\zzub\src\flac\include;src\zzub\src\portmidi\pm_common;src\zzub\ include;src\zzub\src\flac\include;src\zzub\src\portmidi\pm_common;src\zzub\src\portmidi\portmidi;src\zzub\src\rtaudio;src\zzub\src\flac\src\libFLAC\include;src\zzub\src\zlib"23 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS_DS__;__WINDOWS_ASIO__;__WINDOWS_SILENT__;USE_SNDFILE;FLAC__NO_DLL;USE_SIGNATURE;VERSION="\"1.1.2\"" "22 AdditionalIncludeDirectories="src\zzub\include;src\zzub\include\win32;src\zzub\src\flac\include;src\zzub\src\portmidi\pm_common;src\zzub\src\portmidi\portmidi;src\zzub\src\rtaudio\;src\zzub\src\rtaudio\include;src\zzub\src\flac\src\libFLAC\include;src\zzub\src\zlib\" 23 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS_DS__;__WINDOWS_ASIO__;__WINDOWS_SILENT__;USE_SNDFILE;FLAC__NO_DLL;USE_SIGNATURE;VERSION="\"1.1.2\"";BUZZ2ZZUB" 24 24 MinimalRebuild="TRUE" 25 25 BasicRuntimeChecks="3" … … 60 60 <Tool 61 61 Name="VCCLCompilerTool" 62 AdditionalIncludeDirectories="src\zzub\include;src\zzub\include\win32;src\zzub\src\flac\include;src\zzub\src\portmidi\pm_common;src\zzub\ include;src\zzub\src\flac\include;src\zzub\src\portmidi\pm_common;src\zzub\src\portmidi\portmidi;src\zzub\src\rtaudio;src\zzub\src\flac\src\libFLAC\include;src\zzub\src\zlib\"63 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS_DS__;__WINDOWS_ASIO__;__WINDOWS_SILENT__;USE_SNDFILE;FLAC__NO_DLL;USE_SIGNATURE;VERSION="\"1.1.2\"" "62 AdditionalIncludeDirectories="src\zzub\include;src\zzub\include\win32;src\zzub\src\flac\include;src\zzub\src\portmidi\pm_common;src\zzub\src\portmidi\portmidi;src\zzub\src\rtaudio\;src\zzub\src\rtaudio\include;src\zzub\src\flac\src\libFLAC\include;src\zzub\src\zlib\" 63 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WINDOWS_DS__;__WINDOWS_ASIO__;__WINDOWS_SILENT__;USE_SNDFILE;FLAC__NO_DLL;USE_SIGNATURE;VERSION="\"1.1.2\"";BUZZ2ZZUB" 64 64 RuntimeLibrary="0" 65 65 UsePrecompiledHeader="0" … … 278 278 RelativePath=".\src\zzub\src\rtaudio\RtError.h"> 279 279 </File> 280 </Filter> 281 <Filter 282 Name="ASIO" 283 Filter=""> 284 <File 285 RelativePath=".\src\zzub\src\rtaudio\asio\asio.cpp"> 286 </File> 287 <File 288 RelativePath=".\src\zzub\src\rtaudio\asio\asio.h"> 289 </File> 290 <File 291 RelativePath=".\src\zzub\src\rtaudio\asio\asiodrivers.cpp"> 292 </File> 293 <File 294 RelativePath=".\src\zzub\src\rtaudio\asio\asiodrivers.h"> 295 </File> 296 <File 297 RelativePath=".\src\zzub\src\rtaudio\asio\asiodrvr.h"> 298 </File> 299 <File 300 RelativePath=".\src\zzub\src\rtaudio\asio\asiolist.cpp"> 301 </File> 302 <File 303 RelativePath=".\src\zzub\src\rtaudio\asio\asiolist.h"> 304 </File> 305 <File 306 RelativePath=".\src\zzub\src\rtaudio\asio\asiosys.h"> 307 </File> 308 <File 309 RelativePath=".\src\zzub\src\rtaudio\asio\ginclude.h"> 310 </File> 311 <File 312 RelativePath=".\src\zzub\src\rtaudio\asio\iasiodrv.h"> 313 </File> 314 <File 315 RelativePath=".\src\zzub\src\rtaudio\asio\iasiothiscallresolver.cpp"> 316 </File> 317 <File 318 RelativePath=".\src\zzub\src\rtaudio\asio\iasiothiscallresolver.h"> 319 </File> 280 <Filter 281 Name="ASIO" 282 Filter=""> 283 <File 284 RelativePath=".\src\zzub\src\rtaudio\include\asio.cpp"> 285 </File> 286 <File 287 RelativePath=".\src\zzub\src\rtaudio\include\asio.h"> 288 </File> 289 <File 290 RelativePath=".\src\zzub\src\rtaudio\include\asiodrivers.cpp"> 291 </File> 292 <File 293 RelativePath=".\src\zzub\src\rtaudio\include\asiodrivers.h"> 294 </File> 295 <File 296 RelativePath=".\src\zzub\src\rtaudio\include\asiodrvr.h"> 297 </File> 298 <File 299 RelativePath=".\src\zzub\src\rtaudio\include\asiolist.cpp"> 300 </File> 301 <File 302 RelativePath=".\src\zzub\src\rtaudio\include\asiolist.h"> 303 </File> 304 <File 305 RelativePath=".\src\zzub\src\rtaudio\include\asiosys.h"> 306 </File> 307 <File 308 RelativePath=".\src\zzub\src\rtaudio\include\dsound.h"> 309 </File> 310 <File 311 RelativePath=".\src\zzub\src\rtaudio\include\ginclude.h"> 312 </File> 313 <File 314 RelativePath=".\src\zzub\src\rtaudio\include\iasiodrv.h"> 315 </File> 316 <File 317 RelativePath=".\src\zzub\src\rtaudio\include\iasiothiscallresolver.cpp"> 318 </File> 319 <File 320 RelativePath=".\src\zzub\src\rtaudio\include\iasiothiscallresolver.h"> 321 </File> 322 <File 323 RelativePath=".\src\zzub\src\rtaudio\include\soundcard.h"> 324 </File> 325 </Filter> 320 326 </Filter> 321 327 <Filter -
trunk/src/buzelib/PropertyList/PropertyItem.h
r1273 r1322 39 39 #define PIN_DBLCLICK (PIN_FIRST-8) 40 40 #define PIN_ADDITEM (PIN_FIRST-9) 41 #define PIN_ITEMDELETE (PIN_FIRST-10) 41 42 42 43 // Identifiers returned by GetKind() … … 91 92 #define WM_USER_PROP_NAVIGATE WM_USER+435 92 93 #define WM_USER_PROP_SETCHECKSTATE WM_USER+436 94 #define WM_USER_PROP_DELETEPROPERTY WM_USER+437 93 95 #endif // WM_USER_xxx 94 96 -
trunk/src/buzelib/PropertyList/PropertyItemEditors.h
r1316 r1322 268 268 ::PostMessage(GetParent(), WM_USER_PROP_UPDATEPROPERTY, 0, (LPARAM) m_hWnd); 269 269 return 0; 270 case VK_DELETE: 271 ::PostMessage(GetParent(), WM_USER_PROP_DELETEPROPERTY, 0, (LPARAM) m_hWnd); 272 return 0; 270 273 } 271 274 bHandled = FALSE; -
trunk/src/buzelib/PropertyList/PropertyList.h
r1273 r1322 583 583 MESSAGE_HANDLER(WM_USER_PROP_CANCELPROPERTY, OnCancelProperty); 584 584 MESSAGE_HANDLER(WM_USER_PROP_CHANGEDPROPERTY, OnChangedProperty); 585 MESSAGE_HANDLER(WM_USER_PROP_DELETEPROPERTY, OnDeleteProperty); 585 586 MESSAGE_HANDLER(WM_USER_PROP_EXPAND, OnExpand); 586 587 MESSAGE_HANDLER(WM_USER_PROP_COLLAPSE, OnCollapse); … … 752 753 return 0; 753 754 } 754 bHandled = FALSE; 755 // Anders: Do not call superclass' mousemove since it does stuff i dont like 756 //bHandled = FALSE; 755 757 return 0; 756 758 } … … 891 893 return 0; 892 894 } 895 LRESULT OnDeleteProperty(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) { 896 HWND hWnd = reinterpret_cast<HWND>(lParam); 897 ATLASSERT(hWnd); 898 if( !::IsWindow(hWnd) || m_iInplaceIndex == -1 ) return 0; 899 ATLASSERT(hWnd==m_hwndInplace); 900 IProperty* prop = reinterpret_cast<IProperty*>(TBase::GetItemData(m_iInplaceIndex)); 901 ATLASSERT(prop); 902 if( prop == NULL ) return 0; 903 NMPROPERTYITEM nmh = { m_hWnd, GetDlgCtrlID(), PIN_ITEMDELETE, prop }; 904 ::SendMessage(GetParent(), WM_NOTIFY, nmh.hdr.idFrom, (LPARAM) &nmh); 905 } 893 906 LRESULT OnExpand(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM lParam, BOOL& /*bHandled*/) 894 907 { -
trunk/src/buzelib/PropertyListView.cpp
r1311 r1322 35 35 36 36 propertyList.Create(m_hWnd, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL | LBS_NOTIFY | LBS_HASSTRINGS | LBS_OWNERDRAWVARIABLE, 0, IDC_PROPERTYLIST); 37 propertyList.SetExtendedListStyle(PLS_EX_SHOWSELALWAYS | PLS_EX_CATEGORIZED );37 propertyList.SetExtendedListStyle(PLS_EX_SHOWSELALWAYS | PLS_EX_CATEGORIZED | PLS_EX_SINGLECLICKEDIT); 38 38 39 39 document->addView(this);
