[BUG_FIXED] Fix smart highlight bug.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@202 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-05-15 23:03:41 +00:00
parent 3208c99d98
commit cfdbd4b5ef
4 changed files with 15 additions and 4 deletions

View File

@ -7816,6 +7816,12 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
return (LRESULT)_mainMenuHandle; return (LRESULT)_mainMenuHandle;
} }
case NPPM_INTERNAL_CLEARINDICATOR :
{
_pEditView->clearIndicator(SCE_UNIVERSAL_FOUND_STYLE_2);
return TRUE;
}
case WM_INITMENUPOPUP: case WM_INITMENUPOPUP:
{ {
_windowsMenu.initPopupMenu((HMENU)wParam, _pEditView); _windowsMenu.initPopupMenu((HMENU)wParam, _pEditView);

View File

@ -727,6 +727,7 @@ private:
case '%': case '%':
case '$': case '$':
case '"': case '"':
case '\'':
case '~': case '~':
case '&': case '&':
case '{': case '{':

View File

@ -664,6 +664,11 @@ BOOL CALLBACK SettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara
case IDC_CHECK_ENABLSMARTHILITE : case IDC_CHECK_ENABLSMARTHILITE :
{ {
nppGUI._enableSmartHilite = !nppGUI._enableSmartHilite; nppGUI._enableSmartHilite = !nppGUI._enableSmartHilite;
if (!nppGUI._enableSmartHilite)
{
HWND grandParent = ::GetParent(_hParent);
::SendMessage(grandParent, NPPM_INTERNAL_CLEARINDICATOR, 0, 0);
}
return TRUE; return TRUE;
} }
@ -947,8 +952,7 @@ BOOL CALLBACK LangMenuDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara
} }
} }
HWND grandParent; HWND grandParent = ::GetParent(_hParent);
grandParent = ::GetParent(_hParent);
if (LOWORD(wParam)==IDC_BUTTON_REMOVE) if (LOWORD(wParam)==IDC_BUTTON_REMOVE)
{ {

View File

@ -284,7 +284,7 @@
#define NPPM_INTERNAL_ISTABBARREDUCED (NOTEPADPLUS_USER_INTERNAL + 12) #define NPPM_INTERNAL_ISTABBARREDUCED (NOTEPADPLUS_USER_INTERNAL + 12)
#define NPPM_INTERNAL_ISFOCUSEDTAB (NOTEPADPLUS_USER_INTERNAL + 13) #define NPPM_INTERNAL_ISFOCUSEDTAB (NOTEPADPLUS_USER_INTERNAL + 13)
#define NPPM_INTERNAL_GETMENU (NOTEPADPLUS_USER_INTERNAL + 14) #define NPPM_INTERNAL_GETMENU (NOTEPADPLUS_USER_INTERNAL + 14)
//#define NPPM_INTERNAL_MARKALL (NOTEPADPLUS_USER_INTERNAL + 15) #define NPPM_INTERNAL_CLEARINDICATOR (NOTEPADPLUS_USER_INTERNAL + 15)
// See Notepad_plus_msgs.h // See Notepad_plus_msgs.h
//#define NOTEPADPLUS_USER (WM_USER + 1000) //#define NOTEPADPLUS_USER (WM_USER + 1000)