diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd
index 25f149fe08..878c11e2de 100644
--- a/src/richtext/richtextdialogs.pjd
+++ b/src/richtext/richtextdialogs.pjd
@@ -160,6 +160,7 @@
"Yes"
"Yes"
"Yes"
+ "sys"
"Yes"
"%EXECUTABLE%"
""
@@ -1049,6 +1050,7 @@
0
1
0
+ 0
0
0
0
@@ -1211,6 +1213,7 @@
0
1
0
+ 0
0
0
0
@@ -1373,6 +1376,7 @@
0
1
0
+ 0
0
0
0
@@ -2234,6 +2238,14 @@
"wbBoxSizerProxy"
"Vertical"
""
+ "Centre"
+ "Centre"
+ 0
+ 5
+ 1
+ 1
+ 1
+ 1
0
0
0
@@ -3722,6 +3734,7 @@
0
1
0
+ 0
0
0
0
@@ -4534,6 +4547,7 @@
0
1
0
+ 0
0
0
0
@@ -6093,6 +6107,7 @@
0
1
0
+ 0
0
0
0
@@ -6391,6 +6406,7 @@
1
0
0
+ 0
0
0
0
@@ -6625,6 +6641,7 @@
1
0
0
+ 0
0
0
0
@@ -6790,6 +6807,7 @@
1
0
0
+ 0
0
0
0
@@ -7167,7 +7185,6 @@
300
0
""
- 0
"wxBoxSizer V"
"dialog-control-document"
@@ -7181,14 +7198,6 @@
"wbBoxSizerProxy"
"Vertical"
""
- "Centre"
- "Centre"
- 0
- 5
- 1
- 1
- 1
- 1
0
0
0
@@ -7231,7 +7240,7 @@
"wbBoxSizerProxy"
"Horizontal"
""
- "Centre"
+ "Expand"
"Centre"
0
5
@@ -7258,7 +7267,7 @@
""
"Centre"
"Expand"
- 0
+ 1
5
0
0
@@ -7421,7 +7430,6 @@
0
""
""
- 0
"wxStaticText: wxID_STATIC"
@@ -7536,13 +7544,14 @@
1
0
0
+ 0
0
0
0
""
-1
-1
- -1
+ 300
-1
"Expand"
"Centre"
@@ -7672,13 +7681,14 @@
1
0
0
+ 0
0
0
0
""
-1
-1
- -1
+ 300
-1
"Expand"
"Centre"
@@ -8023,6 +8033,7 @@
0
1
0
+ 0
0
0
0
@@ -8185,6 +8196,7 @@
0
1
0
+ 0
0
0
0
@@ -8697,6 +8709,7 @@
0
1
0
+ 0
0
0
0
@@ -11660,6 +11673,7 @@
0
1
0
+ 0
0
0
0
@@ -11958,6 +11972,7 @@
1
0
0
+ 0
0
0
0
@@ -12192,6 +12207,7 @@
1
0
0
+ 0
0
0
0
@@ -12357,6 +12373,7 @@
1
0
0
+ 0
0
0
0
@@ -14621,6 +14638,7 @@
0
1
0
+ 0
0
0
0
@@ -14746,6 +14764,16 @@
0
1
+
+ "Resources"
+ "html-document"
+ ""
+ "bitmapsfolder"
+ 1
+ 1
+ 0
+ 1
+
diff --git a/src/richtext/richtextstylepage.cpp b/src/richtext/richtextstylepage.cpp
index 92e54f8489..b678870b10 100644
--- a/src/richtext/richtextstylepage.cpp
+++ b/src/richtext/richtextstylepage.cpp
@@ -86,6 +86,8 @@ bool wxRichTextStylePage::Create( wxWindow* parent, wxWindowID id, const wxPoint
void wxRichTextStylePage::CreateControls()
{
////@begin wxRichTextStylePage content construction
+ // Generated by DialogBlocks, 25/10/2010 10:21:49 (unregistered)
+
wxRichTextStylePage* itemPanel1 = this;
wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
@@ -95,37 +97,37 @@ void wxRichTextStylePage::CreateControls()
itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL);
- itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL, 5);
+ itemBoxSizer3->Add(itemBoxSizer4, 0, wxGROW, 5);
wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);
- itemBoxSizer4->Add(itemBoxSizer5, 0, wxGROW, 5);
+ itemBoxSizer4->Add(itemBoxSizer5, 1, wxGROW, 5);
wxStaticText* itemStaticText6 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Style:"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
m_styleName = new wxTextCtrl( itemPanel1, ID_RICHTEXTSTYLEPAGE_STYLE_NAME, wxEmptyString, wxDefaultPosition, wxSize(300, -1), wxTE_READONLY );
m_styleName->SetHelpText(_("The style name."));
- if (ShowToolTips())
+ if (wxRichTextStylePage::ShowToolTips())
m_styleName->SetToolTip(_("The style name."));
itemBoxSizer5->Add(m_styleName, 0, wxGROW|wxALL, 5);
wxStaticText* itemStaticText8 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Based on:"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer5->Add(itemStaticText8, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
- wxString* m_basedOnStrings = NULL;
- m_basedOn = new wxComboBox( itemPanel1, ID_RICHTEXTSTYLEPAGE_BASED_ON, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, m_basedOnStrings, wxCB_DROPDOWN );
+ wxArrayString m_basedOnStrings;
+ m_basedOn = new wxComboBox( itemPanel1, ID_RICHTEXTSTYLEPAGE_BASED_ON, wxEmptyString, wxDefaultPosition, wxSize(300, -1), m_basedOnStrings, wxCB_DROPDOWN );
m_basedOn->SetHelpText(_("The style on which this style is based."));
- if (ShowToolTips())
+ if (wxRichTextStylePage::ShowToolTips())
m_basedOn->SetToolTip(_("The style on which this style is based."));
itemBoxSizer5->Add(m_basedOn, 0, wxGROW|wxALL, 5);
wxStaticText* itemStaticText10 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Next style:"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer5->Add(itemStaticText10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5);
- wxString* m_nextStyleStrings = NULL;
- m_nextStyle = new wxComboBox( itemPanel1, ID_RICHTEXTSTYLEPAGE_NEXT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, m_nextStyleStrings, wxCB_DROPDOWN );
+ wxArrayString m_nextStyleStrings;
+ m_nextStyle = new wxComboBox( itemPanel1, ID_RICHTEXTSTYLEPAGE_NEXT_STYLE, wxEmptyString, wxDefaultPosition, wxSize(300, -1), m_nextStyleStrings, wxCB_DROPDOWN );
m_nextStyle->SetHelpText(_("The default style for the next paragraph."));
- if (ShowToolTips())
+ if (wxRichTextStylePage::ShowToolTips())
m_nextStyle->SetToolTip(_("The default style for the next paragraph."));
itemBoxSizer5->Add(m_nextStyle, 0, wxGROW|wxALL, 5);
@@ -166,6 +168,9 @@ bool wxRichTextStylePage::TransferDataToWindow()
wxRichTextStyleSheet* sheet = wxRichTextFormattingDialog::GetDialog(this)->GetStyleSheet();
m_styleName->SetValue(def->GetName());
+
+ m_nextStyle->Freeze();
+ m_basedOn->Freeze();
if (listDef)
{
@@ -239,6 +244,9 @@ bool wxRichTextStylePage::TransferDataToWindow()
}
}
+ m_nextStyle->Thaw();
+ m_basedOn->Thaw();
+
m_basedOn->SetValue(def->GetBaseStyle());
}