[Igarden-commit] Garden/source/SourceMaterialDB MaterialPalette.cpp, 1.8.2.3, 1.8.2.4 MaterialPalet
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2008-05-06 12:29:08
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7238/source/SourceMaterialDB Modified Files: Tag: Release_branch_v1 MaterialPalette.cpp MaterialPalette.h Log Message: Fix problem with saving cached document pointer Index: MaterialPalette.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/MaterialPalette.cpp,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** MaterialPalette.cpp 4 May 2008 22:30:42 -0000 1.8.2.3 --- MaterialPalette.cpp 6 May 2008 12:28:54 -0000 1.8.2.4 *************** *** 592,595 **** --- 592,596 ---- InvalView(); EnableView(); + _thread->SetDocument(doc); } *************** *** 609,612 **** --- 610,614 ---- InvalView(); DisableView(); + _thread->SetDocument(NULL); } *************** *** 649,652 **** --- 651,665 ---- } + + // --------------------------------------------------------------------------- + /// SetDocument + // + void BackgroundLoadThread::SetDocument(ClientDocument *doc) + { + _drawing->SetDocument(doc); + } + + + // --------------------------------------------------------------------------- /// AddRequest Index: MaterialPalette.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/MaterialPalette.h,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -C2 -d -r1.6 -r1.6.2.1 *** MaterialPalette.h 4 Nov 2007 19:53:17 -0000 1.6 --- MaterialPalette.h 6 May 2008 12:28:54 -0000 1.6.2.1 *************** *** 147,150 **** --- 147,151 ---- void AddRequest(PaletteItem *item); void ClearRequests(); + void SetDocument(ClientDocument *doc); PlanPaletteView* GetCanvas(); |