Added parent window handle to the creation method

of the file transfer dialog.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@409 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/FTDialog.cxx b/vncviewer/FTDialog.cxx
index 423a1c83237f43fbe5c92c322ae6f47f01378921..ece35ae0c7223c879a5e5a994fc32645af44e281 100644 (file)
--- a/vncviewer/FTDialog.cxx
+++ b/vncviewer/FTDialog.cxx
@@ -52,7 +52,7 @@ FTDialog::~FTDialog()
 }
 
 bool
-FTDialog::createFTDialog()
+FTDialog::createFTDialog(HWND hwndParent)
 {
   if (m_hwndFTDialog != NULL) {
     ShowWindow(m_hwndFTDialog, SW_SHOW);
@@ -62,7 +62,7 @@ FTDialog::createFTDialog()
 
   m_hwndFTDialog = CreateDialogParam(m_hInstance, 
                                      MAKEINTRESOURCE(IDD_FILETRANSFER_DLG),
-                                     NULL, 
+                                     hwndParent, 
                                      (DLGPROC) FTDialogProc,
                                      (LONG) this);
   
@@ -277,6 +277,7 @@ FTDialog::addRemoteLVItems(FileInfo *pFI)
   m_pRemoteLV->addItems(pFI);
   strcpy(m_szRemotePath, m_szRemotePathTmp);
   SetWindowText(m_hwndRemotePath, m_szRemotePath);
+  UpdateWindow(m_hwndFTDialog);
 }
 
 void 

diff --git a/vncviewer/FTDialog.h b/vncviewer/FTDialog.h
index 7c577ed9ec8bbaeecdef324363eb76cf7cf757ca..961b1a89e288633e77abdd7495b6adb3eef17df6 100644 (file)
--- a/vncviewer/FTDialog.h
+++ b/vncviewer/FTDialog.h
@@ -43,7 +43,7 @@ namespace rfb {
       FTDialog(HINSTANCE hInst, FileTransfer *pFT);
       ~FTDialog();
       
-      bool createFTDialog();
+      bool createFTDialog(HWND hwndParent);
       bool closeFTDialog();
       void destroyFTDialog();
       

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 77ebe0a854c4a8bc0d5534c159896a1ed768f951..8997ebc50f8a41b52558b733d82bf9f8b0f5ce59 100644 (file)
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -58,11 +58,11 @@ FileTransfer::initialize(rdr::InStream *pIS, rdr::OutStream *pOS)
 }
 
 bool 
-FileTransfer::show()
+FileTransfer::show(HWND hwndParent)
 {
   if (!m_bInitialized) return false;
 
-  m_bFTDlgShown = m_pFTDialog->createFTDialog();
+  m_bFTDlgShown = m_pFTDialog->createFTDialog(hwndParent);
   return m_bFTDlgShown;
 }
 

diff --git a/vncviewer/FileTransfer.h b/vncviewer/FileTransfer.h
index 6bf36c954342d797b67151105c0ab1ac63ee62d7..805c10ec3904604cf92a7e5a9e7ba31a96b07426 100644 (file)
--- a/vncviewer/FileTransfer.h
+++ b/vncviewer/FileTransfer.h
@@ -45,7 +45,7 @@ namespace rfb {
 
       bool initialize(rdr::InStream *pIS, rdr::OutStream *pOS);
       bool processFTMsg(int type);
-      bool show();
+      bool show(HWND hwndParent);
 
       void requestFileList(char *pPath, int dest, bool bDirOnly);
 

diff --git a/vncviewer/cview.cxx b/vncviewer/cview.cxx
index 47018017ec4b1effaf5e4195f3ba9ff98eea28c6..66dd501f6cae580b3fa759cee46d4effd487d006 100644 (file)
--- a/vncviewer/cview.cxx
+++ b/vncviewer/cview.cxx
@@ -686,7 +686,7 @@ CView::processMessage(UINT msg, WPARAM wParam, LPARAM lParam) {
       AboutDialog::instance.showDialog();
       return 0;
     case IDM_FILE_TRANSFER:
-      m_fileTransfer.show();
+      m_fileTransfer.show(getHandle());
       return 0;
     case IDM_CONN_SAVE_AS:
       return 0;

diff --git a/vncviewer/vncviewer.rc b/vncviewer/vncviewer.rc
index df6bf082397cdb0662a995e2759d51b217658ba2..64a4d900fd5de4536a2f742673759bdd7ce0addc 100644 (file)
--- a/vncviewer/vncviewer.rc
+++ b/vncviewer/vncviewer.rc
@@ -40,7 +40,7 @@ BEGIN
     PUSHBUTTON      "...",IDC_FTLOCALBROWSE,165,20,14,12
     PUSHBUTTON      "",IDC_FTLOCALUP,179,20,14,12,BS_ICON
     PUSHBUTTON      "",IDC_FTLOCALRELOAD,193,20,14,12,BS_ICON
-    EDITTEXT        IDC_EDIT2,323,20,155,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_FTREMOTEPATH,323,20,155,12,ES_AUTOHSCROLL
     CONTROL         "List2",IDC_FTREMOTELIST,"SysListView32",LVS_REPORT | 
                     LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | 
                     WS_TABSTOP,323,40,200,196