[Igarden-commit] CommonSource/YAAFExtensions RGClipboard.h, 1.3, 1.4 PictureSelectDialog.cpp, 1.16,
Status: Beta
Brought to you by:
jlbedell
Menu
▾
▴
[Igarden-commit] CommonSource/YAAFExtensions RGClipboard.h, 1.3, 1.4 PictureSelectDialog.cpp, 1.16, 1.17 RGPanelSet.cpp, 1.5, 1.6 RGTableCell.cpp, 1.48, 1.49 RGCompression.cpp, 1.4, 1.5 RGBackdropView.cpp, 1.3, 1.4 RGClipboard.cpp, 1.8, 1.9 RGHypertext.cpp, 1.28, 1.29 RGPictPattern.cpp, 1.3, 1.4 RGImageImportPane.cpp, 1.4, 1.5 RGDateTime.cpp, 1.15, 1.16 RGHypertext.h, 1.14, 1.15
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 01:16:17
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11778 Modified Files: RGClipboard.h PictureSelectDialog.cpp RGPanelSet.cpp RGTableCell.cpp RGCompression.cpp RGBackdropView.cpp RGClipboard.cpp RGHypertext.cpp RGPictPattern.cpp RGImageImportPane.cpp RGDateTime.cpp RGHypertext.h Log Message: Change #error to #warning to ease porting Index: PictureSelectDialog.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/PictureSelectDialog.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PictureSelectDialog.cpp 15 Oct 2006 01:16:03 -0000 1.16 --- PictureSelectDialog.cpp 18 Oct 2006 01:16:10 -0000 1.17 *************** *** 27,31 **** --- 27,33 ---- **********************************************************************/ + #if OPT_MACOS #include "RedstartGarden.h" + #endif #include "PictureSelectDialog.h" #include "CalendarView.h" *************** *** 223,226 **** --- 225,229 ---- #pragma mark RGDialog_Overrides + //******************************************* /// Setup Index: RGImageImportPane.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGImageImportPane.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RGImageImportPane.cpp 7 Oct 2006 23:59:27 -0000 1.4 --- RGImageImportPane.cpp 18 Oct 2006 01:16:11 -0000 1.5 *************** *** 171,175 **** } #else ! #error TO_BE_PORTED #endif InvalView(); --- 171,175 ---- } #else ! #warning ***Won't support ImageImportPane #endif InvalView(); *************** *** 259,263 **** --- 259,267 ---- PRECONDITION(SourceSpecified()); scaledRect = GetScaledRect(); + #if OPT_MACOS (void)GetNaturalSize(naturalSize); + #else + #warning ***Won't support ImageImportPane + #endif xScale = (double)(naturalSize.right - naturalSize.left) / (double)(scaledRect.right - scaledRect.left); yScale = (double)(naturalSize.bottom - naturalSize.top) / (double)(scaledRect.bottom - scaledRect.top); *************** *** 283,287 **** --- 287,295 ---- if(!GetSourceRect(naturalSize)) { + #if OPT_MACOS (void)GetNaturalSize(naturalSize); + #else + #warning ***Won't support ImageImportPane + #endif } xScale = (double)(naturalSize.right - naturalSize.left) / (double)(scaledRect.right - scaledRect.left); Index: RGBackdropView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGBackdropView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RGBackdropView.cpp 7 Oct 2006 23:50:14 -0000 1.3 --- RGBackdropView.cpp 18 Oct 2006 01:16:11 -0000 1.4 *************** *** 67,72 **** #if OPT_MACOS ::SetThemeBackground(rec.theme, draw.PixelDepth(), draw.IsColor()); - #else - #error TO_BE_PORTED #endif --- 67,70 ---- Index: RGDateTime.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDateTime.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** RGDateTime.cpp 7 Oct 2006 23:42:58 -0000 1.15 --- RGDateTime.cpp 18 Oct 2006 01:16:11 -0000 1.16 *************** *** 208,212 **** outString = tmp; #else ! #error TO_BE_PORTED #endif } --- 208,212 ---- outString = tmp; #else ! #warning ***Won't support DateStrings #endif } Index: RGTableCell.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** RGTableCell.cpp 7 Oct 2006 23:41:41 -0000 1.48 --- RGTableCell.cpp 18 Oct 2006 01:16:11 -0000 1.49 *************** *** 1279,1283 **** } #else ! #error TO_BE_PORTED #endif } --- 1279,1283 ---- } #else ! #warning ***Won't support inline close #endif } Index: RGClipboard.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGClipboard.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RGClipboard.cpp 7 Oct 2006 23:53:50 -0000 1.8 --- RGClipboard.cpp 18 Oct 2006 01:16:11 -0000 1.9 *************** *** 43,46 **** --- 43,50 ---- RGClipboard* RGClipboard::sClipboard = NULL; + #if OPT_XWIN + static XGHandle GClipboard; // defined in YAAF libraries + #endif + void RGClipboard::ToClipboard(XGHandle &data, long dataType) { *************** *** 213,217 **** return gw; #else ! #error TO_BE_PORTED #endif } --- 217,221 ---- return gw; #else ! #warning ***Won't support PICTFromClipboard #endif } *************** *** 335,339 **** return result; #else ! #error TO_BE_PORTED #endif } --- 339,343 ---- return result; #else ! #warning ***Won't support PictureKind on Clipboard #endif } Index: RGCompression.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGCompression.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RGCompression.cpp 9 Oct 2006 12:11:38 -0000 1.4 --- RGCompression.cpp 18 Oct 2006 01:16:11 -0000 1.5 *************** *** 30,36 **** #if MAC_OS #include <AvailabilityMacros.h> #endif #include "RGCompression.h" - #include "RedstartGarden.h" #include "CGWorld.h" #include <XGFileSpecifier.h> --- 30,36 ---- #if MAC_OS #include <AvailabilityMacros.h> + #include "RedstartGarden.h" #endif #include "RGCompression.h" #include "CGWorld.h" #include <XGFileSpecifier.h> *************** *** 70,74 **** delete [] compressPtr; #else ! #error TO_BE_PORTED #endif } --- 70,74 ---- delete [] compressPtr; #else ! #warning ***Won't support CompressFileJPEG #endif } *************** *** 135,139 **** return result; #else ! #error TO_BE_PORTED #endif } --- 135,139 ---- return result; #else ! #warning ***Won't support DecompressFile #endif } Index: RGHypertext.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertext.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** RGHypertext.cpp 15 Oct 2006 00:45:10 -0000 1.28 --- RGHypertext.cpp 18 Oct 2006 01:16:11 -0000 1.29 *************** *** 41,47 **** #if OPT_MACOS #include <quickdraw.h> #endif #include "MyAssert.h" - #include "PluginUtils.h" #include "CGWorld.h" #include "RGCompression.h" --- 41,47 ---- #if OPT_MACOS #include <quickdraw.h> + #include "PluginUtils.h" #endif #include "MyAssert.h" #include "CGWorld.h" #include "RGCompression.h" *************** *** 73,76 **** --- 73,82 ---- _scaleByPercent = 100; _lineHeight = 0; + _findImageFP = NULL; + } + + void RGHypertext::SetImageFinder(findImageFP proc) + { + _findImageFP = proc; } *************** *** 310,313 **** --- 316,321 ---- LineTo(_startX+pwidth-_scrollX, yPos-_scrollY); } + #elif OPT_XWIN + #warning ***Won't support Lines on hypertext #else #error TO_BE_PORTED *************** *** 768,773 **** } } ! else ! CalcPathPictureSpec(info.spec, filename.c_str(), '/'); info.top = static_cast<long>(_y); --- 776,782 ---- } } ! else if(_findImageFP != NULL) ! (*_findImageFP)(info.spec, filename); ! // CalcPathPictureSpec(info.spec, filename.c_str(), '/'); info.top = static_cast<long>(_y); Index: RGHypertext.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertext.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RGHypertext.h 9 Oct 2006 12:17:56 -0000 1.14 --- RGHypertext.h 18 Oct 2006 01:16:11 -0000 1.15 *************** *** 164,167 **** --- 164,169 ---- } lineEntry_t; + typedef void (*findImageFP) (XGFileSpecifier &spec, String &path); + /************************************************************************/ /* */ *************** *** 177,183 **** class RGHypertext : public RGHypertextParser { ! public: RGHypertext(); virtual ~RGHypertext(); private: RGHypertext& RGHypertext::operator=(const RGHypertext& p); --- 179,186 ---- class RGHypertext : public RGHypertextParser { ! public: RGHypertext(); virtual ~RGHypertext(); + void SetImageFinder(findImageFP proc); private: RGHypertext& RGHypertext::operator=(const RGHypertext& p); *************** *** 286,289 **** --- 289,293 ---- short _scaleByPercent; XGDynArray<lineEntry_t> _entries; + findImageFP _findImageFP; }; Index: RGPanelSet.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGPanelSet.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RGPanelSet.cpp 8 Oct 2006 00:00:39 -0000 1.5 --- RGPanelSet.cpp 18 Oct 2006 01:16:11 -0000 1.6 *************** *** 93,97 **** return result; #else ! #error TO_BE_PORTED #endif } --- 93,97 ---- return result; #else ! #warning ***Won't support PanelSets #endif } *************** *** 113,117 **** return result; #else ! #error TO_BE_PORTED #endif } --- 113,117 ---- return result; #else ! #warning ***Won't support PanelSets #endif } Index: RGPictPattern.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGPictPattern.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RGPictPattern.cpp 8 Oct 2006 00:02:08 -0000 1.3 --- RGPictPattern.cpp 18 Oct 2006 01:16:11 -0000 1.4 *************** *** 92,98 **** r = (**p).picFrame; #else ! #error TO_BE_PORTED #endif ! height = r.bottom - r.top; width = r.right - r.left; --- 92,98 ---- r = (**p).picFrame; #else ! #warning ***Won't support XGPictPattern #endif ! height = r.bottom - r.top; width = r.right - r.left; Index: RGClipboard.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGClipboard.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RGClipboard.h 5 Jun 2005 10:57:13 -0000 1.3 --- RGClipboard.h 18 Oct 2006 01:16:10 -0000 1.4 *************** *** 44,47 **** --- 44,57 ---- } pictureKind_t; + enum + { + #if OPT_MACOS + kClipText = kScrapFlavorTypeText + #elif OPT_XWIN + kClipText = 0 + #else + #error TO_BE_PORTED + #endif + }; /************************************************************************/ |