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 1a7b73faffe42e54cd064ed58d3776fcc7f734a3..5691d341a0eba0ff0bd501c666c5032e050648cb 100644
(file)
--- a/
src/wx/wx_util.cc
+++ b/
src/wx/wx_util.cc
@@
-60,7
+60,7
@@
add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, wxGBPos
void
error_dialog (wxWindow* parent, wxString m)
{
void
error_dialog (wxWindow* parent, wxString m)
{
- wxMessageDialog* d = new wxMessageDialog (parent, m, _("D
VD
-o-matic"), wxOK);
+ wxMessageDialog* d = new wxMessageDialog (parent, m, _("D
CP
-o-matic"), wxOK);
d->ShowModal ();
d->Destroy ();
}
d->ShowModal ();
d->Destroy ();
}
@@
-68,7
+68,7
@@
error_dialog (wxWindow* parent, wxString m)
bool
confirm_dialog (wxWindow* parent, wxString m)
{
bool
confirm_dialog (wxWindow* parent, wxString m)
{
- wxMessageDialog* d = new wxMessageDialog (parent, m, _("D
VD
-o-matic"), wxYES_NO | wxICON_QUESTION);
+ wxMessageDialog* d = new wxMessageDialog (parent, m, _("D
CP
-o-matic"), wxYES_NO | wxICON_QUESTION);
int const r = d->ShowModal ();
d->Destroy ();
return r == wxID_YES;
int const r = d->ShowModal ();
d->Destroy ();
return r == wxID_YES;
@@
-215,7
+215,7
@@
checked_set (wxRadioButton* widget, bool value)
}
void
}
void
-d
vd
omatic_setup_i18n ()
+d
cp
omatic_setup_i18n ()
{
int language = wxLANGUAGE_DEFAULT;
{
int language = wxLANGUAGE_DEFAULT;
@@
-231,12
+231,12
@@
dvdomatic_setup_i18n ()
if (wxLocale::IsAvailable (language)) {
locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
if (wxLocale::IsAvailable (language)) {
locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
-#ifdef D
VD
OMATIC_WINDOWS
+#ifdef D
CP
OMATIC_WINDOWS
locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
#endif
locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
#endif
- locale->AddCatalog (wxT ("libd
vd
omatic-wx"));
- locale->AddCatalog (wxT ("d
vd
omatic"));
+ locale->AddCatalog (wxT ("libd
cp
omatic-wx"));
+ locale->AddCatalog (wxT ("d
cp
omatic"));
if (!locale->IsOk()) {
delete locale;
if (!locale->IsOk()) {
delete locale;
@@
-246,6
+246,6
@@
dvdomatic_setup_i18n ()
}
if (locale) {
}
if (locale) {
- d
vd
omatic_setup_gettext_i18n (wx_to_std (locale->GetCanonicalName ()));
+ d
cp
omatic_setup_gettext_i18n (wx_to_std (locale->GetCanonicalName ()));
}
}
}
}