[Winmerge-svn] SF.net SVN: winmerge:[5849] trunk

[<ki...@us...>]

Revision: 5849
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5849&view=rev
Author:   kimmov
Date:     2008-08-22 17:57:48 +0000 (Fri, 22 Aug 2008)

Log Message:
-----------
BUG: [ 2051069 ] clearcase checkin without german resources

Modified Paths:
--------------
    trunk/Docs/Users/ChangeLog.txt
    trunk/Src/CCPrompt.cpp
    trunk/Src/CCPrompt.h

Modified: trunk/Docs/Users/ChangeLog.txt
===================================================================
--- trunk/Docs/Users/ChangeLog.txt	2008-08-21 16:56:38 UTC (rev 5848)
+++ trunk/Docs/Users/ChangeLog.txt	2008-08-22 17:57:48 UTC (rev 5849)
@@ -3,6 +3,9 @@
 to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
+WinMerge 2.11.1.5
+  BugFix: ClearCase checkout/commit dialog translation error (#2051069)
+
 WinMerge 2.11.1.4 - 2008-08-21 (r5846)
   Binary file edit/compare (#2036603)
   Add wait cursor for undo and redo (#2039228)

Modified: trunk/Src/CCPrompt.cpp
===================================================================
--- trunk/Src/CCPrompt.cpp	2008-08-21 16:56:38 UTC (rev 5848)
+++ trunk/Src/CCPrompt.cpp	2008-08-22 17:57:48 UTC (rev 5849)
@@ -1,5 +1,26 @@
-// CCPrompt.cpp : implementation file
+/////////////////////////////////////////////////////////////////////////////
+//    License (GPLv2+):
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
 //
+//    This program is distributed in the hope that it will be useful, but
+//    WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/**
+ * @file  CCPrompt.cpp
+ *
+ * @brief Implementation file for ClearCase dialog
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
 
 #include "stdafx.h"
 #include "merge.h"
@@ -11,10 +32,6 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-/////////////////////////////////////////////////////////////////////////////
-// CCCPrompt dialog
-
-
 CCCPrompt::CCCPrompt(CWnd* pParent /*=NULL*/)
 	: CDialog(CCCPrompt::IDD, pParent)
 	, m_bMultiCheckouts(FALSE)
@@ -22,7 +39,6 @@
 {
 }
 
-
 void CCCPrompt::DoDataExchange(CDataExchange* pDX)
 {
 	CDialog::DoDataExchange(pDX);
@@ -33,18 +49,26 @@
 	//}}AFX_DATA_MAP
 }
 
-
 BEGIN_MESSAGE_MAP(CCCPrompt, CDialog)
 	//{{AFX_MSG_MAP(CCCPrompt)
 	ON_BN_CLICKED(IDC_SAVE_AS, OnSaveas)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-/////////////////////////////////////////////////////////////////////////////
-// CCCPrompt message handlers
+/**
+ * @brief Handler for WM_INITDIALOG; conventional location to initialize
+ * controls. At this point dialog and control windows exist.
+ */
+BOOL CCCPrompt::OnInitDialog() 
+{
+	theApp.TranslateDialog(m_hWnd);
+	CDialog::OnInitDialog();
 
+	return TRUE;  // return TRUE unless you set the focus to a control
+	              // EXCEPTION: OCX Property Pages should return FALSE
+}
+
 void CCCPrompt::OnSaveas() 
 {
 	EndDialog(IDC_SAVE_AS);
 }
-

Modified: trunk/Src/CCPrompt.h
===================================================================
--- trunk/Src/CCPrompt.h	2008-08-21 16:56:38 UTC (rev 5848)
+++ trunk/Src/CCPrompt.h	2008-08-22 17:57:48 UTC (rev 5849)
@@ -1,13 +1,34 @@
-// CCPrompt.h : header file
+/////////////////////////////////////////////////////////////////////////////
+//    License (GPLv2+):
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
 //
+//    This program is distributed in the hope that it will be useful, but
+//    WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//    General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/////////////////////////////////////////////////////////////////////////////
+/** 
+ * @file  CCPrompt.h
+ *
+ * @brief Declaration file for ClearCase dialog.
+ *
+ */
+// ID line follows -- this is updated by SVN
+// $Id$
 
 #if !defined(AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_)
 #define AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_
 
-
-/////////////////////////////////////////////////////////////////////////////
-// CCCPrompt dialog
-
+/**
+ * @brief A dialog for ClearCase checkout/checkin.
+ */
 class CCCPrompt : public CDialog
 {
 // Construction
@@ -30,6 +51,7 @@
 
 // Implementation
 protected:
+	virtual BOOL OnInitDialog();
 
 	// Generated message map functions
 	//{{AFX_MSG(CCCPrompt)
@@ -46,4 +68,3 @@
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.
 
 #endif // !defined(AFX_CCPROMPT_H__7ED564F2_CCB8_11D4_92BB_00B0D0221937__INCLUDED_)
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.