Untranslated strings now won't be overwritten by regenerating the dialog.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd
index 858e61928132153d875b360ea9eac93292d51d04..b3c60d1a001e642a6b7af96a9a87be08f3cefbea 100644 (file)
--- a/src/richtext/richtextdialogs.pjd
+++ b/src/richtext/richtextdialogs.pjd
@@ -2502,14 +2502,6 @@
             <string name="proxy-type">"wbBoxSizerProxy"</string>
             <string name="proxy-Orientation">"Vertical"</string>
             <string name="proxy-Member variable name">""</string>
-            <string name="proxy-AlignH">"Centre"</string>
-            <string name="proxy-AlignV">"Centre"</string>
-            <long name="proxy-Stretch factor">0</long>
-            <long name="proxy-Border">5</long>
-            <bool name="proxy-wxLEFT">1</bool>
-            <bool name="proxy-wxRIGHT">1</bool>
-            <bool name="proxy-wxTOP">1</bool>
-            <bool name="proxy-wxBOTTOM">1</bool>
             <bool name="proxy-wxSHAPED">0</bool>
             <bool name="proxy-wxADJUST_MINSIZE">0</bool>
             <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -3908,7 +3900,7 @@
                         <long name="locked">0</long>
                         <string name="created">"10/11/2006"</string>
                         <string name="proxy-type">"wbComboBoxProxy"</string>
-                        <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlinelevelSelected"</string>
+                        <string name="event-handler-0">"wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlinelevelSelected|||wxRichTextIndentsSpacingPage"</string>
                         <string name="proxy-Id name">"ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL"</string>
                         <long name="proxy-Id value">10105</long>
                         <string name="proxy-Name">""</string>
@@ -3919,8 +3911,8 @@
                         <string name="proxy-Implementation filename">""</string>
                         <string name="proxy-Header filename">""</string>
                         <string name="proxy-Member variable name">"m_outlineLevelCtrl"</string>
-                        <string name="proxy-Strings">"(none)|1|2|3|4|5|6|7|8|9|10"</string>
-                        <string name="proxy-Initial value">"(none)"</string>
+                        <string name="proxy-Strings">""</string>
+                        <string name="proxy-Initial value">""</string>
                         <string name="proxy-Help text">"The outline level."</string>
                         <string name="proxy-Tooltip text">""</string>
                         <string name="proxy-Background colour">""</string>
@@ -8100,6 +8092,14 @@
             <string name="proxy-type">"wbBoxSizerProxy"</string>
             <string name="proxy-Orientation">"Vertical"</string>
             <string name="proxy-Member variable name">""</string>
+            <string name="proxy-AlignH">"Centre"</string>
+            <string name="proxy-AlignV">"Centre"</string>
+            <long name="proxy-Stretch factor">0</long>
+            <long name="proxy-Border">5</long>
+            <bool name="proxy-wxLEFT">1</bool>
+            <bool name="proxy-wxRIGHT">1</bool>
+            <bool name="proxy-wxTOP">1</bool>
+            <bool name="proxy-wxBOTTOM">1</bool>
             <bool name="proxy-wxSHAPED">0</bool>
             <bool name="proxy-wxADJUST_MINSIZE">0</bool>
             <bool name="proxy-wxFIXED_MINSIZE">0</bool>
@@ -9341,6 +9341,14 @@
             <string name="proxy-type">"wbBoxSizerProxy"</string>
             <string name="proxy-Orientation">"Vertical"</string>
             <string name="proxy-Member variable name">""</string>
+            <string name="proxy-AlignH">"Centre"</string>
+            <string name="proxy-AlignV">"Centre"</string>
+            <long name="proxy-Stretch factor">0</long>
+            <long name="proxy-Border">5</long>
+            <bool name="proxy-wxLEFT">1</bool>
+            <bool name="proxy-wxRIGHT">1</bool>
+            <bool name="proxy-wxTOP">1</bool>
+            <bool name="proxy-wxBOTTOM">1</bool>
             <bool name="proxy-wxSHAPED">0</bool>
             <bool name="proxy-wxADJUST_MINSIZE">0</bool>
             <bool name="proxy-wxFIXED_MINSIZE">0</bool>

diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp
index 15019ae7c0dc28f8fd80f83c9300148e72f7312e..96ef78f5467a081baf5d34bdc330cd7ee6f14814 100644 (file)
--- a/src/richtext/richtextindentspage.cpp
+++ b/src/richtext/richtextindentspage.cpp
@@ -27,29 +27,17 @@ BEGIN_EVENT_TABLE( wxRichTextIndentsSpacingPage, wxRichTextDialogPage )
 
 ////@begin wxRichTextIndentsSpacingPage event table entries
     EVT_RADIOBUTTON( ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT, wxRichTextIndentsSpacingPage::OnAlignmentLeftSelected )
-
     EVT_RADIOBUTTON( ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_RIGHT, wxRichTextIndentsSpacingPage::OnAlignmentRightSelected )
-
     EVT_RADIOBUTTON( ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_JUSTIFIED, wxRichTextIndentsSpacingPage::OnAlignmentJustifiedSelected )
-
     EVT_RADIOBUTTON( ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_CENTRED, wxRichTextIndentsSpacingPage::OnAlignmentCentredSelected )
-
     EVT_RADIOBUTTON( ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_INDETERMINATE, wxRichTextIndentsSpacingPage::OnAlignmentIndeterminateSelected )
-
     EVT_TEXT( ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT, wxRichTextIndentsSpacingPage::OnIndentLeftUpdated )
-
     EVT_TEXT( ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST, wxRichTextIndentsSpacingPage::OnIndentLeftFirstUpdated )
-
     EVT_TEXT( ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT, wxRichTextIndentsSpacingPage::OnIndentRightUpdated )
-
     EVT_COMBOBOX( ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL, wxRichTextIndentsSpacingPage::OnRichtextOutlinelevelSelected )
-
     EVT_TEXT( ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE, wxRichTextIndentsSpacingPage::OnSpacingBeforeUpdated )
-
     EVT_TEXT( ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER, wxRichTextIndentsSpacingPage::OnSpacingAfterUpdated )
-
     EVT_COMBOBOX( ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE, wxRichTextIndentsSpacingPage::OnSpacingLineSelected )
-
 ////@end wxRichTextIndentsSpacingPage event table entries
 
 END_EVENT_TABLE()
@@ -236,19 +224,7 @@ void wxRichTextIndentsSpacingPage::CreateControls()
     itemFlexGridSizer22->Add(itemStaticText29, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     wxArrayString m_outlineLevelCtrlStrings;
-    m_outlineLevelCtrlStrings.Add(_("(none)"));
-    m_outlineLevelCtrlStrings.Add("1");
-    m_outlineLevelCtrlStrings.Add("2");
-    m_outlineLevelCtrlStrings.Add("3");
-    m_outlineLevelCtrlStrings.Add("4");
-    m_outlineLevelCtrlStrings.Add("5");
-    m_outlineLevelCtrlStrings.Add("6");
-    m_outlineLevelCtrlStrings.Add("7");
-    m_outlineLevelCtrlStrings.Add("8");
-    m_outlineLevelCtrlStrings.Add("9");
-    m_outlineLevelCtrlStrings.Add("10");
-    m_outlineLevelCtrl = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL, _("(none)"), wxDefaultPosition, wxSize(85, -1), m_outlineLevelCtrlStrings, wxCB_READONLY );
-    m_outlineLevelCtrl->SetStringSelection(_("(none)"));
+    m_outlineLevelCtrl = new wxComboBox( itemRichTextDialogPage1, ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL, wxEmptyString, wxDefaultPosition, wxSize(85, -1), m_outlineLevelCtrlStrings, wxCB_READONLY );
     m_outlineLevelCtrl->SetHelpText(_("The outline level."));
     if (wxRichTextIndentsSpacingPage::ShowToolTips())
         m_outlineLevelCtrl->SetToolTip(_("The outline level."));
@@ -331,6 +307,24 @@ void wxRichTextIndentsSpacingPage::CreateControls()
     itemBoxSizer3->Add(m_previewCtrl, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
 
 ////@end wxRichTextIndentsSpacingPage content construction
+
+    wxArrayString outlineLevelCtrlStrings;
+    outlineLevelCtrlStrings.Add(_("(none)"));
+    outlineLevelCtrlStrings.Add("1");
+    outlineLevelCtrlStrings.Add("2");
+    outlineLevelCtrlStrings.Add("3");
+    outlineLevelCtrlStrings.Add("4");
+    outlineLevelCtrlStrings.Add("5");
+    outlineLevelCtrlStrings.Add("6");
+    outlineLevelCtrlStrings.Add("7");
+    outlineLevelCtrlStrings.Add("8");
+    outlineLevelCtrlStrings.Add("9");
+    outlineLevelCtrlStrings.Add("10");
+    
+    m_outlineLevelCtrl->Freeze();
+    m_outlineLevelCtrl->Append(outlineLevelCtrlStrings);
+    m_outlineLevelCtrl->Thaw();
+    m_outlineLevelCtrl->SetStringSelection(_("(none)"));
 }
 
 wxRichTextAttr* wxRichTextIndentsSpacingPage::GetAttributes()