From 4afbeefc0a9aa11ccbdea87769b8b957af0f3cdb Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 17 Apr 2011 12:24:24 +0000 Subject: [PATCH] [BUG_FIXED] Remove unnecessary lines which could make bugs. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@747 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Notepad_plus.cpp | 2 +- PowerEditor/src/NppCommands.cpp | 4 ---- PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index 886b6e24a..419ff9dc3 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -4576,7 +4576,7 @@ void Notepad_plus::launchAnsiCharPanel() ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pAnsiCharPanel->getHSelf()); // define the default docking behaviour - data.uMask = DWS_DF_CONT_BOTTOM | DWS_ICONTAB | DWS_ADDINFO; + data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB | DWS_ADDINFO; data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); //data.pszAddInfo = _findAllResultStr; diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp index 3d107f2ab..150c481ab 100644 --- a/PowerEditor/src/NppCommands.cpp +++ b/PowerEditor/src/NppCommands.cpp @@ -25,8 +25,6 @@ #define CF_RTF TEXT("Rich Text Format") #define CF_NPPTEXTLEN TEXT("Notepad++ Binary Text Length") -static int copyDataLen = 0; - void Notepad_plus::macroPlayback(Macro macro) { _pEditView->execute(SCI_BEGINUNDOACTION); @@ -236,8 +234,6 @@ void Notepad_plus::command(int id) GlobalUnlock(hglb); } } - _pEditView->execute(SCI_REPLACESEL, 0, (LPARAM)""); - _pEditView->execute(SCI_ADDTEXT, copyDataLen, (LPARAM)lpchar); } else { diff --git a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp index a3c3f3be3..34a5118aa 100644 --- a/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp +++ b/PowerEditor/src/WinControls/AnsiCharPanel/ListView.cpp @@ -169,7 +169,7 @@ generic_string ListView::getAscii(unsigned char value) } } - return TEXT(""); + //return TEXT(""); } void ListView::setValues(int codepage)