diff --git a/include/wx/richtext/richtextstyledlg.h b/include/wx/richtext/richtextstyledlg.h index 9992ffeb29..3e2a6c774a 100644 --- a/include/wx/richtext/richtextstyledlg.h +++ b/include/wx/richtext/richtextstyledlg.h @@ -210,6 +210,7 @@ public: enum { ID_RICHTEXTSTYLEORGANISERDIALOG = 10500, ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES = 10501, + ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE = 10510, ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW = 10509, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR = 10504, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA = 10505, diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd index 69360c4127..c11ecd6f5a 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -6,13 +6,14 @@ "" "" "" - 285 "" 0 0 0 + 1 1 1 + 1 0 "Julian Smart" "(c) Julian Smart" @@ -44,12 +45,6 @@ // Licence: ///////////////////////////////////////////////////////////////////////////// -" - " -/*! - * %BODY% - */ - " "///////////////////////////////////////////////////////////////////////////// // Name: %SYMBOLS-FILENAME% @@ -83,6 +78,14 @@ #include "wx/wx.h" #endif +" + " /// %BODY% +" + " +/*! + * %BODY% + */ + " "app_resources.h" "app_resources.cpp" @@ -94,6 +97,7 @@ "" "<None>" "iso-8859-1" + "utf-8" "utf-8" "" 0 @@ -106,7 +110,9 @@ 1 1 1 + 0 1 + 0 @@ -183,7 +189,7 @@ 1 1 0 - 0 + 1 "Windows" "html-document" @@ -207,7 +213,10 @@ 10000 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTFONTPAGE" 10000 "wxRichTextFontPage" @@ -228,6 +237,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -260,6 +276,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -373,7 +390,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Font:" -1 @@ -387,6 +410,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -433,7 +461,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnFaceTextCtrlUpdated" "ID_RICHTEXTFONTPAGE_FACETEXTCTRL" 10001 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_faceTextCtrl" "" 0 @@ -447,6 +481,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -460,8 +499,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -489,6 +529,7 @@ 0 "" "" + 0 "wxRichTextFontListBox: ID_RICHTEXTFONTPAGE_FACELISTBOX" @@ -503,10 +544,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTFONTPAGE_FACELISTBOX" 10002 + "" "wxRichTextFontListBox" "wxWindow" - "m_faceListBox" 1 + 0 + "" + "" + "m_faceListBox" 1 "Lists the available fonts." "" @@ -518,6 +563,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -547,9 +597,9 @@ 0 0 1 - "" "" "" + "" @@ -590,7 +640,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Size:" -1 @@ -604,6 +660,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -650,7 +711,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSizeTextCtrlUpdated" "ID_RICHTEXTFONTPAGE_SIZETEXTCTRL" 10005 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_sizeTextCtrl" "" 0 @@ -664,6 +731,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -677,8 +749,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -706,6 +779,7 @@ 0 "" "" + 0 "wxListBox: ID_RICHTEXTFONTPAGE_SIZELISTBOX" @@ -721,7 +795,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnSizeListBoxSelected" "ID_RICHTEXTFONTPAGE_SIZELISTBOX" 10006 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_sizeListBox" "" "" @@ -735,6 +815,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -835,7 +920,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Font st&yle:" -1 @@ -849,6 +940,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -895,7 +991,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnStyleCtrlSelected" "ID_RICHTEXTFONTPAGE_STYLECTRL" 10007 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_styleCtrl" "" "" @@ -909,6 +1011,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -974,7 +1081,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Font &weight:" -1 @@ -988,6 +1101,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1034,7 +1152,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnWeightCtrlSelected" "ID_RICHTEXTFONTPAGE_WEIGHTCTRL" 10004 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_weightCtrl" "" "" @@ -1048,6 +1172,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -1113,7 +1242,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Underlining:" -1 @@ -1127,6 +1262,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1173,7 +1313,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnUnderliningCtrlSelected" "ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL" 10008 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_underliningCtrl" "" "" @@ -1187,6 +1333,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -1252,7 +1403,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Colour:" -1 @@ -1266,6 +1423,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1311,10 +1473,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTFONTPAGE_COLOURCTRL" 10009 + "" "wxRichTextColourSwatchCtrl" "wxWindow" - "m_colourCtrl" 1 + 0 + "" + "" + "m_colourCtrl" 1 "Click to change the text colour." "" @@ -1326,6 +1492,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -1355,9 +1526,9 @@ 0 0 0 - "" "" "" + "" @@ -1400,7 +1571,13 @@ "wxEVT_COMMAND_CHECKBOX_CLICKED|OnStrikethroughctrlClick" "ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL" 10010 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_strikethroughCtrl" "&Strikethrough" 0 @@ -1408,6 +1585,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -1454,7 +1636,13 @@ "wxEVT_COMMAND_CHECKBOX_CLICKED|OnCapsctrlClick" "ID_RICHTEXTFONTPAGE_CAPSCTRL" 10011 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_capitalsCtrl" "Ca&pitals" 0 @@ -1462,6 +1650,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -1534,10 +1727,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTFONTPAGE_PREVIEWCTRL" 10003 + "" "wxRichTextFontPreviewCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the font settings." "" @@ -1549,6 +1746,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -1578,9 +1780,9 @@ 0 0 0 - "" "" "" + "" @@ -1599,7 +1801,10 @@ 10100 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTINDENTSSPACINGPAGE" 10100 "wxRichTextIndentsSpacingPage" @@ -1620,6 +1825,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -1652,6 +1864,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -1666,6 +1879,14 @@ "wbBoxSizerProxy" "Vertical" "" + "Centre" + "Centre" + 0 + 5 + 1 + 1 + 1 + 1 0 0 0 @@ -1758,7 +1979,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Alignment" -1 @@ -1772,6 +1999,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1894,7 +2126,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentLeftSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT" 10102 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentLeft" "&Left" 0 @@ -1908,6 +2146,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -1946,7 +2189,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentRightSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_RIGHT" 10110 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentRight" "&Right" 0 @@ -1960,6 +2209,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1998,7 +2252,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentJustifiedSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_JUSTIFIED" 10111 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentJustified" "&Justified" 0 @@ -2012,6 +2272,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2050,7 +2315,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentCentredSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_CENTRED" 10112 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentCentred" "Cen&tred" 0 @@ -2064,6 +2335,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2102,7 +2378,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnAlignmentIndeterminateSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_INDETERMINATE" 10101 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentIndeterminate" "&Indeterminate" 0 @@ -2116,6 +2398,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2182,7 +2469,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -2282,7 +2575,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Indentation (tenths of a mm)" -1 @@ -2296,6 +2595,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2422,7 +2726,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Left:" -1 @@ -2436,6 +2746,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2507,7 +2822,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT" 10103 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeft" "" 0 @@ -2521,6 +2842,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2534,8 +2860,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -2563,6 +2890,7 @@ 0 "" "" + 0 @@ -2578,7 +2906,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Left (&first line):" -1 @@ -2592,6 +2926,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2663,7 +3002,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftFirstUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST" 10104 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeftFirst" "" 0 @@ -2677,6 +3022,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2690,8 +3040,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -2719,6 +3070,7 @@ 0 "" "" + 0 @@ -2734,7 +3086,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Right:" -1 @@ -2748,6 +3106,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2819,7 +3182,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT" 10113 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentRight" "" 0 @@ -2833,6 +3202,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2846,8 +3220,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -2875,6 +3250,7 @@ 0 "" "" + 0 @@ -2890,7 +3266,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Outline level:" -1 @@ -2904,6 +3286,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -2950,7 +3337,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnRichtextOutlinelevelSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL" 10105 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_outlineLevelCtrl" "Normal|1|2|3|4|5|6|7|8|9" "Normal" @@ -2964,6 +3357,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -3032,7 +3430,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -3132,7 +3536,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Spacing (tenths of a mm)" -1 @@ -3146,6 +3556,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3272,7 +3687,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Before a paragraph:" -1 @@ -3286,6 +3707,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3357,7 +3783,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE" 10114 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingBefore" "" 0 @@ -3371,6 +3803,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3384,8 +3821,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -3413,6 +3851,7 @@ 0 "" "" + 0 @@ -3428,7 +3867,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&After a paragraph:" -1 @@ -3442,6 +3887,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3513,7 +3963,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER" 10116 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingAfter" "" 0 @@ -3527,6 +3983,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3540,8 +4001,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -3569,6 +4031,7 @@ 0 "" "" + 0 @@ -3584,7 +4047,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "L&ine spacing:" -1 @@ -3598,6 +4067,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3669,7 +4143,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnSpacingLineSelected" "ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE" 10115 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_spacingLine" "Single|1.5|2" "Single" @@ -3683,6 +4163,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -3753,10 +4238,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL" 10109 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the paragraph settings." "" @@ -3768,6 +4257,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -3797,9 +4291,9 @@ 0 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" @@ -3818,7 +4312,10 @@ 10200 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTTABSPAGE" 10200 "wxRichTextTabsPage" @@ -3839,6 +4336,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -3871,6 +4375,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -3985,7 +4490,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Position (tenths of a mm):" -1 @@ -3999,6 +4510,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -4044,7 +4560,13 @@ "wbTextCtrlProxy" "ID_RICHTEXTTABSPAGE_TABEDIT" 10213 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_tabEditCtrl" "" 0 @@ -4058,6 +4580,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -4071,8 +4598,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -4100,6 +4628,7 @@ 0 "" "" + 0 "wxListBox: ID_RICHTEXTTABSPAGE_TABLIST" @@ -4115,7 +4644,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnTablistSelected" "ID_RICHTEXTTABSPAGE_TABLIST" 10214 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_tabListCtrl" "The tab positions." "" @@ -4129,6 +4664,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -4229,7 +4769,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "" -1 @@ -4243,6 +4789,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -4290,12 +4841,25 @@ "wxEVT_UPDATE_UI|OnNewTabUpdate" "ID_RICHTEXTTABSPAGE_NEW_TAB" 10201 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&New" 0 "Click to create a new tab position." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -4345,12 +4909,25 @@ "wxEVT_UPDATE_UI|OnDeleteTabUpdate" "ID_RICHTEXTTABSPAGE_DELETE_TAB" 10202 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Delete" 0 "Click to delete the selected tab position." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -4400,12 +4977,25 @@ "wxEVT_UPDATE_UI|OnDeleteAllTabsUpdate" "ID_RICHTEXTTABSPAGE_DELETE_ALL_TABS" 10203 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Delete A&ll" 0 "Click to delete all tab positions." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -4459,7 +5049,10 @@ 10300 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTBULLETSPAGE" 10300 "wxRichTextBulletsPage" @@ -4480,6 +5073,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -4512,6 +5112,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -4626,7 +5227,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Bullet style:" -1 @@ -4640,6 +5247,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -4686,7 +5298,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnStylelistboxSelected" "ID_RICHTEXTBULLETSPAGE_STYLELISTBOX" 10305 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_styleListBox" "" "" @@ -4700,6 +5318,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -4775,7 +5398,13 @@ "wxEVT_UPDATE_UI|OnPeriodctrlUpdate" "ID_RICHTEXTBULLETSPAGE_PERIODCTRL" 10313 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_periodCtrl" "Peri&od" 0 @@ -4783,6 +5412,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -4830,7 +5464,13 @@ "wxEVT_UPDATE_UI|OnParenthesesctrlUpdate" "ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL" 10311 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_parenthesesCtrl" "(*)" 0 @@ -4838,6 +5478,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -4885,7 +5530,13 @@ "wxEVT_UPDATE_UI|OnRightParenthesisCtrlUpdate" "ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL" 10306 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_rightParenthesisCtrl" "*)" 0 @@ -4893,6 +5544,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -4965,7 +5621,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Bullet &Alignment:" -1 @@ -4979,6 +5641,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5025,7 +5692,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnBulletAlignmentCtrlSelected" "ID_RICHTEXTBULLETSPAGE_BULLETALIGNMENTCTRL" 10315 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletAlignmentCtrl" "Left|Centre|Right" "Left" @@ -5039,6 +5712,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -5105,7 +5783,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -5206,7 +5890,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC" 10301 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Symbol:" -1 @@ -5220,6 +5910,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5293,7 +5988,13 @@ "wxEVT_UPDATE_UI|OnSymbolctrlUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL" 10307 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolCtrl" "" "" @@ -5307,6 +6008,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -5348,12 +6054,25 @@ "wxEVT_UPDATE_UI|OnChooseSymbolUpdate" "ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL" 10308 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Ch&oose..." 0 "Click to browse for a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -5429,7 +6148,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC" 10301 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Symbol &font:" -1 @@ -5443,6 +6168,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5491,7 +6221,13 @@ "wxEVT_UPDATE_UI|OnSymbolfontctrlUIUpdate" "ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL" 10309 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolFontCtrl" "" "" @@ -5505,6 +6241,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -5571,7 +6312,13 @@ "wxEVT_UPDATE_UI|OnNamestaticUpdate" "ID_RICHTEXTBULLETSPAGE_NAMESTATIC" 10303 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "S&tandard bullet name:" -1 @@ -5585,6 +6332,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5633,7 +6385,13 @@ "wxEVT_UPDATE_UI|OnNamectrlUIUpdate" "ID_RICHTEXTBULLETSPAGE_NAMECTRL" 10304 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletNameCtrl" "" "" @@ -5647,6 +6405,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -5713,7 +6476,13 @@ "wxEVT_UPDATE_UI|OnNumberstaticUpdate" "ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC" 10302 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Number:" -1 @@ -5727,6 +6496,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5777,7 +6551,13 @@ "wxEVT_UPDATE_UI|OnNumberctrlUpdate" "ID_RICHTEXTBULLETSPAGE_NUMBERCTRL" 10310 + "" "wxSpinCtrl" + "wxSpinCtrl" + 1 + 0 + "" + "" "m_numberCtrl" 0 100000 @@ -5792,6 +6572,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -5863,10 +6648,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTBULLETSPAGE_PREVIEW_CTRL" 10314 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the bullet settings." "" @@ -5878,6 +6667,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -5907,9 +6701,9 @@ 0 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" @@ -5928,7 +6722,10 @@ 10400 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTSTYLEPAGE" 10403 "wxRichTextStylePage" @@ -5949,6 +6746,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -5981,6 +6785,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -6095,7 +6900,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Style:" -1 @@ -6109,6 +6920,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6154,7 +6970,13 @@ "wbTextCtrlProxy" "ID_RICHTEXTSTYLEPAGE_STYLE_NAME" 10404 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_styleName" "" 0 @@ -6168,6 +6990,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6181,8 +7008,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -6210,6 +7038,7 @@ 0 "" "" + 0 "wxStaticText: wxID_STATIC" @@ -6224,7 +7053,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Based on:" -1 @@ -6238,6 +7073,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6283,7 +7123,13 @@ "wbComboBoxProxy" "ID_RICHTEXTSTYLEPAGE_BASED_ON" 10405 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_basedOn" "" "" @@ -6297,6 +7143,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -6336,7 +7187,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Next style:" -1 @@ -6350,6 +7207,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6396,7 +7258,13 @@ "wxEVT_UPDATE_UI|OnNextStyleUpdate" "ID_RICHTEXTSTYLEPAGE_NEXT_STYLE" 10406 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_nextStyle" "" "" @@ -6410,6 +7278,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -6481,7 +7354,10 @@ 10600 0 "" + 0 + "" 0 + 0 "m_fontName|wxString|FontName||0" "m_symbol|wxString|Symbol||0" "m_fromUnicode|bool|FromUnicode|true|0" @@ -6506,6 +7382,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 1 @@ -6538,6 +7421,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -6652,7 +7536,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Font:" -1 @@ -6666,6 +7556,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6712,7 +7607,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnFontCtrlSelected" "ID_SYMBOLPICKERDIALOG_FONT" 10602 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_fontCtrl" "" "" @@ -6726,6 +7627,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -6791,7 +7697,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Subset:" -1 @@ -6805,6 +7717,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -6851,7 +7768,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnSubsetSelected" "ID_SYMBOLPICKERDIALOG_SUBSET" 10605 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_subsetCtrl" "" "" @@ -6865,6 +7788,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -6906,10 +7834,14 @@ "wbForeignCtrlProxy" "ID_SYMBOLPICKERDIALOG_LISTCTRL" 10608 + "" "wxSymbolListCtrl" "wxWindow" - "m_symbolsCtrl" 1 + 0 + "" + "" + "m_symbolsCtrl" 1 "" "" @@ -6921,6 +7853,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -6950,9 +7887,9 @@ 0 0 0 - "" "" "" + "" "wxBoxSizer H" @@ -6992,7 +7929,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "m_symbolStaticCtrl" "xxxx" -1 @@ -7006,6 +7949,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -7077,7 +8025,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Character code:" -1 @@ -7091,6 +8045,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7136,7 +8095,13 @@ "wbTextCtrlProxy" "ID_SYMBOLPICKERDIALOG_CHARACTERCODE" 10601 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_characterCodeCtrl" "" 0 @@ -7150,6 +8115,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7163,8 +8133,9 @@ 1 0 0 - 0 + 0 0 + 0 0 0 0 @@ -7192,6 +8163,7 @@ 0 "" "" + 0 "Spacer" @@ -7232,7 +8204,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&From:" -1 @@ -7246,6 +8224,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7292,7 +8275,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnFromUnicodeSelected" "ID_SYMBOLPICKERDIALOG_FROM" 10603 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_fromUnicodeCtrl" "ASCII|Unicode" "ASCII" @@ -7306,6 +8295,11 @@ "__UNICODE__" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -7398,12 +8392,25 @@ "wxEVT_UPDATE_UI|OnOkUpdate" "wxID_OK" 5100 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Insert" 1 "Inserts the chosen symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7451,12 +8458,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Close" 0 "Closes the dialog without inserting a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7556,12 +8576,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Close" 0 "Closes the dialog without inserting a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7610,12 +8643,25 @@ "wxEVT_UPDATE_UI|OnOkUpdate" "wxID_OK" 5100 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Insert" 1 "Inserts the chosen symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -7668,7 +8714,10 @@ 10500 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTSTYLEORGANISERDIALOG" 10500 "wxRichTextStyleOrganiserDialog" @@ -7689,6 +8738,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 1 @@ -7721,6 +8777,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -7734,14 +8791,6 @@ "wbBoxSizerProxy" "Vertical" "" - "Centre" - "Centre" - 0 - 5 - 1 - 1 - 1 - 1 0 0 0 @@ -7834,7 +8883,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Styles:" -1 @@ -7848,6 +8903,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -7893,10 +8953,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES" 10501 + "" "wxRichTextStyleListCtrl" "wxWindow" - "m_stylesListBox" 1 + 0 + "" + "" + "m_stylesListBox" 1 "The available styles." "" @@ -7908,6 +8972,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -7924,7 +8993,7 @@ "listCtrlStyle" -1 -1 - 200 + 280 350 "Expand" "Centre" @@ -7937,9 +9006,9 @@ 0 0 0 - "" "" "" + "" @@ -7968,7 +9037,7 @@ 0 "<Any platform>" - "wxStaticText: wxID_STATIC" + "wxStaticText: ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE" "dialog-control-document" "" "statictext" @@ -7978,9 +9047,15 @@ 0 "18/10/2006" "wbStaticTextProxy" - "wxID_STATIC" - 5105 + "ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE" + 10510 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" " " -1 @@ -7994,6 +9069,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -8012,7 +9092,7 @@ -1 -1 -1 - "Left" + "Expand" "Centre" 0 5 @@ -8039,10 +9119,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW" 10509 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "The style preview." "" @@ -8054,6 +9138,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -8083,9 +9172,9 @@ 0 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" @@ -8126,7 +9215,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" " " -1 @@ -8140,6 +9235,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -8187,12 +9287,25 @@ "wxEVT_UPDATE_UI|OnNewCharUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR" 10504 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_newCharacter" "New &Character Style..." 0 "Click to create a new character style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8242,12 +9355,25 @@ "wxEVT_UPDATE_UI|OnNewParaUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA" 10505 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_newParagraph" "New &Paragraph Style..." 0 "Click to create a new paragraph style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8297,12 +9423,25 @@ "wxEVT_UPDATE_UI|OnNewListUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST" 10508 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_newList" "New &List Style..." 0 "Click to create a new list style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8378,12 +9517,25 @@ "wxEVT_UPDATE_UI|OnApplyUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY" 10503 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_applyStyle" "&Apply Style" 0 "Click to apply the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8433,12 +9585,25 @@ "wxEVT_UPDATE_UI|OnRenameUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME" 10502 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_renameStyle" "&Rename Style..." 0 "Click to rename the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8488,12 +9653,25 @@ "wxEVT_UPDATE_UI|OnEditUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT" 10506 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_editStyle" "&Edit Style..." 0 "Click to edit the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8543,12 +9721,25 @@ "wxEVT_UPDATE_UI|OnDeleteUpdate" "ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE" 10507 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_deleteStyle" "&Delete Style..." 0 "Click to delete the selected style." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8622,12 +9813,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_closeButton" "Close" 1 "Click to close this window." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8702,7 +9906,13 @@ "wbCheckBoxProxy" "ID_RICHTEXTSTYLEORGANISERDIALOG_RESTART_NUMBERING" 10511 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_restartNumberingCtrl" "&Restart numbering" 0 @@ -8710,6 +9920,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -8781,12 +9996,25 @@ "wbButtonProxy" "wxID_OK" 5100 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_okButton" "OK" 1 "Click to confirm your selection." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8834,12 +10062,25 @@ "wbButtonProxy" "wxID_CANCEL" 5101 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "m_cancelButton" "Cancel" 0 "Click to cancel this window." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -8892,7 +10133,10 @@ 10600 0 "" + 0 + "" 0 + 0 "ID_RICHTEXTLISTSTYLEPAGE" 10616 "wxRichTextListStylePage" @@ -8913,6 +10157,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 0 1 @@ -8945,6 +10196,7 @@ -1 400 300 + 0 "" "wxBoxSizer V" @@ -9034,7 +10286,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&List level:" -1 @@ -9048,6 +10306,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -9098,7 +10361,13 @@ "wxEVT_UPDATE_UI|OnLevelUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_LEVEL" 10617 + "" "wxSpinCtrl" + "wxSpinCtrl" + 1 + 0 + "" + "" "m_levelCtrl" 1 10 @@ -9113,6 +10382,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -9183,12 +10457,25 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnChooseFontClick" "ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_FONT" 10604 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "&Font for Level..." 0 "Click to choose the font for this level." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -9237,7 +10524,13 @@ "wbNotebookProxy" "ID_RICHTEXTLISTSTYLEPAGE_NOTEBOOK" 10618 + "" "wxNotebook" + "wxNotebook" + 1 + 0 + "" + "" "" 0 "" @@ -9250,6 +10543,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 1 0 @@ -9301,13 +10599,14 @@ "wbPanelProxy" "ID_RICHTEXTLISTSTYLEPAGE_BULLETS" 10619 + "" "wxPanel" "wxPanel" - "" 0 0 "" "" + "" "" "" "" @@ -9316,6 +10615,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 0 @@ -9329,6 +10635,7 @@ 0 0 1 + 0 0 0 "" @@ -9351,6 +10658,7 @@ "" "" "" + 0 "Bullet style" "" @@ -9441,7 +10749,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Bullet style:" -1 @@ -9455,6 +10769,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -9501,7 +10820,13 @@ "wxEVT_COMMAND_LISTBOX_SELECTED|OnStylelistboxSelected" "ID_RICHTEXTLISTSTYLEPAGE_STYLELISTBOX" 10620 + "" "wxListBox" + "wxListBox" + 1 + 0 + "" + "" "m_styleListBox" "" "" @@ -9515,6 +10840,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -9590,7 +10920,13 @@ "wxEVT_UPDATE_UI|OnPeriodctrlUpdate" "ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL" 10627 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_periodCtrl" "Peri&od" 0 @@ -9598,6 +10934,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -9645,7 +10986,13 @@ "wxEVT_UPDATE_UI|OnParenthesesctrlUpdate" "ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL" 10626 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_parenthesesCtrl" "(*)" 0 @@ -9653,6 +11000,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -9700,7 +11052,13 @@ "wxEVT_UPDATE_UI|OnRightParenthesisCtrlUpdate" "ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL" 10602 + "" "wxCheckBox" + "wxCheckBox" + 1 + 0 + "" + "" "m_rightParenthesisCtrl" "*)" 0 @@ -9708,6 +11066,11 @@ "" "" "" + "" + "" + "" + "" + "" "" "" "" @@ -9780,7 +11143,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Bullet &Alignment:" -1 @@ -9794,6 +11163,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -9840,7 +11214,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnBulletAlignmentCtrlSelected" "ID_RICHTEXTLISTSTYLEPAGE_BULLETALIGNMENTCTRL" 10603 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletAlignmentCtrl" "Left|Centre|Right" "Left" @@ -9854,6 +11234,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -9920,7 +11305,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -10021,7 +11412,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC" 10621 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Symbol:" -1 @@ -10035,6 +11432,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10108,7 +11510,13 @@ "wxEVT_UPDATE_UI|OnSymbolctrlUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL" 10622 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolCtrl" "" "" @@ -10122,6 +11530,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -10163,12 +11576,25 @@ "wxEVT_UPDATE_UI|OnChooseSymbolUpdate" "ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL" 10623 + "" "wxButton" + "wxButton" + 1 + 0 + "" + "" "" "Ch&oose..." 0 "Click to browse for a symbol." "" + "" + "" + "" + "" + "" + "" + "" "" "" "" @@ -10244,7 +11670,13 @@ "wxEVT_UPDATE_UI|OnSymbolstaticUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC" 10624 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Symbol &font:" -1 @@ -10258,6 +11690,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10306,7 +11743,13 @@ "wxEVT_UPDATE_UI|OnSymbolfontctrlUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL" 10625 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_symbolFontCtrl" "" "" @@ -10320,6 +11763,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -10386,7 +11834,13 @@ "wxEVT_UPDATE_UI|OnNamestaticUpdate" "ID_RICHTEXTLISTSTYLEPAGE_NAMESTATIC" 10600 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "S&tandard bullet name:" -1 @@ -10400,6 +11854,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10448,7 +11907,13 @@ "wxEVT_UPDATE_UI|OnNamectrlUIUpdate" "ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL" 10601 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_bulletNameCtrl" "" "" @@ -10462,6 +11927,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -10505,13 +11975,14 @@ "wbPanelProxy" "ID_RICHTEXTLISTSTYLEPAGE_SPACING" 10628 + "" "wxPanel" "wxPanel" - "" 0 0 "" "" + "" "" "" "" @@ -10520,6 +11991,13 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 1 0 0 @@ -10533,6 +12011,7 @@ 0 0 1 + 0 0 0 "" @@ -10555,6 +12034,7 @@ "" "" "" + 0 "Spacing" "" @@ -10645,7 +12125,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Alignment" -1 @@ -10659,6 +12145,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10781,7 +12272,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageAlignleftSelected" "ID_RICHTEXTLISTSTYLEPAGE_ALIGNLEFT" 10629 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentLeft" "&Left" 0 @@ -10795,6 +12292,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -10833,7 +12335,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageAlignrightSelected" "ID_RICHTEXTLISTSTYLEPAGE_ALIGNRIGHT" 10630 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentRight" "&Right" 0 @@ -10847,6 +12355,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10885,7 +12398,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageJustifiedSelected" "ID_RICHTEXTLISTSTYLEPAGE_JUSTIFIED" 10631 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentJustified" "&Justified" 0 @@ -10899,6 +12418,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10937,7 +12461,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageCenteredSelected" "ID_RICHTEXTLISTSTYLEPAGE_CENTERED" 10632 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentCentred" "Cen&tred" 0 @@ -10951,6 +12481,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -10989,7 +12524,13 @@ "wxEVT_COMMAND_RADIOBUTTON_SELECTED|OnRichtextliststylepageAlignindeterminateSelected" "ID_RICHTEXTLISTSTYLEPAGE_ALIGNINDETERMINATE" 10633 + "" "wxRadioButton" + "wxRadioButton" + 1 + 0 + "" + "" "m_alignmentIndeterminate" "&Indeterminate" 0 @@ -11003,6 +12544,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11069,7 +12615,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -11169,7 +12721,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Indentation (tenths of a mm)" -1 @@ -11183,6 +12741,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11309,7 +12872,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Left:" -1 @@ -11323,6 +12892,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11394,7 +12968,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentLeftUpdated" "ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT" 10634 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeft" "" 0 @@ -11408,6 +12988,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11421,8 +13006,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -11450,6 +13036,7 @@ 0 "" "" + 0 @@ -11465,7 +13052,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Left (&first line):" -1 @@ -11479,6 +13072,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11550,7 +13148,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentFirstLineUpdated" "ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE" 10635 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentLeftFirst" "" 0 @@ -11564,6 +13168,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11577,8 +13186,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -11606,6 +13216,7 @@ 0 "" "" + 0 @@ -11621,7 +13232,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Right:" -1 @@ -11635,6 +13252,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11706,7 +13328,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnIndentRightUpdated" "ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT" 10636 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_indentRight" "" 0 @@ -11720,6 +13348,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -11733,8 +13366,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -11762,6 +13396,7 @@ 0 "" "" + 0 @@ -11806,7 +13441,13 @@ "wbStaticLineProxy" "wxID_STATIC" 5105 + "" "wxStaticLine" + "wxStaticLine" + 1 + 0 + "" + "" "" "" "" @@ -11906,7 +13547,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "&Spacing (tenths of a mm)" -1 @@ -11920,6 +13567,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12046,7 +13698,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Before a paragraph:" -1 @@ -12060,6 +13718,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12131,7 +13794,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingBeforeUpdated" "ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE" 10637 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingBefore" "" 0 @@ -12145,6 +13814,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12158,8 +13832,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -12187,6 +13862,7 @@ 0 "" "" + 0 @@ -12202,7 +13878,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "After a paragraph:" -1 @@ -12216,6 +13898,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12287,7 +13974,13 @@ "wxEVT_COMMAND_TEXT_UPDATED|OnSpacingAfterUpdated" "ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER" 10638 + "" "wxTextCtrl" + "wxTextCtrl" + 1 + 0 + "" + "" "m_spacingAfter" "" 0 @@ -12301,6 +13994,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12314,8 +14012,9 @@ 0 0 0 - 0 + 0 0 + 0 0 0 0 @@ -12343,6 +14042,7 @@ 0 "" "" + 0 @@ -12358,7 +14058,13 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" + "wxStaticText" + 1 + 0 + "" + "" "" "Line spacing:" -1 @@ -12372,6 +14078,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12443,7 +14154,13 @@ "wxEVT_COMMAND_COMBOBOX_SELECTED|OnLineSpacingSelected" "ID_RICHTEXTLISTSTYLEPAGE_LINESPACING" 10639 + "" "wxComboBox" + "wxComboBox" + 1 + 0 + "" + "" "m_spacingLine" "Single|1.5|2" "Single" @@ -12457,6 +14174,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 1 @@ -12504,10 +14226,14 @@ "wbForeignCtrlProxy" "ID_RICHTEXTLISTSTYLEPAGE_RICHTEXTCTRL" 10640 + "" "wxRichTextCtrl" "wxWindow" - "m_previewCtrl" 1 + 0 + "" + "" + "m_previewCtrl" 1 "Shows a preview of the bullet settings." "" @@ -12519,6 +14245,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -12548,9 +14279,9 @@ 0 0 0 - "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" "" + "" diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp index bdc7637ed5..964071881f 100644 --- a/src/richtext/richtextstyledlg.cpp +++ b/src/richtext/richtextstyledlg.cpp @@ -126,7 +126,7 @@ bool wxRichTextStyleOrganiserDialog::Create( int flags, wxRichTextStyleSheet* sh m_flags = flags; ////@begin wxRichTextStyleOrganiserDialog creation - SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS|wxDIALOG_EX_CONTEXTHELP); + SetExtraStyle(wxWS_EX_BLOCK_EVENTS|wxDIALOG_EX_CONTEXTHELP); wxDialog::Create( parent, id, caption, pos, size, style ); CreateControls(); @@ -190,21 +190,21 @@ void wxRichTextStyleOrganiserDialog::CreateControls() wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Styles:"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); - m_stylesListBox = new wxRichTextStyleListCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES, wxDefaultPosition, wxSize(200, 350), wxSIMPLE_BORDER|listCtrlStyle ); + m_stylesListBox = new wxRichTextStyleListCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES, wxDefaultPosition, wxSize(280, 350), wxSIMPLE_BORDER|listCtrlStyle ); m_stylesListBox->SetHelpText(_("The available styles.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_stylesListBox->SetToolTip(_("The available styles.")); itemBoxSizer5->Add(m_stylesListBox, 1, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL); m_buttonSizerParent->Add(itemBoxSizer8, 0, wxGROW, 5); - wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _(" "), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE, _(" "), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer8->Add(itemStaticText9, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); m_previewCtrl = new wxRichTextCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW, wxEmptyString, wxDefaultPosition, wxSize(310, 200), wxSIMPLE_BORDER|wxTE_READONLY ); m_previewCtrl->SetHelpText(_("The style preview.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_previewCtrl->SetToolTip(_("The style preview.")); itemBoxSizer8->Add(m_previewCtrl, 1, wxGROW|wxALL, 5); @@ -216,19 +216,19 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_newCharacter = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR, _("New &Character Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_newCharacter->SetHelpText(_("Click to create a new character style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_newCharacter->SetToolTip(_("Click to create a new character style.")); m_buttonSizer->Add(m_newCharacter, 0, wxGROW|wxALL, 5); m_newParagraph = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA, _("New &Paragraph Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_newParagraph->SetHelpText(_("Click to create a new paragraph style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_newParagraph->SetToolTip(_("Click to create a new paragraph style.")); m_buttonSizer->Add(m_newParagraph, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); m_newList = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST, _("New &List Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_newList->SetHelpText(_("Click to create a new list style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_newList->SetToolTip(_("Click to create a new list style.")); m_buttonSizer->Add(m_newList, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); @@ -236,25 +236,25 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_applyStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY, _("&Apply Style"), wxDefaultPosition, wxDefaultSize, 0 ); m_applyStyle->SetHelpText(_("Click to apply the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_applyStyle->SetToolTip(_("Click to apply the selected style.")); m_buttonSizer->Add(m_applyStyle, 0, wxGROW|wxALL, 5); m_renameStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME, _("&Rename Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_renameStyle->SetHelpText(_("Click to rename the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_renameStyle->SetToolTip(_("Click to rename the selected style.")); m_buttonSizer->Add(m_renameStyle, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); m_editStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT, _("&Edit Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_editStyle->SetHelpText(_("Click to edit the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_editStyle->SetToolTip(_("Click to edit the selected style.")); m_buttonSizer->Add(m_editStyle, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); m_deleteStyle = new wxButton( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE, _("&Delete Style..."), wxDefaultPosition, wxDefaultSize, 0 ); m_deleteStyle->SetHelpText(_("Click to delete the selected style.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_deleteStyle->SetToolTip(_("Click to delete the selected style.")); m_buttonSizer->Add(m_deleteStyle, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5); @@ -263,7 +263,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_closeButton = new wxButton( itemDialog1, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); m_closeButton->SetDefault(); m_closeButton->SetHelpText(_("Click to close this window.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_closeButton->SetToolTip(_("Click to close this window.")); m_buttonSizer->Add(m_closeButton, 0, wxGROW|wxALL, 5); @@ -273,7 +273,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_restartNumberingCtrl = new wxCheckBox( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_RESTART_NUMBERING, _("&Restart numbering"), wxDefaultPosition, wxDefaultSize, 0 ); m_restartNumberingCtrl->SetValue(false); m_restartNumberingCtrl->SetHelpText(_("Check to restart numbering.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_restartNumberingCtrl->SetToolTip(_("Check to restart numbering.")); m_bottomButtonSizer->Add(m_restartNumberingCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -282,13 +282,13 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_okButton = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); m_okButton->SetDefault(); m_okButton->SetHelpText(_("Click to confirm your selection.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_okButton->SetToolTip(_("Click to confirm your selection.")); m_bottomButtonSizer->Add(m_okButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_cancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); m_cancelButton->SetHelpText(_("Click to cancel this window.")); - if (ShowToolTips()) + if (wxRichTextStyleOrganiserDialog::ShowToolTips()) m_cancelButton->SetToolTip(_("Click to cancel this window.")); m_bottomButtonSizer->Add(m_cancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -426,6 +426,10 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); wxRichTextListStyleDefinition* listDef = wxDynamicCast(def, wxRichTextListStyleDefinition); + wxStaticText* labelCtrl = (wxStaticText*) FindWindow(ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE); + if (labelCtrl) + labelCtrl->SetLabel(def->GetName() + wxT(":")); + wxTextAttrEx attr(def->GetStyleMergedWithBase(GetStyleSheet())); wxFont font(m_previewCtrl->GetFont()); @@ -478,6 +482,9 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); void wxRichTextStyleOrganiserDialog::ClearPreview() { m_previewCtrl->Clear(); + wxStaticText* labelCtrl = (wxStaticText*) FindWindow(ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE); + if (labelCtrl) + labelCtrl->SetLabel(wxEmptyString); } bool wxRichTextStyleOrganiserDialog::ApplyStyle(wxRichTextCtrl* ctrl) @@ -870,4 +877,4 @@ void wxRichTextStyleOrganiserDialog::OnListSelection(wxCommandEvent& event) #endif // wxUSE_RICHTEXT - +