[BROWSEUI]

* Fix gcc build.
* Also, undo a change that wasn't as useful as I first thought it would be.
CORE-8183 #resolve #comment Here you go. Thanks for reporting.

svn path=/branches/shell-experiments/; revision=63196
This commit is contained in:
David Quintana 2014-05-08 20:16:06 +00:00
parent 057a69972f
commit 6fc740948a
3 changed files with 5 additions and 5 deletions

View file

@ -134,7 +134,7 @@ HRESULT STDMETHODCALLTYPE CAddressBand::SetSite(IUnknown *pUnkSite)
// create combo box ex
combobox = CreateWindowEx(WS_EX_TOOLWINDOW, WC_COMBOBOXEXW, NULL, WS_CHILD | WS_VISIBLE |
WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY,
WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED,
0, 0, 500, 250, parentWindow, (HMENU)0xa205, _AtlBaseModule.GetModuleInstance(), 0);
if (combobox == NULL)
return E_FAIL;

View file

@ -40,7 +40,8 @@ TODO:
*/
CAddressEditBox::CAddressEditBox() :
fEditWindow(NULL, this, 1)
fCombobox(NULL, this, 1),
fEditWindow(NULL, this, 1)
{
}
@ -56,8 +57,6 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *)
HRESULT STDMETHODCALLTYPE CAddressEditBox::FileSysChange(long param8, long paramC)
{
LPWSTR str8 = reinterpret_cast<LPWSTR>(param8);
LPWSTR strC = reinterpret_cast<LPWSTR>(paramC);
return E_NOTIMPL;
}
@ -68,7 +67,7 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Refresh(long param8)
HRESULT STDMETHODCALLTYPE CAddressEditBox::Init(HWND comboboxEx, HWND editControl, long param14, IUnknown *param18)
{
SubclassWindow(comboboxEx);
fCombobox.SubclassWindow(comboboxEx);
fEditWindow.SubclassWindow(editControl);
return S_OK;
}

View file

@ -33,6 +33,7 @@ class CAddressEditBox :
public IShellService
{
private:
CContainedWindow fCombobox;
CContainedWindow fEditWindow;
public:
CAddressEditBox();