9 files changed, 26 insertions, 11 deletions
diff --git a/include/cru/platform/gui/DeleteLater.h b/include/cru/platform/gui/DeleteLater.h
index c0578974..d7aa262b 100644
--- a/include/cru/platform/gui/DeleteLater.h
+++ b/include/cru/platform/gui/DeleteLater.h
@@ -8,7 +8,8 @@
 namespace cru::platform::gui {
 template <typename TSelf>
 class DeleteLaterImpl {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::platform::gui::DeleteLaterImpl")
+ private:
+  constexpr static auto kLogTag = "cru::platform::gui::DeleteLaterImpl";
 
  public:
   virtual ~DeleteLaterImpl() {}
diff --git a/include/cru/platform/gui/sdl/OpenGLRenderer.h b/include/cru/platform/gui/sdl/OpenGLRenderer.h
index 18de3d55..8f92f9b4 100644
--- a/include/cru/platform/gui/sdl/OpenGLRenderer.h
+++ b/include/cru/platform/gui/sdl/OpenGLRenderer.h
@@ -15,7 +15,9 @@ namespace cru::platform::gui::sdl {
 class SdlWindow;
 
 class SdlOpenGLRenderer {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::platform::gui::sdl::SdlOpenGLRenderer")
+ private:
+  constexpr static auto kLogTag = "cru::platform::gui::sdl::SdlOpenGLRenderer";
+
  public:
   SdlOpenGLRenderer(SdlWindow* window, int width, int height);
   ~SdlOpenGLRenderer();
diff --git a/include/cru/platform/gui/sdl/Window.h b/include/cru/platform/gui/sdl/Window.h
index 41e5befb..48d7c70a 100644
--- a/include/cru/platform/gui/sdl/Window.h
+++ b/include/cru/platform/gui/sdl/Window.h
@@ -17,7 +17,8 @@ class SdlUiApplication;
 class SdlInputMethodContext;
 
 class SdlWindow : public SdlResource, public virtual INativeWindow {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::platform::gui::xcb::SdlWindow")
+ private:
+  constexpr static auto kLogTag = "cru::platform::gui::xcb::SdlWindow";
 
   friend SdlUiApplication;
 
diff --git a/include/cru/platform/gui/win/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h
index d9ef0532..3468c456 100644
--- a/include/cru/platform/gui/win/Clipboard.h
+++ b/include/cru/platform/gui/win/Clipboard.h
@@ -5,7 +5,9 @@
 
 namespace cru::platform::gui::win {
 class WinClipboard : public WinNativeResource, public virtual IClipboard {
-  CRU_DEFINE_CLASS_LOG_TAG("WinClipboard")
+ private:
+  constexpr static auto kLogTag = "WinClipboard";
+
  public:
   explicit WinClipboard(WinUiApplication* application);
 
diff --git a/include/cru/platform/gui/win/Cursor.h b/include/cru/platform/gui/win/Cursor.h
index 48817061..97970dfc 100644
--- a/include/cru/platform/gui/win/Cursor.h
+++ b/include/cru/platform/gui/win/Cursor.h
@@ -8,7 +8,8 @@
 namespace cru::platform::gui::win {
 class CRU_WIN_GUI_API WinCursor : public WinNativeResource,
                                   public virtual ICursor {
-  CRU_DEFINE_CLASS_LOG_TAG("WinCursor")
+ private:
+  constexpr static auto kLogTag = "WinCursor";
 
  public:
   WinCursor(HCURSOR handle, bool auto_destroy);
diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h
index bf59387b..e71aedf0 100644
--- a/include/cru/platform/gui/win/InputMethod.h
+++ b/include/cru/platform/gui/win/InputMethod.h
@@ -12,7 +12,8 @@
 
 namespace cru::platform::gui::win {
 class CRU_WIN_GUI_API AutoHIMC {
-  CRU_DEFINE_CLASS_LOG_TAG("AutoHIMC")
+ private:
+  constexpr static auto kLogTag = "AutoHIMC";
 
  public:
   explicit AutoHIMC(HWND hwnd);
@@ -36,7 +37,8 @@ class CRU_WIN_GUI_API AutoHIMC {
 class CRU_WIN_GUI_API WinInputMethodContext
     : public WinNativeResource,
       public virtual IInputMethodContext {
-  CRU_DEFINE_CLASS_LOG_TAG("WinInputMethodContext")
+ private:
+  constexpr static auto kLogTag = "WinInputMethodContext";
 
  public:
   WinInputMethodContext(WinNativeWindow* window);
diff --git a/include/cru/platform/gui/win/Window.h b/include/cru/platform/gui/win/Window.h
index e690ad4e..648f6a5e 100644
--- a/include/cru/platform/gui/win/Window.h
+++ b/include/cru/platform/gui/win/Window.h
@@ -11,7 +11,8 @@
 namespace cru::platform::gui::win {
 class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
                                         public virtual INativeWindow {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::platform::gui::win::WinNativeWindow")
+ private:
+  constexpr static auto kLogTag = "cru::platform::gui::win::WinNativeWindow";
 
  public:
   explicit WinNativeWindow(WinUiApplication* application);
diff --git a/include/cru/platform/gui/xcb/InputMethod.h b/include/cru/platform/gui/xcb/InputMethod.h
index 710ea2e5..1c8fe483 100644
--- a/include/cru/platform/gui/xcb/InputMethod.h
+++ b/include/cru/platform/gui/xcb/InputMethod.h
@@ -15,7 +15,9 @@ class XcbWindow;
 class XcbXimInputMethodContext;
 
 class XcbXimInputMethodManager : public XcbResource {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::platform::gui::xcb::XcbXimInputMethodManager")
+ private:
+  constexpr static auto kLogTag =
+      "cru::platform::gui::xcb::XcbXimInputMethodManager";
 
   friend XcbUiApplication;
   friend XcbXimInputMethodContext;
@@ -42,7 +44,9 @@ class XcbXimInputMethodManager : public XcbResource {
 
 class XcbXimInputMethodContext : public XcbResource,
                                  public virtual IInputMethodContext {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::platform::gui::xcb::XcbXimInputMethodContext")
+ private:
+  constexpr static auto kLogTag =
+      "cru::platform::gui::xcb::XcbXimInputMethodContext";
 
   friend XcbXimInputMethodManager;
 
diff --git a/include/cru/platform/gui/xcb/Window.h b/include/cru/platform/gui/xcb/Window.h
index 6820e7a9..a58d85f8 100644
--- a/include/cru/platform/gui/xcb/Window.h
+++ b/include/cru/platform/gui/xcb/Window.h
@@ -15,7 +15,8 @@ class XcbCursor;
 class XcbXimInputMethodContext;
 
 class XcbWindow : public XcbResource, public virtual INativeWindow {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::platform::gui::xcb::XcbWindow")
+ private:
+  constexpr static auto kLogTag = "cru::platform::gui::xcb::XcbWindow";
 
   friend XcbUiApplication;