[SCM] General FITS file browser/editor/plotter with a gui branch, debian, updated. 92c240bbe14a7e4f0b8c499f6709663dc1884047

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 92c240bbe14a7e4f0b8c499f6709663dc1884047
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Aug 24 11:51:30 2012 +0200

    Better fix for initial-menubar-crash

diff --git a/debian/patches/fv_fix_initial_menubar.patch b/debian/patches/fv_fix_initial_menubar.patch
index ed92a89..9203ba0 100644
--- a/debian/patches/fv_fix_initial_menubar.patch
+++ b/debian/patches/fv_fix_initial_menubar.patch
@@ -1,16 +1,40 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Fix tk 8.5 crash with "-type tearoff".
- This is however just a workaround, since the menu decoration disappear yet.
- It needs to be fixed in tk.
+ It needs to be fixed in tk. However, here this gives the opportunity to
+ correct the setting for the (invisible) main window. Also, the main window
+ font is reset to non-bold.
 Bug: http://sourceforge.net/tracker/?func=detail&aid=3561016&group_id=12997&atid=112997
 --- a/ftools/guis/fv/class/fvWinKeeper.tcl
 +++ b/ftools/guis/fv/class/fvWinKeeper.tcl
-@@ -38,7 +38,7 @@
+@@ -34,12 +34,17 @@
+    global g_titleFont
+    global xpaFlag
+    
+-   wm withdraw $itk_interior
++   wm geometry $itk_interior 1x1+0+0
++   wm overrideredirect $itk_interior 1
++   wm transient $itk_interior
++   tkwait visibility $itk_interior
  
     if { ! $isMac } {
        itk_component add mainMenu {
--         menu $itk_interior.menu -tearoff false -type tearoff -bd 0
-+         menu $itk_interior.menu -tearoff false -bd 0
+          menu $itk_interior.menu -tearoff false -type tearoff -bd 0
        }
++      wm attributes $itk_interior.menu -type normal
++      wm resizable $itk_interior.menu 0 0
        wm title $itk_interior.menu "fv"
        wm geometry $itk_interior.menu +0+0
+ 
+--- a/ftools/guis/fv/class/fvApp.tcl
++++ b/ftools/guis/fv/class/fvApp.tcl
+@@ -412,8 +412,8 @@
+        font create g_titleFont -family system    -size -12
+        font create g_notebookTitleFont -family system -size -14
+     } else {
+-       font create g_titleFont -family Helvetica -size -12 -weight bold
+-       font create g_notebookTitleFont -family Helvetica -size -14 -weight bold
++       font create g_titleFont -family Helvetica -size -12
++       font create g_notebookTitleFont -family Helvetica -size -14
+     }
+ 
+     font create g_entryFont -family Courier -size -12

-- 
General FITS file browser/editor/plotter with a gui