[Igarden-commit] Garden/source/Plugins PluginUtils.cpp, 1.23, 1.24 AppCallbackInterface.h, 1.7, 1.8
Status: Beta
Brought to you by:
jlbedell
Menu
▾
▴
[Igarden-commit] Garden/source/Plugins PluginUtils.cpp, 1.23, 1.24 AppCallbackInterface.h, 1.7, 1.8 PluginUtils.h, 1.10, 1.11 DefaultRenderPlugin.h, 1.9, 1.10
|
From: Jeffrey B. <jlb...@us...> - 2007-02-22 12:34:46
|
Update of /cvsroot/igarden/Garden/source/Plugins In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25274 Modified Files: PluginUtils.cpp AppCallbackInterface.h PluginUtils.h DefaultRenderPlugin.h Log Message: Win32 changes Index: DefaultRenderPlugin.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/DefaultRenderPlugin.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** DefaultRenderPlugin.h 9 Oct 2006 01:50:50 -0000 1.9 --- DefaultRenderPlugin.h 22 Feb 2007 12:34:04 -0000 1.10 *************** *** 1,16 **** //*********************************************************************************************** // ! // The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at // http://www.mozilla.org/MPL/ ! // ! // Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ! // ANY KIND, either express or implied. See the License for the specific language governing rights and // limitations under the License. ! // // The Original Code is GardenWorks plugin interface. ! // // The Initial Developer of the Original Code is Redstart Software. // Portions created by Initial Developer are Copyright (C) 2005 Redstart Software. All Rights Reserved. ! // // Contributor(s): // Jeffrey Bedell(je...@re...) --- 1,16 ---- //*********************************************************************************************** // ! // The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at // http://www.mozilla.org/MPL/ ! // ! // Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ! // ANY KIND, either express or implied. See the License for the specific language governing rights and // limitations under the License. ! // // The Original Code is GardenWorks plugin interface. ! // // The Initial Developer of the Original Code is Redstart Software. // Portions created by Initial Developer are Copyright (C) 2005 Redstart Software. All Rights Reserved. ! // // Contributor(s): // Jeffrey Bedell(je...@re...) *************** *** 29,33 **** // Define the UUID for the type. ! enum { --- 29,33 ---- // Define the UUID for the type. ! enum { *************** *** 40,44 **** --- 40,48 ---- public: // methods + #if OPT_WINOS + virtual HRESULT QueryInterface(const IID &inRefIID, void** inInterfaceID); + #else virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID inRefIID, void** inInterfaceID); + #endif virtual ULONG STDMETHODCALLTYPE AddRef(); virtual ULONG STDMETHODCALLTYPE Release(); *************** *** 54,58 **** virtual styleDisplay_t ShouldDisplay (uint32 index, styleCharacteristic_t item); virtual XGUUID BasedUponStyle(uint32 index); ! virtual void GetName(String& buf); virtual void GetShortName(String& buf); --- 58,62 ---- virtual styleDisplay_t ShouldDisplay (uint32 index, styleCharacteristic_t item); virtual XGUUID BasedUponStyle(uint32 index); ! virtual void GetName(String& buf); virtual void GetShortName(String& buf); *************** *** 74,78 **** public: // methods ! virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID inRefIID, void** inInterfaceID); virtual ULONG STDMETHODCALLTYPE AddRef(); virtual ULONG STDMETHODCALLTYPE Release(); --- 78,86 ---- public: // methods ! #if OPT_WINOS ! virtual HRESULT QueryInterface(const IID &inRefIID, void** inInterfaceID); ! #else ! virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID inRefIID, void** inInterfaceID); ! #endif virtual ULONG STDMETHODCALLTYPE AddRef(); virtual ULONG STDMETHODCALLTYPE Release(); *************** *** 83,87 **** virtual cnvErr_t DrawArrow(pointList_t &list, arrowType_t arrowType); virtual cnvErr_t DrawSymbol(planPoint_t point, planSymbol_t symbol, planScale_t scale); ! protected: private: --- 91,95 ---- virtual cnvErr_t DrawArrow(pointList_t &list, arrowType_t arrowType); virtual cnvErr_t DrawSymbol(planPoint_t point, planSymbol_t symbol, planScale_t scale); ! protected: private: *************** *** 94,98 **** public: // methods ! virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID inRefIID, void** inInterfaceID); virtual ULONG STDMETHODCALLTYPE AddRef(); virtual ULONG STDMETHODCALLTYPE Release(); --- 102,110 ---- public: // methods ! #if OPT_WINOS ! virtual HRESULT QueryInterface(const IID &inRefIID, void** inInterfaceID); ! #else ! virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID inRefIID, void** inInterfaceID); ! #endif virtual ULONG STDMETHODCALLTYPE AddRef(); virtual ULONG STDMETHODCALLTYPE Release(); *************** *** 103,107 **** virtual cnvErr_t DrawGenericItem(materialType_t mtype, planPoint_t center); virtual cnvErr_t GetGenericItemGrowConstraints(materialType_t mtype, planSize_t &minSize, planSize_t &incrSize, planSize_t &maxSize); ! protected: private: --- 115,119 ---- virtual cnvErr_t DrawGenericItem(materialType_t mtype, planPoint_t center); virtual cnvErr_t GetGenericItemGrowConstraints(materialType_t mtype, planSize_t &minSize, planSize_t &incrSize, planSize_t &maxSize); ! protected: private: Index: PluginUtils.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/PluginUtils.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** PluginUtils.cpp 18 Oct 2006 02:26:02 -0000 1.23 --- PluginUtils.cpp 22 Feb 2007 12:34:04 -0000 1.24 *************** *** 267,270 **** --- 267,280 ---- ReleaseResource((Handle)macPictureH); } + #elif OPT_WINOS + void OptCopyFileFromAppBundle(char *name) + { + // TO_BE_PORTED + } + + bool OptCopyFileFromURL(char *url, XGFileSpecifier &specIn) + { + // TO_BE_PORTED + } #else #warning ***Won't support OptCreateFileFromPICTResource Index: PluginUtils.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/PluginUtils.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PluginUtils.h 18 May 2006 11:15:47 -0000 1.10 --- PluginUtils.h 22 Feb 2007 12:34:04 -0000 1.11 *************** *** 47,49 **** void TestNameMatches(); ! #endif // PLUGIN_UTILS_H \ No newline at end of file --- 47,49 ---- void TestNameMatches(); ! #endif // PLUGIN_UTILS_H Index: AppCallbackInterface.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/AppCallbackInterface.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AppCallbackInterface.h 11 Oct 2006 01:22:54 -0000 1.7 --- AppCallbackInterface.h 22 Feb 2007 12:34:04 -0000 1.8 *************** *** 92,94 **** #define kXMLName "Name" ! #endif //APP_CALLBACK_INTERFACE \ No newline at end of file --- 92,94 ---- #define kXMLName "Name" ! #endif //APP_CALLBACK_INTERFACE |