Merge master.

[dcpomatic.git] / src / wx / wx_util.h

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 18a9f251c7a42c1ceba81510ce338af04bd2aa71..de6a09c35298fcc0b53460e4e8be8ef299695bed 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_WX_UTIL_H
-#define DVDOMATIC_WX_UTIL_H
+#ifndef DCPOMATIC_WX_UTIL_H
+#define DCPOMATIC_WX_UTIL_H
 
 #include <wx/wx.h>
 #include <wx/gbsizer.h>
@@ -32,8 +32,8 @@ class wxFilePickerCtrl;
 class wxSpinCtrl;
 class wxGridBagSizer;
 
-#define DVDOMATIC_SIZER_X_GAP 8
-#define DVDOMATIC_SIZER_Y_GAP 8
+#define DCPOMATIC_SIZER_X_GAP 8
+#define DCPOMATIC_SIZER_Y_GAP 8
 
 /** @file src/wx/wx_util.h
  *  @brief Some utility functions and classes.
@@ -45,7 +45,7 @@ extern wxStaticText* add_label_to_sizer (wxSizer *, wxWindow *, wxString, bool l
 extern wxStaticText* add_label_to_grid_bag_sizer (wxGridBagSizer *, wxWindow *, wxString, bool, wxGBPosition, wxGBSpan span = wxDefaultSpan);
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
-extern void dvdomatic_setup_i18n ();
+extern void dcpomatic_setup_i18n ();
 
 /** @class ThreadedStaticText
  *
@@ -83,7 +83,7 @@ extern void checked_set (wxStaticText* widget, std::string value);
    Use our own dir picker as this is the least bad option I can think of.
 */
 #if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && GTK_MICRO_VERSION == 17)
-#define DVDOMATIC_USE_OWN_DIR_PICKER
+#define DCPOMATIC_USE_OWN_DIR_PICKER
 #endif
 
 #endif