[SHELL32] Remove some unused members and comment out some unused Wine code. CORE...

diff --git a/dll/win32/shell32/shellmenu/CMenuFocusManager.h b/dll/win32/shell32/shellmenu/CMenuFocusManager.h
index d74ed12..50575ce 100644 (file)
--- a/dll/win32/shell32/shellmenu/CMenuFocusManager.h
+++ b/dll/win32/shell32/shellmenu/CMenuFocusManager.h
@@ -77,7 +77,6 @@ private:
     INT   m_selectedItem;
     DWORD m_selectedItemFlags;
 
-    BOOL m_isLButtonDown;
     BOOL m_movedSinceDown;
     HWND m_windowAtDown;
 

diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
index 3d046ba..0b13432 100644 (file)
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
@@ -256,7 +256,6 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
 CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) :
     m_pager(this, 1),
     m_useFlatMenus(FALSE),
-    m_SubclassOld(NULL),
     m_disableMouseTrack(FALSE),
     m_timerEnabled(FALSE),
     m_menuBand(menuBand),

diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.h b/dll/win32/shell32/shellmenu/CMenuToolbars.h
index fcbd628..6463166 100644 (file)
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.h
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.h
@@ -32,7 +32,6 @@ class CMenuToolbarBase :
 private:
     HFONT   m_marlett;
     BOOL    m_useFlatMenus;
-    WNDPROC m_SubclassOld;
     BOOL    m_disableMouseTrack;
     BOOL    m_timerEnabled;
 

diff --git a/dll/win32/shell32/wine/shellole.c b/dll/win32/shell32/wine/shellole.c
index 8d58a00..ae9a39b 100644 (file)
--- a/dll/win32/shell32/wine/shellole.c
+++ b/dll/win32/shell32/wine/shellole.c
@@ -365,6 +365,8 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
  *  When the CreateInstance of the cf is called the callback is executed.
  */
 
+#ifndef __REACTOS__
+
 typedef struct
 {
     IClassFactory               IClassFactory_iface;
@@ -380,8 +382,6 @@ static inline IDefClFImpl *impl_from_IClassFactory(IClassFactory *iface)
        return CONTAINING_RECORD(iface, IDefClFImpl, IClassFactory_iface);
 }
 
-#ifndef __REACTOS__
-
 static const IClassFactoryVtbl dclfvt;
 
 /**************************************************************************