Convert the calibrate screen window to be a dialog instead of a window.

Thanks to stephen walker for the patch.

mail/components/prefwindow/content/pref-calibrate-screen.xul

@@ -21,15 +21,14 @@
   
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 
-<window id="calibrateScreen"
+<dialog id="calibrateScreen"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&calibrateDialog.title;"
-        class="dialog" 
         onload="Init();"
+        ondialogaccept="return onOK();"
+        ondialogcancel="return onCancel();"
         persist="screenX screenY">
 
   <script type="application/x-javascript" 
@@ -56,14 +55,10 @@
           <menuitem value="inches" label="&units.inches;"/>
         </menupopup>
       </menulist>
-
     </hbox>
 
     <separator/>
 
-    <keyset id="dialogKeys"/>
-    <hbox id="okCancelButtonsRight"/>
-
   </vbox>
 
-</window>
+</dialog>

mail/components/prefwindow/content/pref-fonts.js

@@ -666,7 +666,6 @@ function setResolution( resolution )
 function Init()
   {
       sizeToContent();
-      doSetOKCancel(onOK, onCancel);
       document.getElementById("horizSize").focus();
   }