From 401957aba65571c6caf5d9d5abb80f92fe67c370 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 17 May 2014 12:29:31 +0000
Subject: [PATCH] Make names of properties used in wxPropertyGrid translatable.

Use _() around these user-visible strings, not wxT().

Closes #16266.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/propgrid/advprops.cpp | 128 +++++++++++++++++++-------------------
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index c0855fbc05..0076b7ff98 100644
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -841,31 +841,31 @@ void wxFontProperty::OnCustomPaint(wxDC& dc,
 
 //#define wx_cp_es_syscolours_len 25
 static const wxChar* const gs_cp_es_syscolour_labels[] = {
-    wxT("AppWorkspace"),
-    wxT("ActiveBorder"),
-    wxT("ActiveCaption"),
-    wxT("ButtonFace"),
-    wxT("ButtonHighlight"),
-    wxT("ButtonShadow"),
-    wxT("ButtonText"),
-    wxT("CaptionText"),
-    wxT("ControlDark"),
-    wxT("ControlLight"),
-    wxT("Desktop"),
-    wxT("GrayText"),
-    wxT("Highlight"),
-    wxT("HighlightText"),
-    wxT("InactiveBorder"),
-    wxT("InactiveCaption"),
-    wxT("InactiveCaptionText"),
-    wxT("Menu"),
-    wxT("Scrollbar"),
-    wxT("Tooltip"),
-    wxT("TooltipText"),
-    wxT("Window"),
-    wxT("WindowFrame"),
-    wxT("WindowText"),
-    wxT("Custom"),
+    _("AppWorkspace"),
+    _("ActiveBorder"),
+    _("ActiveCaption"),
+    _("ButtonFace"),
+    _("ButtonHighlight"),
+    _("ButtonShadow"),
+    _("ButtonText"),
+    _("CaptionText"),
+    _("ControlDark"),
+    _("ControlLight"),
+    _("Desktop"),
+    _("GrayText"),
+    _("Highlight"),
+    _("HighlightText"),
+    _("InactiveBorder"),
+    _("InactiveCaption"),
+    _("InactiveCaptionText"),
+    _("Menu"),
+    _("Scrollbar"),
+    _("Tooltip"),
+    _("TooltipText"),
+    _("Window"),
+    _("WindowFrame"),
+    _("WindowText"),
+    _("Custom"),
     (const wxChar*) NULL
 };
 
@@ -1503,7 +1503,7 @@ bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& va
         if ( ival && (m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
         {
             // Show custom choice
-            m_choices.Insert(wxT("Custom"), GetCustomColourIndex(), wxPG_COLOUR_CUSTOM);
+            m_choices.Insert(_("Custom"), GetCustomColourIndex(), wxPG_COLOUR_CUSTOM);
             m_flags &= ~(wxPG_PROP_HIDE_CUSTOM_COLOUR);
         }
         else if ( !ival && !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
@@ -1523,16 +1523,16 @@ bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& va
 // -----------------------------------------------------------------------
 
 static const wxChar* const gs_cp_es_normcolour_labels[] = {
-    wxT("Black"),
-    wxT("Red"),
-    wxT("Green"),
-    wxT("Blue"),
-    wxT("Cyan"),
-    wxT("Magenta"),
-    wxT("Yellow"),
-    wxT("White"),
-    wxT("Grey"),
-    wxT("Custom"),
+    _("Black"),
+    _("Red"),
+    _("Green"),
+    _("Blue"),
+    _("Cyan"),
+    _("Magenta"),
+    _("Yellow"),
+    _("White"),
+    _("Grey"),
+    _("Custom"),
     (const wxChar*) NULL
 };
 
@@ -1619,34 +1619,34 @@ wxVariant wxColourProperty::DoTranslateVal( wxColourPropertyValue& v ) const
 
 //#define wx_cp_es_syscursors_len 28
 static const wxChar* const gs_cp_es_syscursors_labels[NUM_CURSORS+1] = {
-    wxT("Default"),
-    wxT("Arrow"),
-    wxT("Right Arrow"),
-    wxT("Blank"),
-    wxT("Bullseye"),
-    wxT("Character"),
-    wxT("Cross"),
-    wxT("Hand"),
-    wxT("I-Beam"),
-    wxT("Left Button"),
-    wxT("Magnifier"),
-    wxT("Middle Button"),
-    wxT("No Entry"),
-    wxT("Paint Brush"),
-    wxT("Pencil"),
-    wxT("Point Left"),
-    wxT("Point Right"),
-    wxT("Question Arrow"),
-    wxT("Right Button"),
-    wxT("Sizing NE-SW"),
-    wxT("Sizing N-S"),
-    wxT("Sizing NW-SE"),
-    wxT("Sizing W-E"),
-    wxT("Sizing"),
-    wxT("Spraycan"),
-    wxT("Wait"),
-    wxT("Watch"),
-    wxT("Wait Arrow"),
+    _("Default"),
+    _("Arrow"),
+    _("Right Arrow"),
+    _("Blank"),
+    _("Bullseye"),
+    _("Character"),
+    _("Cross"),
+    _("Hand"),
+    _("I-Beam"),
+    _("Left Button"),
+    _("Magnifier"),
+    _("Middle Button"),
+    _("No Entry"),
+    _("Paint Brush"),
+    _("Pencil"),
+    _("Point Left"),
+    _("Point Right"),
+    _("Question Arrow"),
+    _("Right Button"),
+    _("Sizing NE-SW"),
+    _("Sizing N-S"),
+    _("Sizing NW-SE"),
+    _("Sizing W-E"),
+    _("Sizing"),
+    _("Spraycan"),
+    _("Wait"),
+    _("Watch"),
+    _("Wait Arrow"),
     (const wxChar*) NULL
 };