[dquintana] 63196: [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.

Author: dquintana
Date: Thu May  8 20:16:06 2014
New Revision: 63196

URL: http://svn.reactos.org/svn/reactos?rev=63196&view=rev
Log:
[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.

Modified:
    branches/shell-experiments/dll/win32/browseui/addressband.cpp
    branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp
    branches/shell-experiments/dll/win32/browseui/addresseditbox.h

Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/brow...
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/addressband.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/addressband.cpp	[iso-8859-1] Thu May  8 20:16:06 2014
@@ -134,7 +134,7 @@

// 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;

Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/brow...
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp	[iso-8859-1] Thu May  8 20:16:06 2014
@@ -40,7 +40,8 @@
 */

CAddressEditBox::CAddressEditBox() :
-        fEditWindow(NULL, this, 1)
+    fCombobox(NULL, this, 1),
+    fEditWindow(NULL, this, 1)
 {
 }

@@ -56,8 +57,6 @@

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::Init(HWND comboboxEx, HWND editControl, long param14, IUnknown *param18)
 {
-    SubclassWindow(comboboxEx);
+    fCombobox.SubclassWindow(comboboxEx);
     fEditWindow.SubclassWindow(editControl);
     return S_OK;
 }

Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.h
URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/brow...
==============================================================================
--- branches/shell-experiments/dll/win32/browseui/addresseditbox.h	[iso-8859-1] (original)
+++ branches/shell-experiments/dll/win32/browseui/addresseditbox.h	[iso-8859-1] Thu May  8 20:16:06 2014
@@ -33,6 +33,7 @@
     public IShellService
 {
 private:
+    CContainedWindow                        fCombobox;
     CContainedWindow                        fEditWindow;
 public:
     CAddressEditBox();