diff options
| author | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-09-17 16:01:32 +0000 |
|---|---|---|
| committer | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-09-17 16:01:32 +0000 |
| commit | 38f5a42602ac6f2cf26f9b255246b1f4d97cf52e (patch) | |
| tree | e5de0f08a087f5ada68c890debb0b41e45cc98b5 | |
| parent | 640282ec9bb37aae87724b6403f456aece182eb9 (diff) | |
| download | swig-38f5a42602ac6f2cf26f9b255246b1f4d97cf52e.tar.gz | |
Cosmetic changes: Removed 'Impl' from coclass name; added a version declaration to the typelib.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-jezabek@10859 626c5289-ae23-0410-ae9c-e8d60b6d4f22
| -rw-r--r-- | Examples/test-suite/com/throw_exception_runme.c | 2 | ||||
| -rw-r--r-- | Examples/test-suite/com/virtual_poly_runme.c | 2 | ||||
| -rw-r--r-- | Source/Modules/com.cxx | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/Examples/test-suite/com/throw_exception_runme.c b/Examples/test-suite/com/throw_exception_runme.c index e0ac8975e..e2e1cbd9b 100644 --- a/Examples/test-suite/com/throw_exception_runme.c +++ b/Examples/test-suite/com/throw_exception_runme.c @@ -40,7 +40,7 @@ int main() { CoInitialize(NULL); - CoCreateInstance(&CLSID_throw_exceptionImpl, NULL, CLSCTX_INPROC_SERVER, &IID_Ithrow_exception, (void **) &te); + CoCreateInstance(&CLSID_throw_exception, NULL, CLSCTX_INPROC_SERVER, &IID_Ithrow_exception, (void **) &te); /* Construct Foo object */ te->lpVtbl->get_Foo(te, &fs); diff --git a/Examples/test-suite/com/virtual_poly_runme.c b/Examples/test-suite/com/virtual_poly_runme.c index 784521d33..63f6955e5 100644 --- a/Examples/test-suite/com/virtual_poly_runme.c +++ b/Examples/test-suite/com/virtual_poly_runme.c @@ -41,7 +41,7 @@ int main() { CoInitialize(NULL); - CoCreateInstance(&CLSID_virtual_polyImpl, NULL, CLSCTX_INPROC_SERVER, &IID_Ivirtual_poly, (void **) &vp); + CoCreateInstance(&CLSID_virtual_poly, NULL, CLSCTX_INPROC_SERVER, &IID_Ivirtual_poly, (void **) &vp); /* Objects containing NDouble and NInt static methods (including constructors) */ vp->lpVtbl->get_NDouble(vp, &nds); diff --git a/Source/Modules/com.cxx b/Source/Modules/com.cxx index bd8c8350c..ef3596b7c 100644 --- a/Source/Modules/com.cxx +++ b/Source/Modules/com.cxx @@ -529,7 +529,8 @@ public: Printf(f_module, "[\n uuid("); formatGUID(f_module, &typelib_guid, false); - Printf(f_module, ")\n]\nlibrary %sTLB {\n\n", module_class_name); + Printf(f_module, "),\n version(1.0)\n]\nlibrary %sTLB {\n\n", + module_class_name); // Import IDispatch declaration, part 2 Printf(f_module, " importlib(\"stdole2.tlb\");\n\n"); @@ -548,7 +549,7 @@ public: Printv(f_module, " [\n uuid(", NIL); formatGUID(f_module, &module_clsid, false); - Printv(f_module, ")\n ]\n coclass ", module_class_name, "Impl {\n" + Printv(f_module, ")\n ]\n coclass ", module_class_name, " {\n" " interface I", module_class_name, ";\n };\n\n", NIL); // Add the proxy code @@ -1169,7 +1170,7 @@ public: if (!Getattr(n, "abstract") && default_ctor_wname != NULL) { Printv(proxy_class_def, " [\n aggregatable,\n uuid(", NIL); formatGUID(proxy_class_def, proxy_clsid, false); - Printv(proxy_class_def, ")\n ]\n coclass $comclassnameImpl {\n" + Printv(proxy_class_def, ")\n ]\n coclass $comclassname {\n" " interface I$comclassname;\n };\n\n", NIL); } |