diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-09 12:03:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-09 12:03:05 +0000 |
| commit | 90ad8a832e60b3134fc1362cdf2e0617391e3160 (patch) | |
| tree | d7e9441653367de966b1142a94ff56997bec0b69 | |
| parent | a8fe13ffc15d8715eb9be11eed27bdfa1538ea70 (diff) | |
missing resource
git-svn-id: http://svn.miranda-ng.org/main/trunk@878 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | src/core/stdaway/resource.rc | 18 | ||||
| -rw-r--r-- | src/modules/button/button.cpp | 8 | ||||
| -rw-r--r-- | src/resource.rc | 19 |
3 files changed, 21 insertions, 24 deletions
diff --git a/src/core/stdaway/resource.rc b/src/core/stdaway/resource.rc index 67ab10e988..72824c871a 100644 --- a/src/core/stdaway/resource.rc +++ b/src/core/stdaway/resource.rc @@ -25,6 +25,17 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // Dialog
//
+IDD_READAWAYMSG DIALOGEX 0, 0, 187, 72
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CONTROLPARENT
+CAPTION "%s Message for %s"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "&Cancel",IDOK,69,53,50,14
+ CTEXT "Retrieving %s message...",IDC_RETRIEVING,5,21,177,8,SS_NOPREFIX
+ EDITTEXT IDC_MSG,5,5,177,43,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL
+END
+
IDD_OPT_AWAYMSG DIALOGEX 0, 0, 263, 151
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
@@ -72,6 +83,13 @@ END #ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
+ IDD_READAWAYMSG, DIALOG
+ BEGIN
+ LEFTMARGIN, 5
+ RIGHTMARGIN, 182
+ TOPMARGIN, 5
+ BOTTOMMARGIN, 67
+ END
IDD_OPT_AWAYMSG, DIALOG
BEGIN
LEFTMARGIN, 4
diff --git a/src/modules/button/button.cpp b/src/modules/button/button.cpp index f3384f3fcc..ed00c94f3b 100644 --- a/src/modules/button/button.cpp +++ b/src/modules/button/button.cpp @@ -261,11 +261,9 @@ static void PaintWorker(MButtonCtrl *ctl, HDC hdcPaint) static LRESULT CALLBACK MButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
MButtonCtrl* bct = (MButtonCtrl *)GetWindowLongPtr(hwndDlg, 0);
- if (bct && bct->fnWindowProc) {
- LRESULT res = bct->fnWindowProc(hwndDlg, msg, wParam, lParam);
- if (res)
- return res;
- }
+ if (bct && bct->fnWindowProc)
+ if ( bct->fnWindowProc(hwndDlg, msg, wParam, lParam))
+ return bct->lResult;
switch(msg) {
case WM_NCCREATE:
diff --git a/src/resource.rc b/src/resource.rc index 87ffa8965a..d760907b70 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -169,17 +169,6 @@ BEGIN CONTROL "",IDC_PAGETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_NOHSCROLL | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,347,86,52,137
END
-IDD_READAWAYMSG DIALOGEX 0, 0, 187, 72
-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTROLPARENT
-CAPTION "%s Message for %s"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- DEFPUSHBUTTON "&Cancel",IDOK,69,53,50,14
- CTEXT "Retrieving %s message...",IDC_RETRIEVING,5,21,177,8,SS_NOPREFIX
- EDITTEXT IDC_MSG,5,5,177,43,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_VISIBLE | WS_VSCROLL
-END
-
IDD_SETAWAYMSG DIALOGEX 0, 0, 187, 72
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT
@@ -803,14 +792,6 @@ BEGIN BOTTOMMARGIN, 297
END
- IDD_READAWAYMSG, DIALOG
- BEGIN
- LEFTMARGIN, 5
- RIGHTMARGIN, 182
- TOPMARGIN, 5
- BOTTOMMARGIN, 67
- END
-
IDD_SETAWAYMSG, DIALOG
BEGIN
LEFTMARGIN, 5
|