Fixed comflicts with mjudge changes for Ender toolbar

cmd/winfe/eddialog.cpp

@@ -1465,5 +1465,5 @@ void CGetColumnsDlg::DoDataExchange(CDataExchange* pDX)
 ED_CharsetEncode FE_EncodingDialog(MWContext* pMWContext)
 {
     // TODO: Implement this!
-    return ED_ENDCODE_CANCEL;
+    return ED_ENCODE_CANCEL;
 }

cmd/winfe/edview.cpp

@@ -905,7 +905,7 @@ void CNetscapeEditView::OnSetFocus(CWnd *pOldWin)
     if (GetEmbedded())
     {
         CMainFrame * pFrame = (CMainFrame*)GetParentFrame();
-        CEnderBar *pControler = pFrame->getComposeToolBar();
+        CComboToolBar *pControler = pFrame->getComposeToolBar();
         if (pControler)
         {
             //must calculate position for toolbar
@@ -936,7 +936,7 @@ void CNetscapeEditView::OnKillFocus(CWnd *pOldWin)
     if (GetEmbedded())
     {
         CMainFrame * pFrame = (CMainFrame*)GetParentFrame();
-        CEnderBar *pControler = pFrame->getComposeToolBar();
+        CComboToolBar *pControler = pFrame->getComposeToolBar();
         CWnd *pWnd=NULL;
         CWnd *pCPparent=NULL;
         BOOL keepToolbar=FALSE;