--- a/ooDialog/trunk/ooDialog/oodViewControls.cpp
+++ b/ooDialog/trunk/ooDialog/oodViewControls.cpp
@@ -52,75 +52,6 @@
 #include "oodResources.hpp"
 
 /**
- * This is the window procedure used to subclass the edit control for both the
- * ListView and TreeView objects.  It would be nice to convert this to use
- * the better API: SetWindowSubclass / RemoveWindowSubclass.
- *
- * TODO this whole subclassing thing is no longer needed.
- */
-WNDPROC wpOldEditProc = NULL;
-
-LONG_PTR CALLBACK CatchReturnSubProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    switch ( uMsg )
-    {
-        case WM_GETDLGCODE:
-            return(DLGC_WANTALLKEYS | CallWindowProc(wpOldEditProc, hWnd, uMsg, wParam, lParam));
-
-        case WM_CHAR:
-            //Process this message to avoid message beeps.
-            if ( (wParam == VK_RETURN) || (wParam == VK_ESCAPE) )
-            {
-                return 0;
-            }
-            else
-            {
-                return CallWindowProc(wpOldEditProc, hWnd,uMsg, wParam, lParam);
-            }
-
-        default:
-            return CallWindowProc(wpOldEditProc, hWnd, uMsg, wParam, lParam);
-    }
-}
-
-
-/** TreeView::subclassEdit()
- *  TreeView::restoreEditClass()
- *  ListView::subclassEdit()
- *  ListView::restoreEditClass()
- */
-RexxMethod2(RexxObjectPtr, generic_subclassEdit, NAME, method, CSELF, pCSelf)
-{
-    HWND hwnd = getDChCtrl(pCSelf);
-
-    HWND hEdit;
-    if ( ((pCDialogControl)pCSelf)->controlType == winTreeView )
-    {
-        hEdit = TreeView_GetEditControl(hwnd);
-    }
-    else
-    {
-        hEdit = ListView_GetEditControl(hwnd);
-    }
-
-    if ( *method == 'S' )
-    {
-        WNDPROC oldProc = (WNDPROC)setWindowPtr(hEdit, GWLP_WNDPROC, (LONG_PTR)CatchReturnSubProc);
-        if ( oldProc != (WNDPROC)CatchReturnSubProc )
-        {
-            wpOldEditProc = oldProc;
-        }
-        return pointer2string(context, oldProc);
-    }
-    else
-    {
-        setWindowPtr(hEdit, GWLP_WNDPROC, (LONG_PTR)wpOldEditProc);
-    }
-    return TheZeroObj;
-}
-
-
-/**
  * Methods for the DateTimePicker class.
  */
 #define DATETIMEPICKER_CLASS     "DateTimePicker"