Diff of /tcl/pd-gui.tcl [beffbc] .. [47388e] Maximize Restore

  Switch to side-by-side view

--- a/tcl/pd-gui.tcl
+++ b/tcl/pd-gui.tcl
@@ -14,9 +14,7 @@
 
 package require Tcl 8.3
 package require Tk
-package require Tk
-if {[tk windowingsystem] ne "win32"} {package require msgcat}
-# TODO figure out msgcat issue on Windows
+package require msgcat
 
 # Pd's packages are stored in the same directory as the main script (pd-gui.tcl)
 set auto_path [linsert $auto_path 0 [file dirname [info script]]]
@@ -151,6 +149,8 @@
 # init functions
 
 proc set_pd_version {versionstring} {
+    global pd_myversion
+    set pd_myversion $versionstring
     regexp -- {.*([0-9])\.([0-9]+)[\.\-]([0-9]+)([^0-9]?.*)} $versionstring \
         wholematch \
         ::PD_MAJOR_VERSION ::PD_MINOR_VERSION ::PD_BUGFIX_VERSION ::PD_TEST_VERSION
@@ -217,16 +217,10 @@
 # locale handling
 
 # official GNU gettext msgcat shortcut
-if {[tk windowingsystem] ne "win32"} {
-    proc _ {s} {return [::msgcat::mc $s]}
-} else {
-    proc _ {s} {return $s}
-}
+proc _ {s} {return [::msgcat::mc $s]}
 
 proc load_locale {} {
-    if {[tk windowingsystem] ne "win32"} {
-        ::msgcat::mcload [file join [file dirname [info script]] .. po]
-    }
+    ::msgcat::mcload [file join [file dirname [info script]] .. po]
 
     # for Windows
     #set locale "en"  ;# Use whatever is right for your app
@@ -258,7 +252,7 @@
 # always do a good job of choosing in respect to Pd's needs.  So this chooses
 # from a list of fonts that are known to work well with Pd.
 proc find_default_font {} {
-    set testfonts {Inconsolata "Courier New" "Liberation Mono" FreeMono \
+    set testfonts {Inconsolata "Courier 10 pitch" "Courier New" "Liberation Mono" FreeMono \
                        "DejaVu Sans Mono" "Bitstream Vera Sans Mono"}
     foreach family $testfonts {
         if {[lsearch -exact -nocase [font families] $family] > -1} {