Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BUG_FIXED] (Author: Ivan Radić, aka Loreia)

Browse Source 
- Expanded max array style from 24 to 30 (to accomodate for GlobalStyles).
- UDL Styler dialog has removed close cutton because it is causing application crash in Npp v.6.2
- Fixed bug where "Folder in code" keywords were detected even outside of commnets.
- Fixed bug where 0xfece57 was picked as number, but 0xfe57ce was not.


git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@972 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-10-20 16:20:57 +00:00
parent 3bfa679f4a
commit b31da09c2b
3 changed files with 398 additions and 380 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
View File

@ -1591,7 +1591,6 @@ BOOL CALLBACK StylerDlg::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
if (HIWORD(wParam) == CBN_SELCHANGE) if (HIWORD(wParam) == CBN_SELCHANGE)
{ {
int i = ::SendDlgItemMessage(hwnd, LOWORD(wParam), CB_GETCURSEL, 0, 0); int i = ::SendDlgItemMessage(hwnd, LOWORD(wParam), CB_GETCURSEL, 0, 0);
Style & style = SharedParametersDialog::_pUserLang->_styleArray.getStyler(dlg->stylerIndex);
if (LOWORD(wParam) == IDC_STYLER_COMBO_FONT_SIZE) if (LOWORD(wParam) == IDC_STYLER_COMBO_FONT_SIZE)
{ {
TCHAR intStr[5]; TCHAR intStr[5];
@ -1678,6 +1677,11 @@ BOOL CALLBACK StylerDlg::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
return TRUE; return TRUE;
} }
return FALSE;
}
case WM_CLOSE:
{
return TRUE;
} }
default : default :
return FALSE; return FALSE;

4
PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
View File

@ -217,7 +217,7 @@ END
IDD_GLOBAL_USERDEFINE_DLG DIALOGEX 36, 44, 365, 670 IDD_GLOBAL_USERDEFINE_DLG DIALOGEX 36, 44, 365, 670
STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_VSCROLL | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_VSCROLL | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW EXSTYLE WS_EX_TOOLWINDOW
CAPTION "User Defined Language" CAPTION "User Defined Language v2.0"
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
LTEXT "User language : ",IDC_LANGNAME_STATIC,0,3,63,8,0,WS_EX_RIGHT LTEXT "User language : ",IDC_LANGNAME_STATIC,0,3,63,8,0,WS_EX_RIGHT
@ -248,7 +248,7 @@ BEGIN
END END
IDD_STYLER_POPUP_DLG DIALOGEX 100, 50, 324, 305 IDD_STYLER_POPUP_DLG DIALOGEX 100, 50, 324, 305
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION
CAPTION "Styler Dialog" CAPTION "Styler Dialog"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN

764
scintilla/lexers/LexUser.cxx
View File

File diff suppressed because it is too large Load Diff