ChoosePixelFormatDialog, OptionsDialog and GotoPosDialog must have

a parent window (player's main window).

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

diff --git a/rfbplayer/ChoosePixelFormatDialog.h b/rfbplayer/ChoosePixelFormatDialog.h
index b85d4d992b02861007acbe276d8a1714d5d512cd..130da4bc20f2ddd8a69936a17401c78a7e3b37e7 100644 (file)
--- a/rfbplayer/ChoosePixelFormatDialog.h
+++ b/rfbplayer/ChoosePixelFormatDialog.h
@@ -26,8 +26,8 @@ public:
     pf(_pf), combo(0) {}
   // - Show the dialog and return true if OK was clicked,
   //   false in case of error or Cancel
-  virtual bool showDialog() {
-    return Dialog::showDialog(MAKEINTRESOURCE(IDD_PIXELFORMAT));
+  virtual bool showDialog(HWND parent) {
+    return Dialog::showDialog(MAKEINTRESOURCE(IDD_PIXELFORMAT), parent);
   }
   const long getPF() const {return pf;}
 protected:

diff --git a/rfbplayer/GotoPosDialog.h b/rfbplayer/GotoPosDialog.h
index 6758be210eb5fd071f1a65777441ec977537a23a..ddbbe53a212be3f6d67383da7ef438c263248062 100644 (file)
--- a/rfbplayer/GotoPosDialog.h
+++ b/rfbplayer/GotoPosDialog.h
@@ -25,8 +25,8 @@ public:
   GotoPosDialog() : Dialog(GetModuleHandle(0)) {}
   // - Show the dialog and return true if OK was clicked,
   //   false in case of error or Cancel
-  virtual bool showDialog() {
-    return Dialog::showDialog(MAKEINTRESOURCE(IDD_GOTO));
+  virtual bool showDialog(HWND parent) {
+    return Dialog::showDialog(MAKEINTRESOURCE(IDD_GOTO), parent);
   }
   const long getPos() const {return pos;}
 protected:

diff --git a/rfbplayer/OptionsDialog.h b/rfbplayer/OptionsDialog.h
index c7affca0d50438d3ffb8924cc71afffe03da3aa0..7cc0a52f057c097e407e52d8e46fe13f7216bd7e 100644 (file)
--- a/rfbplayer/OptionsDialog.h
+++ b/rfbplayer/OptionsDialog.h
@@ -28,8 +28,8 @@ public:
   : Dialog(GetModuleHandle(0)), options(_options), combo(0) {}
   // - Show the dialog and return true if OK was clicked,
   //   false in case of error or Cancel
-  virtual bool showDialog() {
-    return Dialog::showDialog(MAKEINTRESOURCE(IDD_OPTIONS));
+  virtual bool showDialog(HWND parent) {
+    return Dialog::showDialog(MAKEINTRESOURCE(IDD_OPTIONS), parent);
   }
 protected:
 

diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx
index 81fc7c2b14f1cd44923d501373cda504ab42ef08..a9931cc6d9098495c45cc830b0b71e448218b2a0 100644 (file)
--- a/rfbplayer/rfbplayer.cxx
+++ b/rfbplayer/rfbplayer.cxx
@@ -344,7 +344,7 @@ RfbPlayer::processMainMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
     case ID_GOTO:
       {
         GotoPosDialog gotoPosDlg;
-        if (gotoPosDlg.showDialog()) {
+        if (gotoPosDlg.showDialog(getMainHandle())) {
           long gotoTime = min(gotoPosDlg.getPos(), sessionTimeMs);
           setPos(gotoTime);
           updatePos(gotoTime);
@@ -377,7 +377,7 @@ RfbPlayer::processMainMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
     case ID_OPTIONS:
       {
         OptionsDialog optionsDialog(&options);
-        optionsDialog.showDialog();
+        optionsDialog.showDialog(getMainHandle());
       }
       break;
     case ID_EXIT:
@@ -877,7 +877,7 @@ void RfbPlayer::serverInit() {
   static long pixelFormat = PF_AUTO;
   if (options.askPixelFormat) {
     ChoosePixelFormatDialog choosePixelFormatDialog(pixelFormat);
-    if (choosePixelFormatDialog.showDialog()) {
+    if (choosePixelFormatDialog.showDialog(getMainHandle())) {
       pixelFormat = choosePixelFormatDialog.getPF();
     } else {
       is->pausePlayback();