igarden-commit Mailing List for GardenSketch (Page 3)
Status: Beta
Brought to you by:
jlbedell
Menu
▾
▴
igarden-commit — CVS Commits for GardenSketch
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(77) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(103) |
Feb
(278) |
Mar
(130) |
Apr
(66) |
May
(56) |
Jun
(31) |
Jul
(94) |
Aug
(73) |
Sep
(22) |
Oct
(306) |
Nov
(52) |
Dec
|
| 2008 |
Jan
(27) |
Feb
(90) |
Mar
(218) |
Apr
(145) |
May
(114) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:35:20
|
Update of /cvsroot/igarden/CommonSource/CQTImagePane In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26997/CQTImagePane Modified Files: Tag: Release_branch_v1 CQTImagePane.cpp Log Message: Remove some obsolete code Index: CQTImagePane.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/CQTImagePane/CQTImagePane.cpp,v retrieving revision 1.8.2.4 retrieving revision 1.8.2.5 diff -C2 -d -r1.8.2.4 -r1.8.2.5 *** CQTImagePane.cpp 15 May 2008 12:33:31 -0000 1.8.2.4 --- CQTImagePane.cpp 17 May 2008 21:35:19 -0000 1.8.2.5 *************** *** 369,382 **** if(mDragMessage != 0) { - #if 0 - dragImageInfo_t dragInfo; - - dragInfo.pt = aPoint; - dragInfo.mod = modifiers; - dragInfo.view = this; - return DoDispatch(mDragMessage,GetViewID(), &dragInfo); - #else return 0; - #endif } else --- 369,373 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:15:24
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11325/source/Document Modified Files: Tag: Release_branch_v1 CDatabasePanel.cpp Log Message: Remove some obsolete code Index: CDatabasePanel.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.cpp,v retrieving revision 1.4.2.28 retrieving revision 1.4.2.29 diff -C2 -d -r1.4.2.28 -r1.4.2.29 *** CDatabasePanel.cpp 17 May 2008 20:44:21 -0000 1.4.2.28 --- CDatabasePanel.cpp 17 May 2008 21:15:27 -0000 1.4.2.29 *************** *** 255,270 **** switch (msg) { - #if 0 - case KXGKeyEvent: - low = arg & 0xffff; - high = (arg >> 16L) & 0xffff; - if(high == 0 && low == '\t') - { - panel->_deferedNext = true; - rgd->Exit(1); - } - return kIgnored; - #endif - case KXGGetMenuStatus: case KXGDoMenuCommand: --- 255,258 ---- *************** *** 725,728 **** --- 713,719 ---- /// Setup // + /// Common code to create a database panel in the given window. + /// ***This is where the columns are added. + // CGardenPanel* CDatabasePanel::Setup(XGWindow* win, XGView* newView, bool isDocument ) |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:07:41
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4493/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGCompression.cpp Log Message: Remove some obsolete code Index: RGCompression.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGCompression.cpp,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** RGCompression.cpp 8 Sep 2004 01:07:39 -0000 1.2 --- RGCompression.cpp 17 May 2008 21:07:43 -0000 1.2.2.1 *************** *** 100,119 **** viewRect.bottom = static_cast<long>(imageHeight); viewRect.right = static_cast<long>(imageWidth); - #if 0 - if(imageHeight < imageWidth) - { - newHeight = height * (imageHeight/imageWidth); - viewRect.top = (height - newHeight) / 2; - viewRect.bottom = viewRect.top + newHeight; - viewRect.right = width; - } - else - { - newWidth = width * (imageWidth/imageHeight); - viewRect.left = (width - newWidth) / 2; - viewRect.right = viewRect.left + newWidth; - viewRect.bottom = height; - } - #endif ::GraphicsImportSetBoundsRect(*component, &viewRect); result = new CGWorld(viewRect); --- 100,103 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:06:31
|
Update of /cvsroot/igarden/Garden/UnitTest In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3608/UnitTest Modified Files: Tag: Release_branch_v1 LayoutDBTests.h Log Message: Remove some obsolete code Index: LayoutDBTests.h =================================================================== RCS file: /cvsroot/igarden/Garden/UnitTest/Attic/LayoutDBTests.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** LayoutDBTests.h 12 Dec 2006 03:50:30 -0000 1.1.2.1 --- LayoutDBTests.h 17 May 2008 21:06:33 -0000 1.1.2.2 *************** *** 19,33 **** void testCase1(); void testCase2(); ! }; ! ! #if 0 ! class TestCase1 : public TestCase { ! public: ! TestCase1(TestInvocation* invocation); ! virtual ~TestCase1(); ! ! virtual void setUp(); ! virtual void tearDown(); ! void MyFirstTest(); ! }; ! #endif \ No newline at end of file --- 19,21 ---- void testCase1(); void testCase2(); ! }; \ No newline at end of file |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:03:45
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1500/source/LayoutDB Modified Files: Tag: Release_branch_v1 GardenPlot.cpp Log Message: Remove some obsolete code Index: GardenPlot.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/GardenPlot.cpp,v retrieving revision 1.50.2.14 retrieving revision 1.50.2.15 diff -C2 -d -r1.50.2.14 -r1.50.2.15 *** GardenPlot.cpp 11 May 2008 02:58:26 -0000 1.50.2.14 --- GardenPlot.cpp 17 May 2008 21:03:44 -0000 1.50.2.15 *************** *** 461,482 **** { PRECONDITION(_compat != NULL); - #if 0 - numLayers = GetNumLayers(); - RemoveAllIndexedItems(kFieldLayerRefs); - for(n = 0; n < numLayers; n++) - { - layer = GetIndexedLayer(n); - - layer->GetUID(uid); - AddItem(kFieldLayerRefs, &uid, sizeof(uid)); - if(layer == _writableLayer) - SetInt32(kFieldWriteLayer, n); - if(_newLayout || layer->IsModified()) - { - isModified = true; - layer->Write(); - } - } - #endif _compat->SetUID(kFieldPlotID, _plotID); --- 461,464 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:02:40
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv747/source/LayoutDB Modified Files: Tag: Release_branch_v1 BSPNode.cpp Log Message: Mark trace code as such (was #if 0) Index: BSPNode.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/BSPNode.cpp,v retrieving revision 1.28.2.8 retrieving revision 1.28.2.9 diff -C2 -d -r1.28.2.8 -r1.28.2.9 *** BSPNode.cpp 10 May 2008 22:50:40 -0000 1.28.2.8 --- BSPNode.cpp 17 May 2008 21:02:46 -0000 1.28.2.9 *************** *** 486,490 **** PRECONDITION(_lockDepth == 0); count = _elements.Length(); ! #if 0 printf("Delete %0lx\n", item); for(n = 0; n < count; n++) --- 486,490 ---- PRECONDITION(_lockDepth == 0); count = _elements.Length(); ! #if DEBUG_TRACE printf("Delete %0lx\n", item); for(n = 0; n < count; n++) *************** *** 505,509 **** if(!found && (_nodes[1] != NULL)) found = _nodes[1]->RemoveElement(item); ! #if 0 count = _elements.Length(); for(n = 0; n < count; n++) --- 505,509 ---- if(!found && (_nodes[1] != NULL)) found = _nodes[1]->RemoveElement(item); ! #if DEBUG_TRACE count = _elements.Length(); for(n = 0; n < count; n++) *************** *** 941,945 **** Add(element); } ! #if 0 long n, count; --- 941,945 ---- Add(element); } ! #if DEBUG_TRACE long n, count; |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:02:28
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv495/source/Document Modified Files: Tag: Release_branch_v1 InfoSupplierDialog.cpp Log Message: Remove some obsolete code Index: InfoSupplierDialog.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/InfoSupplierDialog.cpp,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -d -r1.7.2.2 -r1.7.2.3 *** InfoSupplierDialog.cpp 4 Mar 2008 13:38:17 -0000 1.7.2.2 --- InfoSupplierDialog.cpp 17 May 2008 21:02:20 -0000 1.7.2.3 *************** *** 62,91 **** static void FillGadgets(XGDialog *dlog, InfoSupplier *_resultOut); - #if 0 - static long supplierDialogProc(XGDialog *dlog, void *data, long msg, long arg, void *parg) - { - short low, high; - long n, count; - dialogInfo_t *block = static_cast<dialogInfo_t*>(data); - GardenDate inDate, outDate; - String string; - XGEditText *textGad; - char gadValue[256], nameBuf[512]; - InfoSupplier *_resultOut = block->resultOut; - GardenDatabaseFile *client = block->clientIn; - InfoSupplier *_previous = block->previous; - InfoSupplier *iter; - XGPopControl *pop; - SourceMaterialFile *common; - XGUUID newID; - - PRECONDITION(dlog != NULL); - PRECONDITION(block != NULL); - PRECONDITION(client != NULL); - - return -1; - } - #endif - void InfoSupplierDialog::Setup(XGDialog *dlog) { --- 62,65 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:02:28
|
Update of /cvsroot/igarden/Garden/source In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv495/source Modified Files: Tag: Release_branch_v1 GardenApp.cpp Log Message: Remove some obsolete code Index: GardenApp.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/GardenApp.cpp,v retrieving revision 1.3.2.6 retrieving revision 1.3.2.7 diff -C2 -d -r1.3.2.6 -r1.3.2.7 *** GardenApp.cpp 29 Mar 2008 19:44:04 -0000 1.3.2.6 --- GardenApp.cpp 17 May 2008 21:02:20 -0000 1.3.2.7 *************** *** 139,158 **** { XGDirectory dir; - #if 0 - XGMenu *editMenu; - short newIndex, sepIndex; - - editMenu = GetCurMenu()->GetMenu(2); - MyAssert(editMenu != NULL); - /**/ - sepIndex = editMenu->GetLength(); - editMenu->InsertItem(sepIndex); - editMenu->SetText(sepIndex, "-"); - /**/ - newIndex = editMenu->GetLength(); - editMenu->InsertItem(newIndex); - editMenu->SetText(newIndex, "Debug Add Line"); - editMenu->SetItemID(newIndex, 14159); - #endif _initComplete = false; --- 139,142 ---- *************** *** 215,235 **** #endif - #if 0 //!!!OPT_MACOS == 1 build font menu - Str255 fontName; - XGMenuBar *mbar = GetCurMenu(); - MyAssert(mbar != NULL); - XGMenu *textMenu = mbar->FindByMenuID(2006); - MyAssert(textMenu != NULL); - XGMenu *fontMenu = textMenu->GetSubMenu(0); - MyAssert(fontMenu != NULL); - for(n = 0; n < count; n++) - { - ::GetMenuItemText(fontHdl, n+1, fontName); - yaaf::cvtp2c(fontName); - fontMenu->InsertItem(n); - fontMenu->SetText(n, (char*)fontName); - fontMenu->SetItemID(n, kBaseFontCommand+n); - } - #endif PersistentTags::InitPreferenceTags(); --- 199,202 ---- *************** *** 342,389 **** LoadBackgrounds(); - #if 0 - if(sourceDB->LocateMaterialByID(kTurfMaterialUIDStr) == NULL) - { - Material *mat; - measureUnits_t units; - Length spread(0); - planLength_t minHt, maxht, minWid, maxWid; - - mat = new Material(sourceDB, kTurfMaterialUIDStr); - mat->SetMaterialType(kMaterialTypeBackground); - mat->SetCommonName(String("Turf")); - mat->SetString(kPlantVarietyPicture, "turf.png"); - // Compute size to expand to using scale & image size - PersistentTags *prefs; - prefs = GetActivePreferences(); - units = (measureUnits_t)prefs->GetInt32Pref(kUnitsPref); - spread.StringToLengthRange("8\"", minHt, maxht, units); - spread.StringToLengthRange("8\"", minWid, maxWid, units); - mat->SetInt32(kMaterialLength, maxht); - mat->SetInt32(kMaterialWidth, maxWid); - } - - const materialIDStr_t kAsphaltMaterialUIDStr = { "1234684-0000-e73e-00-00-0a-00-00-00-65-f1", "0-0-0-0-0-0-0-0-0-0-0" }; - if(sourceDB->LocateMaterialByID(kAsphaltMaterialUIDStr) == NULL) - { - Material *mat; - measureUnits_t units; - Length spread(0); - planLength_t minHt, maxht, minWid, maxWid; - - mat = new Material(sourceDB, kAsphaltMaterialUIDStr); - mat->SetMaterialType(kMaterialTypeBackground); - mat->SetCommonName(String("Asphalt Paving")); - mat->SetString(kPlantVarietyPicture, "turf.png"); - // Compute size to expand to using scale & image size - PersistentTags *prefs; - prefs = GetActivePreferences(); - units = (measureUnits_t)prefs->GetInt32Pref(kUnitsPref); - spread.StringToLengthRange("8\"", minHt, maxht, units); - spread.StringToLengthRange("8\"", minWid, maxWid, units); - mat->SetInt32(kMaterialLength, maxht); - mat->SetInt32(kMaterialWidth, maxWid); - } - #endif UnsanitySCR_RegisterMatchSpecifier(NULL, CFSTR("Redstart Software"), NULL, CFSTR("SCR-57D1B503C4"), NULL); --- 309,312 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:01:08
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32003/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGIconButton.cpp Log Message: Remove some obsolete code Index: RGIconButton.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGIconButton.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** RGIconButton.cpp 8 Sep 2004 01:08:09 -0000 1.3 --- RGIconButton.cpp 17 May 2008 21:01:11 -0000 1.3.2.1 *************** *** 87,137 **** /************************************************************************/ - #if OPT_MACOS - - #if 0 - $ XGIconButton::DoDrawView - / - / Handle the drawing - // - - void XGIconButton::DoDrawView(Rect) - { - Rect r; - - if (fControl) { - XGDraw draw(this,false); - if (fFont) { - fFont->AddRef(); - draw.SetFontObject(fFont); - } - - if (IsEnabled() && IsActive()) { - // - // Enabled - // - - ::HiliteControl(fControl,0); - } else { - ::HiliteControl(fControl,255); - } - ::ShowControl(fControl); - ::Draw1Control(fControl); - - if (fDefault) { - #if OPT_MACOS_CARBON - ::GetControlBounds(fControl,&r); - #else - r = (**fControl).contrlRect; - #endif - ::PenSize(3,3); - InsetRect(&r,-4,-4); - ::FrameRoundRect(&r,16,16); - } - } - } - - #endif - #endif - /*$ XGIconButton::DoMoveView * --- 87,90 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 21:00:27
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31140/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGHypertextGL.cpp Log Message: Mark trace code as such (was #if 0) Index: RGHypertextGL.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertextGL.cpp,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** RGHypertextGL.cpp 9 May 2008 01:08:15 -0000 1.7.2.1 --- RGHypertextGL.cpp 17 May 2008 21:00:23 -0000 1.7.2.2 *************** *** 67,71 **** { XGFont *fontPtr = XGDraw::GetDraw()->GetFontObject(); ! #if 0 char name[256]; fontPtr->GetFontName(name); --- 67,71 ---- { XGFont *fontPtr = XGDraw::GetDraw()->GetFontObject(); ! #if DEBUG_TRACE char name[256]; fontPtr->GetFontName(name); |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 20:59:15
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30319/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGGLBasicSVG.cpp Log Message: Mark trace code as such (was #if 0) Index: RGGLBasicSVG.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLBasicSVG.cpp,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -C2 -d -r1.3.2.3 -r1.3.2.4 *** RGGLBasicSVG.cpp 10 Nov 2007 03:25:19 -0000 1.3.2.3 --- RGGLBasicSVG.cpp 17 May 2008 20:59:17 -0000 1.3.2.4 *************** *** 330,334 **** #endif ! #if 0 // TRACE if(spec != _spec) printf("spec differed\n"); if(planSize.x != _planSize.x) printf("planSize.x differed\n"); --- 330,334 ---- #endif ! #if DEBUG_TRACE if(spec != _spec) printf("spec differed\n"); if(planSize.x != _planSize.x) printf("planSize.x differed\n"); *************** *** 692,696 **** isLarge = largeArc; ! #if 0 if(start.x != end.x || start.y != end.y) { --- 692,696 ---- isLarge = largeArc; ! #if DEBUG_TRACE if(start.x != end.x || start.y != end.y) { |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 20:48:53
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23424/source/Document Modified Files: Tag: Release_branch_v1 CGardenPanel.h Log Message: Return "not handled" by default to fix a warning Index: CGardenPanel.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CGardenPanel.h,v retrieving revision 1.8.2.7 retrieving revision 1.8.2.8 diff -C2 -d -r1.8.2.7 -r1.8.2.8 *** CGardenPanel.h 14 May 2008 13:08:31 -0000 1.8.2.7 --- CGardenPanel.h 17 May 2008 20:48:50 -0000 1.8.2.8 *************** *** 98,102 **** virtual long DoModifyMenu( long arg, void* parg ); virtual long DoTooltipStart( long arg, void* parg ); ! virtual long DoPrefsStateChanged( long arg, void* /*parg*/ ) {} virtual void PrintHeader(XGDraw& draw, UInt32 pageNum, UInt32 maxPages, Point printSize); --- 98,102 ---- virtual long DoModifyMenu( long arg, void* parg ); virtual long DoTooltipStart( long arg, void* parg ); ! virtual long DoPrefsStateChanged( long arg, void* /*parg*/ ) { return(-1); } virtual void PrintHeader(XGDraw& draw, UInt32 pageNum, UInt32 maxPages, Point printSize); |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 20:47:53
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22138/source/SourceMaterialDB Modified Files: Tag: Release_branch_v1 PlantSelection.cpp QueryDialog.cpp Log Message: Improve some comments Index: PlantSelection.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/PlantSelection.cpp,v retrieving revision 1.27.2.9 retrieving revision 1.27.2.10 diff -C2 -d -r1.27.2.9 -r1.27.2.10 *** PlantSelection.cpp 21 Mar 2008 22:05:38 -0000 1.27.2.9 --- PlantSelection.cpp 17 May 2008 20:47:05 -0000 1.27.2.10 *************** *** 552,555 **** --- 552,558 ---- /// DoKeyEvent // + /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. + /// Return 0 if the event was handled, -1 otherwise. + // long PlantSelection::DoKeyEvent( long arg, void* /*parg*/ ) { Index: QueryDialog.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/QueryDialog.cpp,v retrieving revision 1.25.2.10 retrieving revision 1.25.2.11 diff -C2 -d -r1.25.2.10 -r1.25.2.11 *** QueryDialog.cpp 12 May 2008 11:18:20 -0000 1.25.2.10 --- QueryDialog.cpp 17 May 2008 20:47:12 -0000 1.25.2.11 *************** *** 141,145 **** { PersistentTags *prefs = GetActivePreferences(super ? super->GetFile() : NULL); - Int32 zonePref; _query = new SourceQuery(database); --- 141,144 ---- *************** *** 1545,1554 **** return 0; } // --------------------------------------------------------------------------- ! // long QueryDialog::DoKeyEvent( long arg, void* parg ) ! // --------------------------------------------------------------------------- // ! long ! QueryDialog::DoKeyEvent( long arg, void* /*parg*/ ) { long low, high; --- 1544,1556 ---- return 0; } + + // --------------------------------------------------------------------------- ! /// DoKeyEvent // ! /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. ! /// Return 0 if the event was handled, -1 otherwise. ! // ! long QueryDialog::DoKeyEvent( long arg, void* /*parg*/ ) { long low, high; *************** *** 1563,1572 **** return -1; } // --------------------------------------------------------------------------- ! // long QueryDialog::DoTableChanged( long arg, void* parg ) ! // --------------------------------------------------------------------------- // ! long ! QueryDialog::DoTableChanged( long arg, void* /*parg*/ ) { HandleColorMenuMsg(_window, arg); --- 1565,1580 ---- return -1; } + + // --------------------------------------------------------------------------- ! /// DoTableChanged // ! /// Handle the KTableChange message from RGTableView, indicating that the table data ! /// was changed. This is the primary way of handling user input from a table ! /// in an application-specific manner. ! // ! /// Return 0 if the data was handled, -1 otherwise. ! // ! long QueryDialog::DoTableChanged( long arg, void* /*parg*/ ) { HandleColorMenuMsg(_window, arg); |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 20:47:19
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22138/source/Document Modified Files: Tag: Release_branch_v1 CPlanPanel.cpp Log Message: Improve some comments Index: CPlanPanel.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CPlanPanel.cpp,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -C2 -d -r1.4.2.10 -r1.4.2.11 *** CPlanPanel.cpp 14 May 2008 13:08:31 -0000 1.4.2.10 --- CPlanPanel.cpp 17 May 2008 20:47:16 -0000 1.4.2.11 *************** *** 88,93 **** ENDDISPATCH ! long ! CPlanPanel::DoModifyMenu( long /*arg*/, void* parg ) { XGMenu *menu, *subMenu; --- 88,101 ---- ENDDISPATCH ! ! // --------------------------------------------------------------------------- ! /// DoModifyMenu ! // ! /// Handle the KXGModifyMenu message from YAAF, which allows receivers to modify ! /// the menus on the menuy bar. Called before the menus are displayed. ! // ! /// Returns 0 if a menu was changed, -1 if not. ! // ! long CPlanPanel::DoModifyMenu( long /*arg*/, void* parg ) { XGMenu *menu, *subMenu; *************** *** 150,153 **** --- 158,164 ---- } + // --------------------------------------------------------------------------- + /// DoPopValue + // long CPlanPanel::DoPopValue( long /*arg*/, void* /*parg*/ ) *************** *** 156,159 **** --- 167,174 ---- } + + // --------------------------------------------------------------------------- + /// SetCurrentPlot + // void CPlanPanel::SetCurrentPlot(long index) { *************** *** 179,182 **** --- 194,201 ---- } + + // --------------------------------------------------------------------------- + /// RebuildPlotMenu + // void CPlanPanel::RebuildPlotMenu() { *************** *** 184,187 **** --- 203,209 ---- } + // --------------------------------------------------------------------------- + /// DoHeaderIconChanged + // long CPlanPanel::DoHeaderIconChanged( long /*arg*/, void* /*parg*/ ) { *************** *** 190,197 **** // --------------------------------------------------------------------------- ! // CGardenPanel* CPlanPanel::Create( CGardenForm* doc, XGView* superView ) ! // --------------------------------------------------------------------------- // - /* Called once for each panel on the creation of a CGardenDoc. Use the name and resourceID and build the view. */ CGardenPanel* CPlanPanel::Create( CGardenForm* doc, XGView* superView ) { --- 212,220 ---- // --------------------------------------------------------------------------- ! /// Create ! // ! /// Called once for each panel on the creation of a CGardenDoc. ! /// Use the name and resourceID and build the view. */ // CGardenPanel* CPlanPanel::Create( CGardenForm* doc, XGView* superView ) { *************** *** 209,215 **** return(result); } // --------------------------------------------------------------------------- ! // void CPlanPanel::Save() ! // --------------------------------------------------------------------------- // void CPlanPanel::Save() --- 232,239 ---- return(result); } + + // --------------------------------------------------------------------------- ! /// Save // void CPlanPanel::Save() *************** *** 217,223 **** } // --------------------------------------------------------------------------- ! // void CPlanPanel::Open() ! // --------------------------------------------------------------------------- // void CPlanPanel::Open() --- 241,248 ---- } + + // --------------------------------------------------------------------------- ! /// Open // void CPlanPanel::Open() *************** *** 889,895 **** return result; } // --------------------------------------------------------------------------- ! // long CPlanPanel::DoKeyEvent( long arg, void* parg ) ! // --------------------------------------------------------------------------- // long CPlanPanel::DoKeyEvent( long arg, void* /*parg*/ ) --- 914,924 ---- return result; } + + // --------------------------------------------------------------------------- ! /// DoKeyEvent ! // ! /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. ! /// Return 0 if the event was handled, -1 otherwise. // long CPlanPanel::DoKeyEvent( long arg, void* /*parg*/ ) *************** *** 1001,1005 **** // --------------------------------------------------------------------------- // void CPlanPanel::DoSwitchPlot( long arg, void* parg ) - // --------------------------------------------------------------------------- // void CPlanPanel::DoSwitchPlot( long /*arg*/, void* parg ) --- 1030,1033 ---- *************** *** 1011,1016 **** // --------------------------------------------------------------------------- ! // long CPlanPanel::DoIdleTime( long arg, void* parg ) ! // --------------------------------------------------------------------------- // long CPlanPanel::DoIdleTime( long arg, void* parg ) --- 1039,1043 ---- // --------------------------------------------------------------------------- ! /// DoIdleTime // long CPlanPanel::DoIdleTime( long arg, void* parg ) *************** *** 1033,1039 **** return -1; } // --------------------------------------------------------------------------- ! // void CPlanPanel::RecalculateDisplay() ! // --------------------------------------------------------------------------- // void CPlanPanel::RecalculateDisplay() --- 1060,1067 ---- return -1; } + + // --------------------------------------------------------------------------- ! /// RecalculateDisplay // void CPlanPanel::RecalculateDisplay() *************** *** 1047,1050 **** --- 1075,1080 ---- _planView->InvalView(); } + + // --------------------------------------------------------------------------- /// SetDisplayMonth *************** *** 1056,1059 **** --- 1086,1091 ---- _planView->SetDisplayMonth(month); } + + // --------------------------------------------------------------------------- /// ComputePageBoundries *************** *** 1095,1105 **** } } // --------------------------------------------------------------------------- /// PrintPageContents // ! ! ! void ! CPlanPanel::PrintPageContents( Rect& printRect, XGDraw& draw, sint32 xOffset, sint32 yOffset ) { planPoint_t newPos; --- 1127,1136 ---- } } + + // --------------------------------------------------------------------------- /// PrintPageContents // ! void CPlanPanel::PrintPageContents( Rect& printRect, XGDraw& draw, sint32 xOffset, sint32 yOffset ) { planPoint_t newPos; *************** *** 1128,1134 **** --- 1159,1169 ---- } + // --------------------------------------------------------------------------- /// OpenFloatingWindows // + /// Creates any foloating (palette) windows associated with this panel. + /// Called from CGardenForm, you should not need to call this elsewhere. + // void CPlanPanel::OpenFloatingWindows() { *************** *** 1140,1146 **** --- 1175,1185 ---- } + // --------------------------------------------------------------------------- /// Activate // + /// Handle activities which need to happen when this panel activates (becomes the current panel + /// in the document). + // void CPlanPanel::Activate() { *************** *** 1159,1162 **** --- 1198,1204 ---- /// Deactivate // + /// Handle activities which need to happen when this panel deactivates (stops being the current panel + /// in the document). Called from CGardenForm, you should not need to call this elsewhere. + // void CPlanPanel::Deactivate() { *************** *** 1167,1170 **** --- 1209,1215 ---- /// DoPlotInfoChanged // + // Responds to the kModifyPlotInfoMsg message, sent when basic garden plot + // information (dimensions, name, etc..) has changed. + // long CPlanPanel::DoPlotInfoChanged( long /*arg*/, void* /*parg*/ ) { *************** *** 1197,1200 **** --- 1242,1250 ---- /// ScrollWheelMoved // + /// Called from CGardenForm when the scroll wheel on the mouse has been moved over + /// the current view. + // + // This view treats option-scroll as a zoom operation + // void CPlanPanel::ScrollWheelMoved(wheelAxis_t axis, sint32 offset) { *************** *** 1230,1233 **** --- 1280,1288 ---- /// SetupContextMenu // + /// Called back from CGardenForm to determine if this view has a contextual menu, and allow + /// the view to add items to the contextual menu (right-click). + // + // Returns true since this view does have a contextual menu. + // bool CPlanPanel::SetupContextMenu(RGContextMenu *menu) { *************** *** 1241,1244 **** --- 1296,1303 ---- } + + // --------------------------------------------------------------------------- + /// CloseSubWindows + // void CPlanPanel::CloseSubWindows() { |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 20:47:19
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22138/source/PlanTool Modified Files: Tag: Release_branch_v1 LayerSelectForm.cpp MaterialInfoPanel.cpp MaterialInfoForm.cpp Log Message: Improve some comments Index: MaterialInfoForm.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/MaterialInfoForm.cpp,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -C2 -d -r1.17.2.5 -r1.17.2.6 *** MaterialInfoForm.cpp 19 Mar 2008 01:38:45 -0000 1.17.2.5 --- MaterialInfoForm.cpp 17 May 2008 20:47:15 -0000 1.17.2.6 *************** *** 325,343 **** } // --------------------------------------------------------------------------- ! // long MaterialInfoForm::DoTableChanged( long arg, void* parg ) ! // --------------------------------------------------------------------------- // ! long ! MaterialInfoForm::DoTableChanged( long arg, void* parg ) { PRECONDITION(_panels[_currentPanel] != NULL); return (_panels[_currentPanel])->DoTableChanged(arg, parg); } // --------------------------------------------------------------------------- ! // long MaterialInfoForm::DoKeyEvent( long arg, void* parg ) ! // --------------------------------------------------------------------------- // ! long ! MaterialInfoForm::DoKeyEvent( long arg, void* parg ) { long result; --- 325,350 ---- } // --------------------------------------------------------------------------- ! /// DoTableChanged // ! /// Handle the KTableChange message from RGTableView, indicating that the table data ! /// was changed. This is the primary way of handling user input from a table ! /// in an application-specific manner. ! // ! /// Return 0 if the data was handled, -1 otherwise. ! // ! long MaterialInfoForm::DoTableChanged( long arg, void* parg ) { PRECONDITION(_panels[_currentPanel] != NULL); return (_panels[_currentPanel])->DoTableChanged(arg, parg); } + + // --------------------------------------------------------------------------- ! /// DoKeyEvent // ! /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. ! /// Return 0 if the event was handled, -1 otherwise. ! // ! long MaterialInfoForm::DoKeyEvent( long arg, void* parg ) { long result; Index: MaterialInfoPanel.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/MaterialInfoPanel.cpp,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -C2 -d -r1.17.2.5 -r1.17.2.6 *** MaterialInfoPanel.cpp 19 Mar 2008 01:38:45 -0000 1.17.2.5 --- MaterialInfoPanel.cpp 17 May 2008 20:47:15 -0000 1.17.2.6 *************** *** 88,91 **** --- 88,100 ---- } + // --------------------------------------------------------------------------- + /// DoTableChanged (default method, should be overridden) + // + /// Handle the KTableChange message from RGTableView, indicating that the table data + /// was changed. This is the primary way of handling user input from a table + /// in an application-specific manner. + // + /// Return 0 if the data was handled, -1 otherwise. + // long ElementInfoPanel::DoTableChanged(long /*arg*/, void* /*parg*/) { *************** *** 93,96 **** --- 102,111 ---- } + // --------------------------------------------------------------------------- + /// DoKeyEvent (default method, may be overridden) + // + /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. + /// Return 0 if the event was handled, -1 otherwise. + // long ElementInfoPanel::DoKeyEvent(long /*arg*/, void* /*parg*/) { Index: LayerSelectForm.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/LayerSelectForm.cpp,v retrieving revision 1.9.2.5 retrieving revision 1.9.2.6 diff -C2 -d -r1.9.2.5 -r1.9.2.6 *** LayerSelectForm.cpp 8 Mar 2008 04:19:07 -0000 1.9.2.5 --- LayerSelectForm.cpp 17 May 2008 20:47:14 -0000 1.9.2.6 *************** *** 212,215 **** --- 212,218 ---- /// DoKeyEvent // + /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. + /// Return 0 if the event was handled, -1 otherwise. + // long LayerSelectForm::DoKeyEvent( long arg, void* /*parg*/ ) { *************** *** 242,249 **** - // --------------------------------------------------------------------------- /// DoTableChanged // long LayerSelectForm::DoTableChanged( long /*arg*/, void* /*parg*/ ) { --- 245,257 ---- // --------------------------------------------------------------------------- /// DoTableChanged // + /// Handle the KTableChange message from RGTableView, indicating that the table data + /// was changed. This is the primary way of handling user input from a table + /// in an application-specific manner. + // + /// Return 0 if the data was handled, -1 otherwise. + // long LayerSelectForm::DoTableChanged( long /*arg*/, void* /*parg*/ ) { |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 20:44:23
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20560/source/Document Modified Files: Tag: Release_branch_v1 CGardenPanel.cpp CGardenForm.cpp CDatabasePanel.cpp Log Message: Improve some comments Index: CGardenPanel.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CGardenPanel.cpp,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -C2 -d -r1.3.2.5 -r1.3.2.6 *** CGardenPanel.cpp 29 Mar 2008 19:40:37 -0000 1.3.2.5 --- CGardenPanel.cpp 17 May 2008 20:44:20 -0000 1.3.2.6 *************** *** 344,347 **** --- 344,350 ---- /// DoKeyEvent // + /// Default handler for a keypress from the user. + /// Return 0 if the event was handled, -1 otherwise. + // long CGardenPanel::DoKeyEvent( long /*arg*/, void* /*parg*/ ) { *************** *** 351,355 **** // --------------------------------------------------------------------------- ! /// DoTableChanged // long CGardenPanel::DoTableChanged( long /*arg*/, void* /*parg*/ ) --- 354,364 ---- // --------------------------------------------------------------------------- ! /// DoTableChanged (default method, should be overridden) ! // ! /// Handle the KTableChange message from RGTableView, indicating that the table data ! /// was changed. This is the primary way of handling user input from a table ! /// in an application-specific manner. ! // ! /// Return 0 if the data was handled, -1 otherwise. // long CGardenPanel::DoTableChanged( long /*arg*/, void* /*parg*/ ) *************** *** 359,363 **** // --------------------------------------------------------------------------- ! /// DoInputError // long CGardenPanel::DoInputError( long /*arg*/, void* /*parg*/ ) --- 368,376 ---- // --------------------------------------------------------------------------- ! /// DoInputError (default method, should be overridden) ! // ! /// Default method Handle the kTableInputErr message sent by RGTableView. ! // ! /// Return 0 if the error has been displayed, -1 otherwise. // long CGardenPanel::DoInputError( long /*arg*/, void* /*parg*/ ) *************** *** 377,380 **** --- 390,398 ---- /// DoModifyMenu // + /// Handle the KXGModifyMenu message from YAAF, which allows receivers to modify + /// the menus on the menuy bar. Called before the menus are displayed. + // + /// Returns 0 if a menu was changed, -1 if not. + // long CGardenPanel::DoModifyMenu( long /*arg*/, void* /*parg*/ ) { *************** *** 392,395 **** --- 410,417 ---- /// PrintHeader // + /// Default method to print the header information onto a printout. + // + /// Can be overridden if needed. + // void CGardenPanel::PrintHeader( XGDraw& draw, uint32 /*pageNum*/, uint32 /*maxPages*/, Point printSize ) { *************** *** 411,415 **** // --------------------------------------------------------------------------- ! // void CGardenPanel::PrintFooter // void CGardenPanel::PrintFooter( XGDraw& draw, uint32 pageNum, uint32 maxPages, Point printSize ) --- 433,441 ---- // --------------------------------------------------------------------------- ! /// PrintFooter ! // ! /// Default method to print the footer information onto a printout. ! // ! /// Can be overridden if needed. // void CGardenPanel::PrintFooter( XGDraw& draw, uint32 pageNum, uint32 maxPages, Point printSize ) *************** *** 539,542 **** --- 565,571 ---- /// Activate // + /// Handle activities which need to happen when this panel activates (becomes the current panel + /// in the document). Called from CGardenForm, you should not need to call this elsewhere. + // void CGardenPanel::Activate() { *************** *** 546,549 **** --- 575,581 ---- /// Deactivate // + /// Handle activities which need to happen when this panel deactivates (stops being the current panel + /// in the document). Called from CGardenForm, you should not need to call this elsewhere. + // void CGardenPanel::Deactivate() { *************** *** 560,563 **** --- 592,598 ---- /// ScrollWheelMoved // + /// Called from CGardenForm when the scroll wheel on the mouse has been moved over + /// the current view. + // void CGardenPanel::ScrollWheelMoved(wheelAxis_t /*axis*/, sint32 /*offset*/) { Index: CGardenForm.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CGardenForm.cpp,v retrieving revision 1.4.2.13 retrieving revision 1.4.2.14 diff -C2 -d -r1.4.2.13 -r1.4.2.14 *** CGardenForm.cpp 14 May 2008 13:08:31 -0000 1.4.2.13 --- CGardenForm.cpp 17 May 2008 20:44:20 -0000 1.4.2.14 *************** *** 950,953 **** --- 950,959 ---- /// DoTableChanged // + /// Handle the KTableChange message from RGTableView, indicating that the table data + /// was changed. This is the primary way of handling user input from a table + /// in an application-specific manner. + // + /// Return 0 if the data was handled, -1 otherwise. + // long CGardenForm::DoTableChanged( long arg, void* parg ) { *************** *** 969,972 **** --- 975,982 ---- /// DoInputError // + /// Handle the kTableInputErr message sent by RGTableView. + // + /// Return 0 if the error has been displayed, -1 otherwise. + // long CGardenForm::DoInputError( long arg, void* parg ) { *************** *** 979,982 **** --- 989,997 ---- /// DoKeyEvent // + /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. + /// Return 0 if the event was handled, -1 otherwise. + // + /// This version just passes the event down to the current pane. + // long CGardenForm::DoKeyEvent( long arg, void* parg ) { *************** *** 998,1001 **** --- 1013,1021 ---- /// DoModifyMenu // + /// Handle the KXGModifyMenu message from YAAF, which allows receivers to modify + /// the menus on the menuy bar. Called before the menus are displayed. + // + /// Returns 0 if a menu was changed, -1 if not. + // long CGardenForm::DoModifyMenu( long arg, void* parg ) { *************** *** 1068,1073 **** } ! // --------------------------------------------------------------------------- ! /// DoSetupContextMenu // long CGardenForm::DoSetupContextMenu(long arg, void* parg) --- 1088,1095 ---- } ! /// Called back from YAAF to determine if this view has a contextual menu, and allow ! /// the view to add items to the contextual menu (right-click). ! // ! // Returns 0 if the view does have a contextual menu, -1 otherwise. // long CGardenForm::DoSetupContextMenu(long arg, void* parg) *************** *** 1695,1698 **** --- 1717,1726 ---- } + // --------------------------------------------------------------------------- + /// ScrollWheelMoved + // + /// Called from the window event handler when the scroll wheel on the mouse has been moved over + /// the current view. + // void CGardenForm::ScrollWheelMoved(wheelAxis_t axis, sint32 offset) { Index: CDatabasePanel.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.cpp,v retrieving revision 1.4.2.27 retrieving revision 1.4.2.28 diff -C2 -d -r1.4.2.27 -r1.4.2.28 *** CDatabasePanel.cpp 17 May 2008 19:53:21 -0000 1.4.2.27 --- CDatabasePanel.cpp 17 May 2008 20:44:21 -0000 1.4.2.28 *************** *** 2595,2599 **** // --------------------------------------------------------------------------- ! /// DoTableChanged // long CDatabasePanel::DoRowMoved( long arg, void* /*parg*/ ) --- 2595,2599 ---- // --------------------------------------------------------------------------- ! /// DoRowMoved // long CDatabasePanel::DoRowMoved( long arg, void* /*parg*/ ) *************** *** 2608,2611 **** --- 2608,2617 ---- /// DoTableChanged // + /// Handle the KTableChange message from RGTableView, indicating that the table data + /// was changed. This is the primary way of handling user input from a table + /// in an application-specific manner. + // + /// Return 0 if the data was handled, -1 otherwise. + // long CDatabasePanel::DoTableChanged( long /*arg*/, void* parg ) { *************** *** 3511,3514 **** --- 3517,3524 ---- /// DoInputError // + /// Handle the kTableInputErr message sent by RGTableView. + // + /// Return 0 if the error has been displayed, -1 otherwise. + // long CDatabasePanel::DoInputError( long /*arg*/, void* parg ) { *************** *** 3642,3645 **** --- 3652,3658 ---- /// DoPlotInfoChanged // + // Responds to the kModifyPlotInfoMsg message, sent when basic garden plot + // information (dimensions, name, etc..) has changed. + // long CDatabasePanel::DoPlotInfoChanged( long /*arg*/, void* /*parg*/ ) { *************** *** 3725,3728 **** --- 3738,3744 ---- /// ScrollWheelMoved // + /// Called from CGardenForm when the scroll wheel on the mouse has been moved over + /// the current view. + // void CDatabasePanel::ScrollWheelMoved(wheelAxis_t axis, sint32 offset) { *************** *** 3746,3749 **** --- 3762,3768 ---- /// DoKeyEvent // + /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. + /// Return 0 if the event was handled, -1 otherwise. + // long CDatabasePanel::DoKeyEvent(long arg, void* parg) { *************** *** 3812,3817 **** /// SetupContextMenu // ! /// Called back from YAAF to determine if this view has a contextual menu, and what ! /// the items are on the contextual menu (right-click). // // Returns true since this view does have a contextual menu. --- 3831,3836 ---- /// SetupContextMenu // ! /// Called back from CGardenForm to determine if this view has a contextual menu, and allow ! /// the view to add items to the contextual menu (right-click). // // Returns true since this view does have a contextual menu. *************** *** 4588,4591 **** --- 4607,4613 ---- /// Activate // + /// Handle activities which need to happen when this panel activates (becomes the current panel + /// in the document). Called from CGardenForm, you should not need to call this elsewhere. + // void CDatabasePanel::Activate() { |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 20:43:18
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18607/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGPaletteForm.cpp RGTableView.cpp Log Message: Improve some comments Index: RGPaletteForm.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGPaletteForm.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** RGPaletteForm.cpp 23 Jan 2007 03:22:18 -0000 1.2.2.1 --- RGPaletteForm.cpp 17 May 2008 20:42:03 -0000 1.2.2.2 *************** *** 80,83 **** --- 80,86 ---- /// DoKeyEvent // + /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. + /// Return 0 if the event was handled, -1 otherwise. + // long XGPaletteForm::DoKeyEvent( long arg, void* parg ) { Index: RGTableView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableView.cpp,v retrieving revision 1.28.2.40 retrieving revision 1.28.2.41 diff -C2 -d -r1.28.2.40 -r1.28.2.41 *** RGTableView.cpp 17 May 2008 19:44:32 -0000 1.28.2.40 --- RGTableView.cpp 17 May 2008 20:42:03 -0000 1.28.2.41 *************** *** 2167,2171 **** // --------------------------------------------------------------------------- ! /// DoInlineClose // long RGTableView::DoKeyEvent(long arg, void *parg) --- 2167,2174 ---- // --------------------------------------------------------------------------- ! /// DoKeyEvent ! // ! /// Handle the KXGKeyEvent event from YAAF, indicating that a key has been pressed. ! /// Return 0 if the event was handled, -1 otherwise. // long RGTableView::DoKeyEvent(long arg, void *parg) |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 19:53:18
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16785/source/Document Modified Files: Tag: Release_branch_v1 CDatabasePanel.h CDatabasePanel.cpp Log Message: Add the ability to drag from the source materials window & list views to the palette Index: CDatabasePanel.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.h,v retrieving revision 1.17.2.13 retrieving revision 1.17.2.14 diff -C2 -d -r1.17.2.13 -r1.17.2.14 *** CDatabasePanel.h 8 Apr 2008 22:24:23 -0000 1.17.2.13 --- CDatabasePanel.h 17 May 2008 19:53:21 -0000 1.17.2.14 *************** *** 146,149 **** --- 146,150 ---- virtual long DoKeyEvent(long arg, void* parg); virtual long DoColWidthChanged(long arg, void* parg); + virtual long DoIconPlantDrag( long /*arg*/, void* parg ); virtual void PrintPageContents(Rect& printRect, XGDraw& draw, Int32 xOffset, Int32 yOffset); Index: CDatabasePanel.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CDatabasePanel.cpp,v retrieving revision 1.4.2.26 retrieving revision 1.4.2.27 diff -C2 -d -r1.4.2.26 -r1.4.2.27 *** CDatabasePanel.cpp 12 Apr 2008 19:03:54 -0000 1.4.2.26 --- CDatabasePanel.cpp 17 May 2008 19:53:21 -0000 1.4.2.27 *************** *** 170,173 **** --- 170,174 ---- DISPATCHTABLE(KXGKeyEvent,CDatabasePanel::DoKeyEvent) // For SourceDB window DISPATCHTABLE(KTableColumnWidthChange,CDatabasePanel::DoColWidthChanged) + DISPATCHTABLE(KXGTableIconDrag,CDatabasePanel::DoIconPlantDrag) ENDDISPATCH *************** *** 1351,1357 **** case kDragIcon: if(firstRow && !rowPtr->inGroup) ! cell->SetIcon(kDragIconID, 14, 14); else ! cell->SetEmpty(KTypeIcon); break; --- 1352,1358 ---- case kDragIcon: if(firstRow && !rowPtr->inGroup) ! cell->SetDragIcon(kDragIconID, 14, 14); else ! cell->SetEmpty(KTypeIconDrag); break; *************** *** 3753,3756 **** --- 3754,3760 ---- /// DoColWidthChanged // + /// Called back from RGTableView or subclasses when the user has changed the width of a column + /// heading (by dragging). + // long CDatabasePanel::DoColWidthChanged(long arg, void* parg) { *************** *** 3767,3770 **** --- 3771,3810 ---- } + // --------------------------------------------------------------------------- + /// DoIconPlantDrag + // + //// Called back when a cell of type KTypeIconDrag is dragged. In this case, it + /// represents a plant or other material to be dragged somewhere + // + long CDatabasePanel::DoIconPlantDrag( long /*arg*/, void* parg ) + { + iconCellDragInfo_t dragInfo = *((iconCellDragInfo_t *)parg); + + + Rect dragRect; + Material *mat; + MaterialDragger *dragger; + + // This assumes all of the data is already initialized. + dragRect.top = dragInfo.pt.v; + dragRect.left = dragInfo.pt.h; + dragRect.bottom = dragInfo.pt.v + materialDragHeight; + dragRect.right = dragInfo.pt.h+materialDragWidth; + _table->ViewToScreen(&dragRect); + + dragger = new MaterialDragger; + + mat = RowPtr(dragInfo.row)->ref->GetMaterial(ifMissingNULL); + + if(mat != NULL) + { + dragger->AddMaterial(mat); + dragger->DoDrag(dragRect); + delete dragger; + } + + return 0; + } + #pragma mark Other *************** *** 3772,3775 **** --- 3812,3820 ---- /// SetupContextMenu // + /// Called back from YAAF to determine if this view has a contextual menu, and what + /// the items are on the contextual menu (right-click). + // + // Returns true since this view does have a contextual menu. + // bool CDatabasePanel::SetupContextMenu(RGContextMenu *menu) { |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 19:44:33
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9210/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGTableCell.cpp RGTableView.cpp RGTableView.h RGTableCell.h Log Message: Add being able to drag from the source materials window Index: RGTableCell.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.h,v retrieving revision 1.23.2.13 retrieving revision 1.23.2.14 diff -C2 -d -r1.23.2.13 -r1.23.2.14 *** RGTableCell.h 17 May 2008 16:59:18 -0000 1.23.2.13 --- RGTableCell.h 17 May 2008 19:44:32 -0000 1.23.2.14 *************** *** 76,79 **** --- 76,80 ---- #define KTypeIconToggle 14 #define KTypeFlexCount 15 + #define KTypeIconDrag 16 typedef enum { kLeftJust, kCenterJust, kRightJust } titleJust_t; *************** *** 164,167 **** --- 165,169 ---- void SetIcon(short iconID, short height, short width); + void SetDragIcon(short iconID, short height, short width); bool IsReadOnly(); Index: RGTableCell.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.cpp,v retrieving revision 1.46.2.25 retrieving revision 1.46.2.26 diff -C2 -d -r1.46.2.25 -r1.46.2.26 *** RGTableCell.cpp 17 May 2008 16:59:18 -0000 1.46.2.25 --- RGTableCell.cpp 17 May 2008 19:44:32 -0000 1.46.2.26 *************** *** 451,454 **** --- 451,455 ---- case KTypeIcon: case KTypeIconToggle: + case KTypeIconDrag: h = _iconSize.v + 4; // Center by one pixel break; *************** *** 485,488 **** --- 486,490 ---- { case KTypeIcon: + case KTypeIconDrag: if(IsDrawnAsSelected()) draw.FillRect(back, kTableHilightColor); *************** *** 650,654 **** _parent->DoDispatch(KTableChange,_parent->GetViewID(),NULL); } ! else if(_type != KTypeIcon) { _parent->InlineEdit(); --- 652,656 ---- _parent->DoDispatch(KTableChange,_parent->GetViewID(),NULL); } ! else if(_type != KTypeIcon && _type != KTypeIconDrag) { _parent->InlineEdit(); *************** *** 1099,1102 **** --- 1101,1123 ---- } + //******************************************* + /// SetIcon + // + /// Set the current cell data to the given icon + // + void RGTableCell::SetDragIcon(short iconID, short height, short width) + { + _iconID = iconID; + _iconSize.h = width; + _iconSize.v = height; + + _isEmpty = false; + _type = KTypeIconDrag; + if(_myRow != NULL) + { + _parent->ComputeRowHeight(GetRow()); + _parent->Update(); + } + } Index: RGTableView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableView.cpp,v retrieving revision 1.28.2.39 retrieving revision 1.28.2.40 diff -C2 -d -r1.28.2.39 -r1.28.2.40 *** RGTableView.cpp 9 May 2008 13:10:09 -0000 1.28.2.39 --- RGTableView.cpp 17 May 2008 19:44:32 -0000 1.28.2.40 *************** *** 125,128 **** --- 125,129 ---- _dragCol = -1; _selectColIcon = 0; + _mouseDownDrag = false; } *************** *** 391,399 **** ColRecord *column = _colArray[selCol]; ! if(cell->GetType() != KTypePicture) // Always open picture type, as it can't be seen otehrwise { ! if(!_rowArray[selRow]->forceWritable || (cell != NULL && cell->GetType() == KTypeIcon)) { ! if ((column->display == true) || (cell != NULL && (cell->IsReadOnly() || cell->GetType() == KTypeIcon))) { SetSelectRow(selRow); --- 392,409 ---- ColRecord *column = _colArray[selCol]; ! if(cell->GetType() == KTypeIconDrag) { ! _mouseDownDrag = true; ! _dragInfo.pt = where; ! _dragInfo.mod = modifier; ! _dragInfo.row = selRow; ! _dragInfo.col = selCol; ! return false; ! } ! else if(cell->GetType() != KTypePicture) // Always open picture type, as it can't be seen otehrwise ! { ! if(!_rowArray[selRow]->forceWritable || (cell != NULL && cell->GetType() == KTypeIconDrag)) { ! if ((column->display == true) || (cell != NULL && (cell->IsReadOnly() || cell->GetType() == KTypeIconDrag))) { SetSelectRow(selRow); *************** *** 424,427 **** --- 434,443 ---- void RGTableView::DoMouseUp(Point where, short /*flag*/) { + if(_mouseDownDrag) + { + SetSelectRow(_dragInfo.row); + _mouseDownDrag = false; + } + if(_dragCol >= 0 && _activeHeader) { *************** *** 453,457 **** void RGTableView::DoMouseMove(Point pt,short) { ! if(_activeHeader) { if(_dragCol >= 0) --- 469,485 ---- void RGTableView::DoMouseMove(Point pt,short) { ! if(_mouseDownDrag) ! { ! short dx, dy; ! ! dx = pt.h - _dragInfo.pt.h; ! dy = pt.v - _dragInfo.pt.v; ! if(dx < -2 || dx > 2 || dy < -2 || dy > 2) ! { ! SendMessage(KXGTableIconDrag,GetViewID(),&_dragInfo); ! _mouseDownDrag = false; ! } ! } ! else if(_activeHeader) { if(_dragCol >= 0) Index: RGTableView.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableView.h,v retrieving revision 1.16.2.16 retrieving revision 1.16.2.17 diff -C2 -d -r1.16.2.16 -r1.16.2.17 *** RGTableView.h 11 May 2008 12:42:56 -0000 1.16.2.16 --- RGTableView.h 17 May 2008 19:44:32 -0000 1.16.2.17 *************** *** 62,65 **** --- 62,66 ---- #define kTableSelectChange 'Tsch' #define kTableInputErr 'TsIE' + #define KXGTableIconDrag 'TicD' /************************************************************************/ *************** *** 133,136 **** --- 134,145 ---- }; + typedef struct + { + Point pt; + short mod; + short row; + short col; + } iconCellDragInfo_t; + /************************************************************************/ /* */ *************** *** 373,376 **** --- 382,388 ---- long _dragCol; long _selectColIcon; + + bool _mouseDownDrag; + iconCellDragInfo_t _dragInfo; }; |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 16:59:57
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24722/source/Document Modified Files: Tag: Release_branch_v1 FlexCountCell.cpp GerminationCell.cpp Log Message: Fix problem changing fonts on cells using italics Index: FlexCountCell.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/FlexCountCell.cpp,v retrieving revision 1.2.2.10 retrieving revision 1.2.2.11 diff -C2 -d -r1.2.2.10 -r1.2.2.11 *** FlexCountCell.cpp 9 Apr 2008 03:02:04 -0000 1.2.2.10 --- FlexCountCell.cpp 17 May 2008 16:59:53 -0000 1.2.2.11 *************** *** 150,154 **** if(drawGridBack) draw.EraseRect(back); ! draw.SetFontObject(_font); // Handle flexCount here so that we wrap the text, but not the select color --- 150,154 ---- if(drawGridBack) draw.EraseRect(back); ! draw.SetFontObject(GetFont()); // Handle flexCount here so that we wrap the text, but not the select color Index: GerminationCell.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/GerminationCell.cpp,v retrieving revision 1.4.2.12 retrieving revision 1.4.2.13 diff -C2 -d -r1.4.2.12 -r1.4.2.13 *** GerminationCell.cpp 9 Apr 2008 03:02:07 -0000 1.4.2.12 --- GerminationCell.cpp 17 May 2008 16:59:53 -0000 1.4.2.13 *************** *** 174,178 **** MarkReadOnly(draw, back, backColor); draw.SetForeColor(_textColor); ! draw.SetFontObject(_font); // Handle flexCount here so that we wrap the text, but not the select color --- 174,178 ---- MarkReadOnly(draw, back, backColor); draw.SetForeColor(_textColor); ! draw.SetFontObject(GetFont()); // Handle flexCount here so that we wrap the text, but not the select color |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-17 16:59:22
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24269/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGDateCell.cpp RGTableCell.cpp RGTableCell.h Log Message: Fix problem changing fonts on cells using italics Index: RGDateCell.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDateCell.cpp,v retrieving revision 1.2.2.15 retrieving revision 1.2.2.16 diff -C2 -d -r1.2.2.15 -r1.2.2.16 *** RGDateCell.cpp 30 Mar 2008 21:54:32 -0000 1.2.2.15 --- RGDateCell.cpp 17 May 2008 16:59:18 -0000 1.2.2.16 *************** *** 169,173 **** MarkReadOnly(draw, back, backColor); ! draw.SetFontObject(_font); draw.MoveTo(back.left+3,back.top + draw.GetFontAscent()); --- 169,173 ---- MarkReadOnly(draw, back, backColor); ! draw.SetFontObject(GetFont()); draw.MoveTo(back.left+3,back.top + draw.GetFontAscent()); Index: RGTableCell.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.h,v retrieving revision 1.23.2.12 retrieving revision 1.23.2.13 diff -C2 -d -r1.23.2.12 -r1.23.2.13 *** RGTableCell.h 12 Apr 2008 22:42:08 -0000 1.23.2.12 --- RGTableCell.h 17 May 2008 16:59:18 -0000 1.23.2.13 *************** *** 205,209 **** long MyColumnWidth(); bool IsDrawnAsSelected(); ! //!!! Split this up into many classes // Text Data --- 205,210 ---- long MyColumnWidth(); bool IsDrawnAsSelected(); ! XGFont *GetFont(); ! //!!! Split this up into many classes // Text Data *************** *** 229,233 **** short _type; Color _textColor; ! XGFont *_font; bool _readOnly; bool _tempReadOnly; --- 230,234 ---- short _type; Color _textColor; ! XGFont *_specialFont; bool _readOnly; bool _tempReadOnly; Index: RGTableCell.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.cpp,v retrieving revision 1.46.2.24 retrieving revision 1.46.2.25 diff -C2 -d -r1.46.2.24 -r1.46.2.25 *** RGTableCell.cpp 14 May 2008 13:06:32 -0000 1.46.2.24 --- RGTableCell.cpp 17 May 2008 16:59:18 -0000 1.46.2.25 *************** *** 88,92 **** _iconSize.h = 0; _iconSize.v = 0; ! _font = XGFont::LoadFont(1); _altIconID = 0; --- 88,92 ---- _iconSize.h = 0; _iconSize.v = 0; ! _specialFont = NULL; _altIconID = 0; *************** *** 119,123 **** _iconSize.h = 0; _iconSize.v = 0; ! _font = _parent->GetFont(); _altIconID = 0; --- 119,123 ---- _iconSize.h = 0; _iconSize.v = 0; ! _specialFont = NULL; _altIconID = 0; *************** *** 220,224 **** void RGTableCell::SetFontStyle(short flags) { ! _font = XGFont::GetFontVariant(_font, flags); } --- 220,226 ---- void RGTableCell::SetFontStyle(short flags) { ! if(_specialFont != NULL) ! _specialFont->Release(); ! _specialFont = XGFont::GetFontVariant(_parent->GetFont(), flags); } *************** *** 443,447 **** if (GetColumn() < _parent->GetNumColumns()-1) r.right--; ! draw.SetFontObject(_font); h = SizeWrappedText(draw,r,buffer) + 4; break; --- 445,449 ---- if (GetColumn() < _parent->GetNumColumns()-1) r.right--; ! draw.SetFontObject(GetFont()); h = SizeWrappedText(draw,r,buffer) + 4; break; *************** *** 536,540 **** } draw.SetForeColor(_textColor); ! draw.SetFontObject(_font); draw.MoveTo(back.left+3,back.top + draw.GetFontAscent()); --- 538,542 ---- } draw.SetForeColor(_textColor); ! draw.SetFontObject(GetFont()); draw.MoveTo(back.left+3,back.top + draw.GetFontAscent()); *************** *** 1646,1650 **** short RGTableCell::WidthOfString(const char *str, XGDraw& draw) { ! draw.SetFontObject(_font); return draw.StringWidth(str, strlen(str)); } --- 1648,1652 ---- short RGTableCell::WidthOfString(const char *str, XGDraw& draw) { ! draw.SetFontObject(GetFont()); return draw.StringWidth(str, strlen(str)); } *************** *** 1698,1701 **** --- 1700,1718 ---- } + //******************************************* + /// GetFont + // + /// Use the parent tables font in non-special cases, in order to not have to update the font + // of every cell. + // + XGFont *RGTableCell::GetFont() + { + if(_specialFont != NULL) + return _specialFont; + else + return _parent->GetFont(); + } + + #pragma mark *** AddRemoveDialog *** |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-16 10:59:09
|
Update of /cvsroot/igarden/Garden/source/resources/English.lproj/GardenSketch Help In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13290/source/resources/English.lproj/GardenSketch Help Modified Files: Tag: Release_branch_v1 QuickTour.html Log Message: FInal checkin for dev051608 Index: QuickTour.html =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/English.lproj/GardenSketch Help/QuickTour.html,v retrieving revision 1.4.2.4 retrieving revision 1.4.2.5 diff -C2 -d -r1.4.2.4 -r1.4.2.5 *** QuickTour.html 9 Mar 2008 02:20:17 -0000 1.4.2.4 --- QuickTour.html 16 May 2008 10:58:27 -0000 1.4.2.5 *************** *** 85,89 **** <li> <p class="c5"> ! Click and drag a line on the plan.<blockquote>This has planted a row of coneflowers.</blockquote> </p> </li> --- 85,89 ---- <li> <p class="c5"> ! Click and drag a line on the plan.<blockquote>This has planted a row of beebalms.</blockquote> </p> </li> *************** *** 95,104 **** <li> <p class="c5"> ! Click and drag a line on the plan.<blockquote>This plants a rectangular bed of coneflowers.</blockquote> </p> </li> <li> <p class="c5"> ! Click the List tab at the top of the main window.<blockquote>There should be one row for each group of coneflowers planted. With correct quantities, plot name, year planted, and other data.</blockquote> </p> </li> --- 95,104 ---- <li> <p class="c5"> ! Click and drag a line on the plan.<blockquote>This plants a rectangular bed of beebalms.</blockquote> </p> </li> <li> <p class="c5"> ! Click the List tab at the top of the main window.<blockquote>There should be one row for each group of beebalms planted. With correct quantities, plot name, year planted, and other data.</blockquote> </p> </li> |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-16 10:59:09
|
Update of /cvsroot/igarden/Garden/Macintosh In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13290/Macintosh Modified Files: Tag: Release_branch_v1 Info.plist Log Message: FInal checkin for dev051608 Index: Info.plist =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Info.plist,v retrieving revision 1.9.2.7 retrieving revision 1.9.2.8 diff -C2 -d -r1.9.2.7 -r1.9.2.8 *** Info.plist 29 Mar 2008 20:26:28 -0000 1.9.2.7 --- Info.plist 16 May 2008 10:58:24 -0000 1.9.2.8 *************** *** 99,103 **** <string>GardenSketch</string> <key>CFBundleGetInfoString</key> ! <string>GardenSketch 1.0 development build 03-03-08, Copyright 2008 Redstart Software</string> <key>CFBundleHelpBookFolder</key> <string>GardenSketch Help</string> --- 99,103 ---- <string>GardenSketch</string> <key>CFBundleGetInfoString</key> ! <string>GardenSketch 1.0 development build 05-16-08, Copyright 2008 Redstart Software</string> <key>CFBundleHelpBookFolder</key> <string>GardenSketch Help</string> *************** *** 113,121 **** <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>GardenSketch 1.0 dev 03-03-08</string> <key>CFBundleSignature</key> <string>RSGB</string> <key>CFBundleVersion</key> ! <string>1.0d030308</string> <key>CSResourcesFileMapped</key> <true/> --- 113,121 ---- <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>GardenSketch 1.0 dev 05-16-08</string> <key>CFBundleSignature</key> <string>RSGB</string> <key>CFBundleVersion</key> ! <string>1.0d051608</string> <key>CSResourcesFileMapped</key> <true/> |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-15 12:34:27
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15245/YAAFExtensions Modified Files: Tag: Release_branch_v1 RGDisclosureView.cpp Log Message: Fix display of imported image Index: RGDisclosureView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDisclosureView.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** RGDisclosureView.cpp 5 Feb 2006 04:06:58 -0000 1.3 --- RGDisclosureView.cpp 15 May 2008 12:34:18 -0000 1.3.2.1 *************** *** 127,135 **** } ! newRect.top = 0; ! newRect.left = 0; ! newRect.bottom = winSize.v; ! newRect.right = winSize.h; ! RecalcAutoLocation(NULL, NULL, &newViewRect); win->SetWindowSize(winSize); win->InvalView(&newViewRect); --- 127,131 ---- } ! RecalcAutoLocation(NULL, NULL, NULL); win->SetWindowSize(winSize); win->InvalView(&newViewRect); |
|
From: Jeffrey B. <jlb...@us...> - 2008-05-15 12:33:30
|
Update of /cvsroot/igarden/CommonSource/CQTImagePane In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14367/CQTImagePane Modified Files: Tag: Release_branch_v1 CQTImagePane.cpp Log Message: Refresh the image pane if it got resized Index: CQTImagePane.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/CQTImagePane/CQTImagePane.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 *** CQTImagePane.cpp 14 May 2008 13:05:35 -0000 1.8.2.3 --- CQTImagePane.cpp 15 May 2008 12:33:31 -0000 1.8.2.4 *************** *** 440,448 **** CQTImagePane::InvalView(Rect * /*r*/) { XGView::InvalView(); // Call UpdateGWorld ! Rect theLocalFrameRect = GetContentRect(); ! mGWorld->SetBounds(theLocalFrameRect); } --- 440,456 ---- CQTImagePane::InvalView(Rect * /*r*/) { + Rect oldBounds; + XGView::InvalView(); // Call UpdateGWorld ! Rect newBounds = GetContentRect(); ! mGWorld->GetBounds(oldBounds); ! if(newBounds.top != oldBounds.top || newBounds.bottom != oldBounds.bottom || ! newBounds.left != oldBounds.left || newBounds.right != oldBounds.right) ! { ! mGWorld->SetBounds(newBounds); ! mGWorldDirty = true; ! } } |