From 142047dfe6b843b56b1f766b3a1cad5c3cd6485a Mon Sep 17 00:00:00 2001 From: Rob van Son Date: Thu, 11 Jan 2018 07:34:32 +0100 Subject: [PATCH] Updated to Praat 6.0.36 --- praat_module/adaptPraat.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/praat_module/adaptPraat.patch b/praat_module/adaptPraat.patch index 8c64483..26f187b 100644 --- a/praat_module/adaptPraat.patch +++ b/praat_module/adaptPraat.patch @@ -152,7 +152,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr if (unknownCommandLineOption) { # No idea why this is needed? -@@ -1557,7 +1597,7 @@ void praat_run () { +@@ -1564,7 +1604,7 @@ void praat_run () { Melder_fatal (U"The number 1000000000000 is mistakenly written on this machine as ", dummy, U"."); } { uint32_t dummy = 0xffffffff; @@ -162,7 +162,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat.cpp demo_pr Melder_assert (double (dummy) == 4294967295.0); } # Next chunk is needed to start the Demo window under Windows (motif) -@@ -1723,10 +1763,20 @@ void praat_run () { +@@ -1730,10 +1770,20 @@ void praat_run () { trace (U"locale is ", Melder_peek8to32 (setlocale (LC_ALL, nullptr))); gtk_main (); #elif motif @@ -191,7 +191,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat_picture.cpp --- praat_sources/sys/praat_picture.cpp 2012-09-27 09:10:50.000000000 +0200 +++ demo_praat_sources/sys/praat_picture.cpp 2012-10-15 13:47:43.000000000 +0200 # Supress picture window -@@ -1542,8 +1542,10 @@ void praat_picture_open (void) { +@@ -1539,8 +1539,10 @@ void praat_picture_open (void) { #if gtk gtk_window_present (GTK_WINDOW (dialog -> d_gtkWindow)); #elif motif @@ -202,7 +202,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat_picture.cpp #elif cocoa GuiThing_show (dialog); #endif -@@ -1835,7 +1837,9 @@ void praat_picture_init (void) { +@@ -1832,7 +1834,9 @@ void praat_picture_init (void) { width = height = resolution * 12; scrollWindow = GuiScrolledWindow_createShown (dialog, margin, 0, Machine_getMenuBarHeight () + margin, 0, 1, 1, 0); drawingArea = GuiDrawingArea_createShown (scrollWindow, width, height, nullptr, nullptr, nullptr, nullptr, nullptr, 0); @@ -321,7 +321,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat_objectMenus --- praat_sources/sys/praat_objectMenus.cpp 2012-02-22 13:04:43.000000000 +0100 +++ demo_praat_sources/sys/praat_objectMenus.cpp 2012-02-22 13:48:24.000000000 +0100 # Allow the man pages -@@ -509,8 +509,10 @@ FORM (SearchManual, U"Search manual", U" +@@ -510,8 +510,10 @@ FORM (SearchManual, U"Search manual", U" TEXTFIELD (query, U"Search for strings (separate with spaces):", U"") OK DO @@ -332,7 +332,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/sys/praat_objectMenus autoManual manual = Manual_create (U"Intro", theCurrentPraatApplication -> manPages, false); Manual_search (manual.get(), query); manual.releaseToUser(); -@@ -522,8 +524,10 @@ FORM (GoToManualPage, U"Go to manual pag +@@ -523,8 +525,10 @@ FORM (GoToManualPage, U"Go to manual pag LIST (pageNumber, U"Page", numberOfPages, pages, 1) OK DO @@ -372,7 +372,7 @@ diff -Naurp -x '*.[oah]' -x '.git*' -x praat praat_sources/stat/praat_Stat.cpp d --- praat_sources/stat/praat_Stat.cpp 2017-06-08 11:26:20.000000000 +0200 +++ demo_praat_sources/stat/praat_Stat.cpp 2017-06-09 15:14:12.000000000 +0200 # Allow to view tables when in a Demo app -@@ -290,7 +290,9 @@ DIRECT (HELP_StatisticsTutorial) { +@@ -295,7 +295,9 @@ DIRECT (HELP_StatisticsTutorial) { // MARK: View & Edit DIRECT (WINDOW_Table_viewAndEdit) { -- 2.11.4.GIT