commit d9957b7526593c195e4434728906022f09a6d6bb
author george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Fri Mar 11 14:22:14 2005 +0000
committer george82 <george82@3789f03b-4d11-0410-bbf8-ca57d06f2519> Fri Mar 11 14:22:14 2005 +0000
tree 1388af23c253fdb2c0fe3b632a07cf0735052fa6
parent 0e980ccd07c3ea1f2ed3a97751332569e338d461

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

rfbplayer/ChoosePixelFormatDialog.h

diff --git a/rfbplayer/ChoosePixelFormatDialog.h b/rfbplayer/ChoosePixelFormatDialog.h
index b85d4d9..130da4b 100644
--- a/rfbplayer/ChoosePixelFormatDialog.h
+++ b/rfbplayer/ChoosePixelFormatDialog.h
@@ -26,8 +26,8 @@
     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:

rfbplayer/GotoPosDialog.h

diff --git a/rfbplayer/GotoPosDialog.h b/rfbplayer/GotoPosDialog.h
index 6758be2..ddbbe53 100644
--- a/rfbplayer/GotoPosDialog.h
+++ b/rfbplayer/GotoPosDialog.h
@@ -25,8 +25,8 @@
   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:

rfbplayer/OptionsDialog.h

diff --git a/rfbplayer/OptionsDialog.h b/rfbplayer/OptionsDialog.h
index c7affca..7cc0a52 100644
--- a/rfbplayer/OptionsDialog.h
+++ b/rfbplayer/OptionsDialog.h
@@ -28,8 +28,8 @@
   : 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:
 

rfbplayer/rfbplayer.cxx

diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx
index 81fc7c2..a9931cc 100644
--- a/rfbplayer/rfbplayer.cxx
+++ b/rfbplayer/rfbplayer.cxx
@@ -344,7 +344,7 @@
     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 @@
     case ID_OPTIONS:
       {
         OptionsDialog optionsDialog(&options);
-        optionsDialog.showDialog();
+        optionsDialog.showDialog(getMainHandle());
       }
       break;
     case ID_EXIT:
@@ -877,7 +877,7 @@
   static long pixelFormat = PF_AUTO;
   if (options.askPixelFormat) {
     ChoosePixelFormatDialog choosePixelFormatDialog(pixelFormat);
-    if (choosePixelFormatDialog.showDialog()) {
+    if (choosePixelFormatDialog.showDialog(getMainHandle())) {
       pixelFormat = choosePixelFormatDialog.getPF();
     } else {
       is->pausePlayback();