diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-28 21:03:47 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-28 21:03:47 +0000 |
| commit | 63f070c3b59ac66cc3fec6aed42af59a8f33a569 (patch) | |
| tree | a3acbfb2709a9bcb8f45015c0ce7358fdf8a6728 /chrome/test | |
| parent | 5ee76d47e12c3bcaf088483456470698720c082d (diff) | |
| download | chromium_src-63f070c3b59ac66cc3fec6aed42af59a8f33a569.zip chromium_src-63f070c3b59ac66cc3fec6aed42af59a8f33a569.tar.gz chromium_src-63f070c3b59ac66cc3fec6aed42af59a8f33a569.tar.bz2 | |
Fix some issues when building with Visual Studio 2008.
Fixed projects that are set as "Application (.exe)" but that don't build an application. Converted then to "Utility".
util_prebuild, V8Config and V8Bindings_prebuild.
Fixed a template compilation error in message_loop.h
Changed PROP_ENTRY to PROP_ENTRY_TYPE since the former is now deprecated.
Everything still builds fine on VS2005.
BUG=1290595
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/activex_test_control/chrome_test_control.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/test/activex_test_control/chrome_test_control.h b/chrome/test/activex_test_control/chrome_test_control.h index e923307..f63897d 100644 --- a/chrome/test/activex_test_control/chrome_test_control.h +++ b/chrome/test/activex_test_control/chrome_test_control.h @@ -107,10 +107,12 @@ END_COM_MAP() BEGIN_PROP_MAP(ChromeTestControl) PROP_DATA_ENTRY("_cx", m_sizeExtent.cx, VT_UI4) PROP_DATA_ENTRY("_cy", m_sizeExtent.cy, VT_UI4) - PROP_ENTRY("BackColor", DISPID_BACKCOLOR, CLSID_StockColorPage) - PROP_ENTRY("BorderColor", DISPID_BORDERCOLOR, CLSID_StockColorPage) - PROP_ENTRY("Caption", DISPID_CAPTION, CLSID_NULL) - PROP_ENTRY("ForeColor", DISPID_FORECOLOR, CLSID_StockColorPage) + PROP_ENTRY_TYPE("BackColor", DISPID_BACKCOLOR, CLSID_StockColorPage, + VT_COLOR) + PROP_ENTRY_TYPE("BorderColor", DISPID_BORDERCOLOR, CLSID_StockColorPage, + VT_COLOR) + PROP_ENTRY_TYPE("Caption", DISPID_CAPTION, CLSID_NULL, VT_BSTR) + PROP_ENTRY_TYPE("ForeColor", DISPID_FORECOLOR, CLSID_StockColorPage, VT_COLOR) // Example entries // PROP_ENTRY("Property Description", dispid, clsid) // PROP_PAGE(CLSID_StockColorPage) |