r12857 - in packages/trunk/jugglemaster/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-11-25 11:44:56 +0000 (Fri, 25 Nov 2011)
New Revision: 12857

Modified:
   packages/trunk/jugglemaster/debian/changelog
   packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch
Log:
Add patch from Olly Bets that fixes remaining wx related issue

Modified: packages/trunk/jugglemaster/debian/changelog
===================================================================
--- packages/trunk/jugglemaster/debian/changelog	2011-11-25 10:32:37 UTC (rev 12856)
+++ packages/trunk/jugglemaster/debian/changelog	2011-11-25 11:44:56 UTC (rev 12857)
@@ -9,9 +9,9 @@
     Olly Betts (Closes: #645408)
   * Fix "FTBFS with ld --as-needed" applied patch from Ilya Barygin
     (Closes: #631700)
-  * Partial fix for "Change Siteswap (simple)".
-    Every siteswap is regarded as invalid. A likely cause is the new pattern
-    being garbage collected before being used. Now we keep an extra reference.
+  * Fix for "Change Siteswap (simple)".  Every siteswap was regarded as invalid,
+    due to the new pattern being garbage collected before being used. Now we
+    keep an explicit reference.
 
  -- Helmut Grohne <helmut at subdivi.de>  Fri, 25 Nov 2011 11:29:40 +0100
 

Modified: packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch
===================================================================
--- packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch	2011-11-25 10:32:37 UTC (rev 12856)
+++ packages/trunk/jugglemaster/debian/patches/010_wx26_trans.patch	2011-11-25 11:44:56 UTC (rev 12857)
@@ -419,8 +419,8 @@
    if (dialog.ShowModal() == wxID_OK)
    {
 -	newpattern = (JML_CHAR *)(const char *)dialog.GetValue();
-+	wxString newpatternwx = dialog.GetValue();
-+	newpattern = (JML_CHAR *)(const char*)newpatternwx.mb_str(wxConvUTF8);
++	wxWX2MBbuf newpatternwx = dialog.GetValue().mb_str(wxConvUTF8);
++	newpattern = (JML_CHAR *)(const char*)newpatternwx;
          jmlib->stopJuggle();
  	jmlib->setPattern("Something",newpattern,HR_DEF, DR_DEF);
          jmlib->setStyleDefault();