projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
wx_util.cc
diff --git
a/src/wx/wx_util.cc
b/src/wx/wx_util.cc
index 94a08f37289625eaf4c660ab4ba5c81d6b5cab36..c4a7fd5bca9f071b5da875d7a476d0c7d8ce2962 100644
(file)
--- 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
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 */
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);
}
}
widget->SetValue (value);
}
}
@@
-280,6
+280,14
@@
dcpomatic_setup_i18n ()
locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX);
#endif
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"));
locale->AddCatalog (wxT ("libdcpomatic-wx"));
locale->AddCatalog (wxT ("dcpomatic"));
@@
-312,14
+320,6
@@
wx_get (wxSpinCtrlDouble* w)
return w->GetValue ();
}
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.
*/
/** @param s String of the form Context|String
* @return translation, or String if no translation is available.
*/