X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwx_util.cc;h=c4a7fd5bca9f071b5da875d7a476d0c7d8ce2962;hb=e491397c0028a80ac4a48a92007f783746553c1a;hp=94a08f37289625eaf4c660ab4ba5c81d6b5cab36;hpb=f0edd6ab35c3c2b7800a26ec8206adab75e5f633;p=dcpomatic.git

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 94a08f372..c4a7fd5bc 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -193,7 +193,7 @@ void
 checked_set (wxSpinCtrlDouble* widget, double value)
 {
 	/* XXX: completely arbitrary epsilon */
-	if (fabs (widget->GetValue() - value) < 1e-16) {
+	if (fabs (widget->GetValue() - value) > 1e-16) {
 		widget->SetValue (value);
 	}
 }
@@ -280,6 +280,14 @@ dcpomatic_setup_i18n ()
 		locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX);
 #endif
 
+#ifdef DCPOMATIC_LINUX
+		/* We have to include the wxWidgets .mo in our distribution,
+		   so we rename it to avoid clashes with any other installation
+		   of wxWidgets.
+		*/
+		locale->AddCatalog (wxT ("dcpomatic-wxstd"));
+#endif		
+		
 		locale->AddCatalog (wxT ("libdcpomatic-wx"));
 		locale->AddCatalog (wxT ("dcpomatic"));
 		
@@ -312,14 +320,6 @@ wx_get (wxSpinCtrlDouble* w)
 	return w->GetValue ();
 }
 
-void
-run_gui_loop ()
-{
-	while (wxTheApp->Pending ()) {
-		wxTheApp->Dispatch ();
-	}
-}
-
 /** @param s String of the form Context|String
  *  @return translation, or String if no translation is available.
  */