cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark system cursor names translatable in a context, and do get translation

Browse Source 
It looks like wxGetTranslation() was not actually called for these strings
earlier, so do call it.

The context fulfills also the same purpose as TRANSLATORS: comments --
removing comments as redundant.
This commit is contained in:
Lauri Nurmi 2022-04-24 11:17:56 +03:00
parent 3396a40015
commit 180b8e5183
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/propgrid/advprops.h
View File

@ -265,6 +265,7 @@ class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty
int value = 0 );
virtual ~wxCursorProperty();
virtual wxString ValueToString(wxVariant& value, int argFlags = 0) const wxOVERRIDE;
virtual wxSize OnMeasureImage( int item ) const wxOVERRIDE;
virtual void OnCustomPaint( wxDC& dc,
const wxRect& rect, wxPGPaintData& paintdata ) wxOVERRIDE;

62
src/propgrid/advprops.cpp
View File

@ -1650,34 +1650,34 @@ wxVariant wxColourProperty::DoTranslateVal( wxColourPropertyValue& v ) const
#define NUM_CURSORS 28
static const char* const gs_cp_es_syscursors_labels[NUM_CURSORS+1] = {
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Default"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Arrow"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Right Arrow"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Blank"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Bullseye"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Character"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Cross"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Hand"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("I-Beam"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Left Button"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Magnifier"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Middle Button"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("No Entry"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Paint Brush"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Pencil"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Point Left"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Point Right"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Question Arrow"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Right Button"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Sizing NE-SW"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Sizing N-S"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Sizing NW-SE"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Sizing W-E"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Sizing"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Spraycan"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Wait"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Watch"),
/* TRANSLATORS: System cursor name */ wxTRANSLATE("Wait Arrow"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Default"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Arrow"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Right Arrow"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Blank"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Bullseye"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Character"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Cross"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Hand"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "I-Beam"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Left Button"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Magnifier"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Middle Button"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "No Entry"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Paint Brush"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Pencil"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Point Left"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Point Right"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Question Arrow"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Right Button"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Sizing NE-SW"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Sizing N-S"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Sizing NW-SE"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Sizing W-E"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Sizing"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Spraycan"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Wait"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Watch"),
wxTRANSLATE_IN_CONTEXT("system cursor name", "Wait Arrow"),
NULL
};
@ -1732,6 +1732,12 @@ wxCursorProperty::~wxCursorProperty()
{
}
wxString wxCursorProperty::ValueToString(wxVariant& value, int argFlags) const
{
return wxGetTranslation(wxEnumProperty::ValueToString(value, argFlags),
wxString(), "system cursor name");
}
wxSize wxCursorProperty::OnMeasureImage( int item ) const
{
#if wxPG_CAN_DRAW_CURSOR