浏览代码

added parameter to showquickpastewindow to refill list or not

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@348 595ec19a-5cb4-439b-94a8-42fb3063c22c
sabrogden 19 年之前
父节点
当前提交
9e95ba6924
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3 3
      QuickPaste.cpp
  2. 1 1
      QuickPaste.h

+ 3 - 3
QuickPaste.cpp

@@ -74,7 +74,7 @@ BOOL CQuickPaste::CloseQPasteWnd()
 	return TRUE;
 	return TRUE;
 }
 }
 
 
-void CQuickPaste::ShowQPasteWnd(CWnd *pParent, bool bAtPrevPos, bool bFromKeyboard)
+void CQuickPaste::ShowQPasteWnd(CWnd *pParent, bool bAtPrevPos, bool bFromKeyboard, BOOL bReFillList)
 {		
 {		
 	if(bFromKeyboard == false && GetKeyState(VK_SHIFT) & 0x8000 && GetKeyState(VK_CONTROL) & 0x8000)
 	if(bFromKeyboard == false && GetKeyState(VK_SHIFT) & 0x8000 && GetKeyState(VK_CONTROL) & 0x8000)
 	{
 	{
@@ -92,7 +92,7 @@ void CQuickPaste::ShowQPasteWnd(CWnd *pParent, bool bAtPrevPos, bool bFromKeyboa
 		return;
 		return;
 	}
 	}
 
 
-	if((theApp.m_bShowingQuickPaste) || (theApp.m_bShowingOptions))
+	if(theApp.m_bShowingQuickPaste)
 	{
 	{
 		if(g_Opt.m_bShowPersistent)
 		if(g_Opt.m_bShowPersistent)
 		{
 		{
@@ -172,7 +172,7 @@ void CQuickPaste::ShowQPasteWnd(CWnd *pParent, bool bAtPrevPos, bool bFromKeyboa
 	}
 	}
 	
 	
 	// Show the window
 	// Show the window
-	m_pwndPaste->ShowQPasteWindow(FALSE);
+	m_pwndPaste->ShowQPasteWindow(bReFillList);
 	m_pwndPaste->SetForegroundWindow();
 	m_pwndPaste->SetForegroundWindow();
 }
 }
 
 

+ 1 - 1
QuickPaste.h

@@ -18,7 +18,7 @@ public:
 	virtual ~CQuickPaste();
 	virtual ~CQuickPaste();
 
 
 	void Create(CWnd *pParent);
 	void Create(CWnd *pParent);
-	void ShowQPasteWnd(CWnd *pParent, bool bAtPrevPos, bool bFromKeyboard);
+	void ShowQPasteWnd(CWnd *pParent, bool bAtPrevPos, bool bFromKeyboard, BOOL bReFillList);
 	void HideQPasteWnd();
 	void HideQPasteWnd();
 	BOOL CloseQPasteWnd();
 	BOOL CloseQPasteWnd();
 	BOOL IsWindowVisibleEx();
 	BOOL IsWindowVisibleEx();