[ 684737 ] Fix Language Box to handle dblclick

diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp
index ad68222..f23a2dd 100644 (file)
--- a/Src/Common/LanguageSelect.cpp
+++ b/Src/Common/LanguageSelect.cpp
@@ -180,14 +180,15 @@ void CLanguageSelect::DoDataExchange(CDataExchange* pDX)
 {
        CDialog::DoDataExchange(pDX);
        //{{AFX_DATA_MAP(CLanguageSelect)
-       DDX_Control(pDX, 30001, m_ctlLangList);
-       DDX_LBString(pDX, 30001, m_strLanguage);
+       DDX_Control(pDX, IDC_LANGUAGE_LIST, m_ctlLangList);
+       DDX_LBString(pDX, IDC_LANGUAGE_LIST, m_strLanguage);
        //}}AFX_DATA_MAP
 }
 
 
 BEGIN_MESSAGE_MAP(CLanguageSelect, CDialog)
 //{{AFX_MSG_MAP(CLanguageSelect)
+       ON_LBN_DBLCLK(IDC_LANGUAGE_LIST, OnDblclkLanguageList)
 //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -538,6 +539,11 @@ void CLanguageSelect::OnOK()
        EndDialog(IDOK);
 }
 
+void CLanguageSelect::OnDblclkLanguageList()
+{
+       OnOK();
+}
+
 BOOL CLanguageSelect::OnInitDialog() 
 {
        CDialog::OnInitDialog();

diff --git a/Src/Common/LanguageSelect.h b/Src/Common/LanguageSelect.h
index 1e9bf56..c86b86b 100644 (file)
--- a/Src/Common/LanguageSelect.h
+++ b/Src/Common/LanguageSelect.h
@@ -75,6 +75,7 @@ protected:
        //{{AFX_MSG(CLanguageSelect)
        virtual void OnOK();
        virtual BOOL OnInitDialog();
+       afx_msg void OnDblclkLanguageList();
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()
 };

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 891c720..6233b7e 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -330,8 +330,8 @@ FONT 8, "MS Sans Serif"
 BEGIN
     PUSHBUTTON      "OK",IDOK,154,16,52,14
     PUSHBUTTON      "Cancel",IDCANCEL,154,33,52,14
-    LISTBOX         30001,5,16,141,89,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
-                    WS_TABSTOP
+    LISTBOX         IDC_LANGUAGE_LIST,5,16,141,89,LBS_NOINTEGRALHEIGHT | 
+                    WS_VSCROLL | WS_TABSTOP
     LTEXT           "Available languages:",IDC_STATIC,7,7,66,8
 END
 

diff --git a/Src/readme.txt b/Src/readme.txt
index dfc0edb..2fc0b9d 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,14 @@
 2003-02-18 Kimmo
+  [ 684737 ] Fix Language Box to handle dblclick
+  Languages:
+   LanguageSelect.h LanguageSelect.cpp
+  WinMerge:
+   Merge.rc resource.h
   [ 687039 ] View whitespaces on editor
-  MainFrm.h MainFrm.cpp Merge.rc resource.h ccrystaltextview.cpp
+  WinMerge:
+   MainFrm.h MainFrm.cpp Merge.rc resource.h
+  WinMerge/editlib:
+   ccrystaltextview.cpp
 
 2003-02-15 Kimmo
   [ 686699 ] Check & return file saving success

diff --git a/Src/resource.h b/Src/resource.h
index a85099c..a15f566 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -146,6 +146,7 @@
 #define IDC_PROP_INSERT_TABS            1034
 #define IDC_PROP_INSERT_SPACES          1035
 #define IDC_ASSOC_DIRECTORY             1036
+#define IDC_LANGUAGE_LIST               1037
 #define IDR_MARGIN_CURSOR               22900
 #define IDD_LANGUAGE_SELECT             30000
 #define IDD_PROPSYNTAX                  30001
@@ -331,7 +332,7 @@
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        114
 #define _APS_NEXT_COMMAND_VALUE         32819
-#define _APS_NEXT_CONTROL_VALUE         1037
+#define _APS_NEXT_CONTROL_VALUE         1038
 #define _APS_NEXT_SYMED_VALUE           108
 #endif
 #endif