diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp index 9c14457566..1275d544f5 100644 --- a/samples/scroll/scroll.cpp +++ b/samples/scroll/scroll.cpp @@ -535,16 +535,11 @@ MyAutoScrollWindow::MyAutoScrollWindow( wxWindow *parent ) wxDefaultPosition, SMALL_BUTTON ); - // We need to do this here, because wxADJUST_MINSIZE below - // will cause the initial size to be ignored for Best/Min size. - // It would be nice to fix the sizers to handle this a little - // more cleanly. - m_button->SetSizeHints( SMALL_BUTTON.GetWidth(), SMALL_BUTTON.GetHeight() ); innersizer->Add( m_button, 0, - wxALIGN_CENTER | wxALL | wxADJUST_MINSIZE, + wxALIGN_CENTER | wxALL, 20 ); innersizer->Add( new wxStaticText( this, wxID_ANY, _T("This is just") ), diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp index b0214dd348..06a23703c6 100644 --- a/src/generic/fontdlgg.cpp +++ b/src/generic/fontdlgg.cpp @@ -276,7 +276,7 @@ void wxGenericFontDialog::CreateWidgets() wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL); itemGridSizer4->Add(itemBoxSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("&Font family:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxChoice* itemChoice7 = new wxChoice( this, wxID_FONT_FAMILY, wxDefaultPosition, wxDefaultSize, 5, families, 0 ); itemChoice7->SetHelpText(_("The font family.")); @@ -287,7 +287,7 @@ void wxGenericFontDialog::CreateWidgets() wxBoxSizer* itemBoxSizer8 = new wxBoxSizer(wxVERTICAL); itemGridSizer4->Add(itemBoxSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); wxStaticText* itemStaticText9 = new wxStaticText( this, wxID_STATIC, _("&Style:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxChoice* itemChoice10 = new wxChoice( this, wxID_FONT_STYLE, wxDefaultPosition, wxDefaultSize, 3, styles, 0 ); itemChoice10->SetHelpText(_("The font style.")); @@ -298,7 +298,7 @@ void wxGenericFontDialog::CreateWidgets() wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxVERTICAL); itemGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); wxStaticText* itemStaticText12 = new wxStaticText( this, wxID_STATIC, _("&Weight:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer11->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxChoice* itemChoice13 = new wxChoice( this, wxID_FONT_WEIGHT, wxDefaultPosition, wxDefaultSize, 3, weights, 0 ); itemChoice13->SetHelpText(_("The font weight.")); @@ -311,7 +311,7 @@ void wxGenericFontDialog::CreateWidgets() if (m_fontData.GetEnableEffects()) { wxStaticText* itemStaticText15 = new wxStaticText( this, wxID_STATIC, _("C&olour:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxSize colourSize = wxDefaultSize; if (is_pda) @@ -327,7 +327,7 @@ void wxGenericFontDialog::CreateWidgets() wxBoxSizer* itemBoxSizer17 = new wxBoxSizer(wxVERTICAL); itemGridSizer4->Add(itemBoxSizer17, 0, wxALIGN_CENTER_HORIZONTAL|wxGROW, 5); wxStaticText* itemStaticText18 = new wxStaticText( this, wxID_STATIC, _("&Point size:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); #if USE_SPINCTRL_FOR_POINT_SIZE wxSpinCtrl* spinCtrl = new wxSpinCtrl(this, wxID_FONT_SIZE, wxT("12"), wxDefaultPosition, wxSize(80, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 500, 12); @@ -360,7 +360,7 @@ void wxGenericFontDialog::CreateWidgets() itemBoxSizer3->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxStaticText* itemStaticText23 = new wxStaticText( this, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer3->Add(itemStaticText23, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer3->Add(itemStaticText23, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxFontPreviewer* itemWindow24 = new wxFontPreviewer( this ); m_previewer = itemWindow24; diff --git a/src/mac/carbon/fontdlg.cpp b/src/mac/carbon/fontdlg.cpp index 67b93fb6cb..4cde3f25bb 100644 --- a/src/mac/carbon/fontdlg.cpp +++ b/src/mac/carbon/fontdlg.cpp @@ -450,7 +450,7 @@ void wxFontDialog::CreateControls() itemBoxSizer3->Add(itemFlexGridSizer4, 1, wxGROW|wxALL, 5); wxStaticText* itemStaticText5 = new wxStaticText( itemDialog1, wxID_STATIC, _("Font:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5); wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL); itemFlexGridSizer4->Add(itemBoxSizer6, 0, wxGROW|wxGROW, 5); @@ -460,7 +460,7 @@ void wxFontDialog::CreateControls() itemBoxSizer6->Add(m_facenameCtrl, 0, wxGROW|wxALL, 5); wxStaticText* itemStaticText8 = new wxStaticText( itemDialog1, wxID_STATIC, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer4->Add(itemStaticText8, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_sizeCtrl = new wxSpinCtrl( itemDialog1, wxID_FONTDIALOG_FONTSIZE, _T("12"), wxDefaultPosition, wxSize(60, -1), wxSP_ARROW_KEYS, 1, 300, 12 ); m_sizeCtrl->SetHelpText(_("The font size in points.")); @@ -469,7 +469,7 @@ void wxFontDialog::CreateControls() itemFlexGridSizer4->Add(m_sizeCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText10 = new wxStaticText( itemDialog1, wxID_STATIC, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer4->Add(itemStaticText10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer11 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer4->Add(itemBoxSizer11, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL, 5); @@ -501,7 +501,7 @@ void wxFontDialog::CreateControls() if (m_fontData.GetEnableEffects()) { wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("Colour:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText15, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer4->Add(itemStaticText15, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5); m_colourCtrl = new wxFontColourSwatchCtrl( itemDialog1, wxID_FONTDIALOG_COLOUR, wxDefaultPosition, wxSize(-1, 30), wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); m_colourCtrl->SetHelpText(_("Click to change the font colour.")); @@ -511,7 +511,7 @@ void wxFontDialog::CreateControls() } wxStaticText* itemStaticText17 = new wxStaticText( itemDialog1, wxID_STATIC, _("Preview:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer4->Add(itemStaticText17, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer4->Add(itemStaticText17, 0, wxALIGN_RIGHT|wxALIGN_TOP|wxALL, 5); m_previewCtrl = new wxFontPreviewCtrl( itemDialog1, wxID_FONTDIALOG_PREVIEW, wxDefaultPosition, wxSize(-1, 70), wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); m_previewCtrl->SetHelpText(_("Shows a preview of the font.")); diff --git a/src/richtext/richtextbulletspage.cpp b/src/richtext/richtextbulletspage.cpp index 17057047b2..a74225c9ac 100644 --- a/src/richtext/richtextbulletspage.cpp +++ b/src/richtext/richtextbulletspage.cpp @@ -153,7 +153,7 @@ void wxRichTextBulletsPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer5, 0, wxGROW, 5); wxStaticText* itemStaticText6 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Bullet style:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_styleListBoxStrings = NULL; m_styleListBox = new wxListBox( itemPanel1, ID_RICHTEXTBULLETSPAGE_STYLELISTBOX, wxDefaultPosition, wxSize(-1, 140), 0, m_styleListBoxStrings, wxLB_SINGLE ); @@ -189,7 +189,7 @@ void wxRichTextBulletsPage::CreateControls() itemBoxSizer5->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5); wxStaticText* itemStaticText13 = new wxStaticText( itemPanel1, wxID_STATIC, _("Bullet &Alignment:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText13, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText13, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString m_bulletAlignmentCtrlStrings[] = { _("Left"), @@ -214,7 +214,7 @@ void wxRichTextBulletsPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer18, 0, wxGROW, 5); wxStaticText* itemStaticText19 = new wxStaticText( itemPanel1, ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC, _("&Symbol:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer18->Add(itemStaticText19, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer18->Add(itemStaticText19, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer18->Add(itemBoxSizer20, 0, wxGROW, 5); @@ -235,7 +235,7 @@ void wxRichTextBulletsPage::CreateControls() itemBoxSizer18->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5); wxStaticText* itemStaticText24 = new wxStaticText( itemPanel1, ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC, _("Symbol &font:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer18->Add(itemStaticText24, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer18->Add(itemStaticText24, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_symbolFontCtrlStrings = NULL; m_symbolFontCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_symbolFontCtrlStrings, wxCB_DROPDOWN ); @@ -247,7 +247,7 @@ void wxRichTextBulletsPage::CreateControls() itemBoxSizer18->Add(5, 5, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxStaticText* itemStaticText27 = new wxStaticText( itemPanel1, ID_RICHTEXTBULLETSPAGE_NAMESTATIC, _("S&tandard bullet name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer18->Add(itemStaticText27, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer18->Add(itemStaticText27, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_bulletNameCtrlStrings = NULL; m_bulletNameCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTBULLETSPAGE_NAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_bulletNameCtrlStrings, wxCB_DROPDOWN ); @@ -259,7 +259,7 @@ void wxRichTextBulletsPage::CreateControls() itemBoxSizer18->Add(5, 5, 1, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxStaticText* itemStaticText30 = new wxStaticText( itemPanel1, ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC, _("&Number:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer18->Add(itemStaticText30, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer18->Add(itemStaticText30, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_numberCtrl = new wxSpinCtrl( itemPanel1, ID_RICHTEXTBULLETSPAGE_NUMBERCTRL, _T("0"), wxDefaultPosition, wxSize(50, -1), wxSP_ARROW_KEYS, 0, 100000, 0 ); m_numberCtrl->SetHelpText(_("The list item number.")); @@ -287,13 +287,13 @@ void wxRichTextBulletsPage::CreateControls() m_styleListBox->Append(_("Symbol")); m_styleListBox->Append(_("Bitmap")); m_styleListBox->Append(_("Standard")); - + m_symbolCtrl->Append(_("*")); m_symbolCtrl->Append(_("-")); m_symbolCtrl->Append(_(">")); m_symbolCtrl->Append(_("+")); m_symbolCtrl->Append(_("~")); - + wxArrayString standardBulletNames; if (wxRichTextBuffer::GetRenderer()) wxRichTextBuffer::GetRenderer()->EnumerateStandardBulletNames(standardBulletNames); @@ -354,12 +354,12 @@ bool wxRichTextBulletsPage::TransferDataFromWindow() bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_RIGHT_PARENTHESIS; if (m_periodCtrl->GetValue()) bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_PERIOD; - + if (m_bulletAlignmentCtrl->GetSelection() == 1) bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE; else if (m_bulletAlignmentCtrl->GetSelection() == 2) bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT; - // Left is implied + // Left is implied attr->SetBulletStyle(bulletStyle); } @@ -374,7 +374,7 @@ bool wxRichTextBulletsPage::TransferDataFromWindow() attr->SetBulletText(m_symbolCtrl->GetValue()); attr->SetBulletFont(m_symbolFontCtrl->GetValue()); } - + return true; } @@ -515,7 +515,7 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); m_previewCtrl->BeginStyle(normalParaAttr); m_previewCtrl->WriteText(s_para3); m_previewCtrl->EndStyle(); - + m_previewCtrl->NumberList(wxRichTextRange(0, m_previewCtrl->GetLastPosition()+1)); m_previewCtrl->Thaw(); diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd index 69360c4127..3903f17406 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -282,7 +282,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -307,7 +306,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -332,7 +330,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -357,7 +354,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -414,7 +410,6 @@ 1 0 0 - 1 0 "" "" @@ -485,7 +480,6 @@ 1 0 0 - 0 0 "" "" @@ -545,7 +539,6 @@ 1 1 0 - 0 1 "" "" @@ -574,7 +567,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -631,7 +623,6 @@ 1 0 0 - 1 0 "" "" @@ -702,7 +693,6 @@ 1 0 0 - 0 0 "" "" @@ -765,7 +755,6 @@ 1 1 0 - 0 1 "" "" @@ -794,7 +783,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -819,7 +807,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -876,7 +863,6 @@ 1 0 0 - 1 0 "" "" @@ -930,7 +916,6 @@ 1 1 0 - 0 0 "" "" @@ -958,7 +943,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -1015,7 +999,6 @@ 1 0 0 - 1 0 "" "" @@ -1069,7 +1052,6 @@ 1 1 0 - 0 0 "" "" @@ -1097,7 +1079,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -1154,7 +1135,6 @@ 1 0 0 - 1 0 "" "" @@ -1208,7 +1188,6 @@ 1 1 0 - 0 0 "" "" @@ -1236,7 +1215,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -1293,7 +1271,6 @@ 1 0 0 - 1 0 "" "" @@ -1353,7 +1330,6 @@ 1 1 0 - 0 0 "" "" @@ -1383,7 +1359,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -1435,7 +1410,6 @@ 1 1 0 - 0 0 "" "" @@ -1489,7 +1463,6 @@ 1 1 0 - 0 0 "" "" @@ -1517,7 +1490,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -1576,7 +1548,6 @@ 1 1 0 - 0 0 "" "" @@ -1667,7 +1638,6 @@ "Vertical" "" 0 - 0 0 "<Any platform>" @@ -1692,7 +1662,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -1717,7 +1686,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -1742,7 +1710,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -1799,7 +1766,6 @@ 1 0 0 - 1 0 "" "" @@ -1826,7 +1792,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -1851,7 +1816,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -1877,7 +1841,6 @@ 1 0 0 - 0 0 "<Any platform>" @@ -1927,7 +1890,6 @@ 1 1 0 - 0 0 "" "" @@ -1979,7 +1941,6 @@ 1 1 0 - 0 0 "" "" @@ -2031,7 +1992,6 @@ 1 1 0 - 0 0 "" "" @@ -2083,7 +2043,6 @@ 1 1 0 - 0 0 "" "" @@ -2135,7 +2094,6 @@ 1 1 0 - 0 0 "" "" @@ -2165,7 +2123,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -2215,7 +2172,6 @@ 0 1 0 - 0 0 @@ -2240,7 +2196,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -2266,7 +2221,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -2323,7 +2277,6 @@ 1 0 0 - 1 0 "" "" @@ -2350,7 +2303,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -2375,7 +2327,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -2407,7 +2358,6 @@ 0 0 0 - 0 0 "wxStaticText: wxID_STATIC" @@ -2463,7 +2413,6 @@ 1 1 0 - 1 0 "" "" @@ -2490,7 +2439,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -2559,7 +2507,6 @@ 1 1 0 - 0 0 "" "" @@ -2619,7 +2566,6 @@ 1 1 0 - 1 0 "" "" @@ -2646,7 +2592,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -2715,7 +2660,6 @@ 1 1 0 - 0 0 "" "" @@ -2775,7 +2719,6 @@ 1 1 0 - 1 0 "" "" @@ -2802,7 +2745,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -2871,7 +2813,6 @@ 1 1 0 - 0 0 "" "" @@ -2931,7 +2872,6 @@ 1 1 0 - 1 0 "" "" @@ -2985,7 +2925,6 @@ 1 1 0 - 0 0 "" "" @@ -3015,7 +2954,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -3065,7 +3003,6 @@ 1 1 0 - 0 0 @@ -3090,7 +3027,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -3116,7 +3052,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -3173,7 +3108,6 @@ 1 0 0 - 1 0 "" "" @@ -3200,7 +3134,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -3225,7 +3158,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -3257,7 +3189,6 @@ 0 0 0 - 0 0 "wxStaticText: wxID_STATIC" @@ -3313,7 +3244,6 @@ 1 1 0 - 1 0 "" "" @@ -3340,7 +3270,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -3409,7 +3338,6 @@ 1 1 0 - 0 0 "" "" @@ -3469,7 +3397,6 @@ 1 1 0 - 1 0 "" "" @@ -3496,7 +3423,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -3565,7 +3491,6 @@ 1 1 0 - 0 0 "" "" @@ -3625,7 +3550,6 @@ 1 1 0 - 1 0 "" "" @@ -3652,7 +3576,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -3704,7 +3627,6 @@ 1 1 0 - 0 0 "" "" @@ -3736,7 +3658,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -3795,7 +3716,6 @@ 1 1 0 - 0 0 "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" @@ -3894,7 +3814,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -3919,7 +3838,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -3944,7 +3862,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -3969,7 +3886,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -4026,7 +3942,6 @@ 1 0 0 - 1 0 "" "" @@ -4096,7 +4011,6 @@ 1 1 0 - 0 0 "" "" @@ -4159,7 +4073,6 @@ 0 1 0 - 0 0 "" "" @@ -4187,7 +4100,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -4213,7 +4125,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -4270,7 +4181,6 @@ 0 1 0 - 1 0 "" "" @@ -4325,7 +4235,6 @@ 1 1 0 - 0 0 "" "" @@ -4380,7 +4289,6 @@ 0 1 0 - 0 0 "" "" @@ -4435,7 +4343,6 @@ 0 1 0 - 0 0 "" "" @@ -4535,7 +4442,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -4560,7 +4466,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -4585,7 +4490,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -4610,7 +4514,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -4667,7 +4570,6 @@ 1 0 0 - 1 0 "" "" @@ -4730,7 +4632,6 @@ 1 1 0 - 0 0 "" "" @@ -4757,7 +4658,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -4810,7 +4710,6 @@ 1 1 0 - 0 0 "" "" @@ -4865,7 +4764,6 @@ 1 1 0 - 0 0 "" "" @@ -4920,7 +4818,6 @@ 1 1 0 - 0 0 "" "" @@ -4948,7 +4845,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -5006,7 +4902,6 @@ 1 0 0 - 1 0 "" "" @@ -5060,7 +4955,6 @@ 1 1 0 - 0 1 "" "" @@ -5088,7 +4982,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -5138,7 +5031,6 @@ 0 0 0 - 0 0 @@ -5163,7 +5055,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -5189,7 +5080,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -5247,7 +5137,6 @@ 1 0 0 - 1 0 "" "" @@ -5274,7 +5163,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -5328,7 +5216,6 @@ 1 1 0 - 0 1 "" "" @@ -5383,7 +5270,6 @@ 1 1 0 - 0 0 "" "" @@ -5411,7 +5297,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -5470,7 +5355,6 @@ 1 0 0 - 1 0 "" "" @@ -5526,7 +5410,6 @@ 1 1 0 - 0 0 "" "" @@ -5553,7 +5436,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -5612,7 +5494,6 @@ 1 0 0 - 1 0 "" "" @@ -5668,7 +5549,6 @@ 1 1 0 - 0 0 "" "" @@ -5695,7 +5575,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -5754,7 +5633,6 @@ 1 0 0 - 1 0 "" "" @@ -5817,7 +5695,6 @@ 1 1 0 - 0 0 "" "" @@ -5846,7 +5723,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -5905,7 +5781,6 @@ 1 1 0 - 0 0 "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" @@ -6004,7 +5879,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -6029,7 +5903,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -6054,7 +5927,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -6079,7 +5951,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -6136,7 +6007,6 @@ 1 0 0 - 1 0 "" "" @@ -6206,7 +6076,6 @@ 1 1 0 - 0 0 "" "" @@ -6265,7 +6134,6 @@ 1 0 0 - 1 0 "" "" @@ -6318,7 +6186,6 @@ 1 1 0 - 0 0 "" "" @@ -6377,7 +6244,6 @@ 1 0 0 - 1 0 "" "" @@ -6431,7 +6297,6 @@ 1 1 0 - 0 0 "" "" @@ -6460,7 +6325,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -6561,7 +6425,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -6586,7 +6449,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -6611,7 +6473,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -6636,7 +6497,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -6693,7 +6553,6 @@ 1 1 0 - 1 0 "" "" @@ -6747,7 +6606,6 @@ 1 1 0 - 0 0 "" "" @@ -6774,7 +6632,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -6832,7 +6689,6 @@ 1 1 0 - 1 0 "" "" @@ -6886,7 +6742,6 @@ 1 1 0 - 0 0 "" "" @@ -6948,7 +6803,6 @@ 1 1 0 - 0 0 "" "" @@ -6976,7 +6830,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -7033,7 +6886,6 @@ 1 1 0 - 1 0 "" "" @@ -7060,7 +6912,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -7118,7 +6969,6 @@ 1 1 0 - 1 0 "" "" @@ -7188,7 +7038,6 @@ 1 1 0 - 0 0 "" "" @@ -7215,7 +7064,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -7273,7 +7121,6 @@ 1 1 0 - 1 0 "" "" @@ -7327,7 +7174,6 @@ 1 1 0 - 0 0 "" "" @@ -7355,7 +7201,6 @@ 0 0 0 - 0 0 "__WXMSW__,__WXGTK__,__WXOS2__,__WXMGL__,__WXMOTIF__,__WXCOCOA__,__WXX11__,__WXPALMOS__" @@ -7380,7 +7225,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -7433,7 +7277,6 @@ 1 1 0 - 0 0 "" "" @@ -7486,7 +7329,6 @@ 1 1 0 - 0 0 "" "" @@ -7514,7 +7356,6 @@ 0 0 0 - 0 0 "__WXMAC__" @@ -7539,7 +7380,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -7591,7 +7431,6 @@ 1 1 0 - 0 0 "" "" @@ -7645,7 +7484,6 @@ 1 1 0 - 0 0 "" "" @@ -7743,7 +7581,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -7768,7 +7605,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -7793,7 +7629,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -7818,7 +7653,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -7875,7 +7709,6 @@ 1 0 0 - 1 0 "" "" @@ -7935,7 +7768,6 @@ 1 1 0 - 0 0 "" "" @@ -7964,7 +7796,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -8021,7 +7852,6 @@ 1 0 0 - 1 0 "" "" @@ -8081,7 +7911,6 @@ 1 1 0 - 0 0 "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" @@ -8110,7 +7939,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -8167,7 +7995,6 @@ 1 0 0 - 1 0 "" "" @@ -8222,7 +8049,6 @@ 1 1 0 - 0 0 "" "" @@ -8277,7 +8103,6 @@ 0 1 0 - 0 0 "" "" @@ -8332,7 +8157,6 @@ 0 1 0 - 0 0 "" "" @@ -8359,7 +8183,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -8413,7 +8236,6 @@ 1 1 0 - 0 0 "" "" @@ -8468,7 +8290,6 @@ 0 1 0 - 0 0 "" "" @@ -8523,7 +8344,6 @@ 0 1 0 - 0 0 "" "" @@ -8578,7 +8398,6 @@ 0 1 0 - 0 0 "" "" @@ -8605,7 +8424,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -8657,7 +8475,6 @@ 1 1 0 - 0 0 "" "" @@ -8686,7 +8503,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -8737,7 +8553,6 @@ 1 1 0 - 0 0 "" "" @@ -8764,7 +8579,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -8816,7 +8630,6 @@ 1 1 0 - 0 0 "" "" @@ -8869,7 +8682,6 @@ 1 1 0 - 0 0 "" "" @@ -8968,7 +8780,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -8993,7 +8804,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -9018,7 +8828,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -9075,7 +8884,6 @@ 1 1 0 - 1 0 "" "" @@ -9138,7 +8946,6 @@ 1 1 0 - 0 0 "" "" @@ -9165,7 +8972,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -9218,7 +9024,6 @@ 1 1 0 - 0 0 "" "" @@ -9284,7 +9089,6 @@ 1 1 0 - 0 0 "" "" @@ -9346,7 +9150,6 @@ 1 1 0 - 0 0 "" "" @@ -9375,7 +9178,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -9400,7 +9202,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -9425,7 +9226,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -9482,7 +9282,6 @@ 1 0 0 - 1 0 "" "" @@ -9545,7 +9344,6 @@ 1 1 0 - 0 0 "" "" @@ -9572,7 +9370,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -9625,7 +9422,6 @@ 1 1 0 - 0 0 "" "" @@ -9680,7 +9476,6 @@ 1 1 0 - 0 0 "" "" @@ -9735,7 +9530,6 @@ 1 1 0 - 0 0 "" "" @@ -9763,7 +9557,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -9821,7 +9614,6 @@ 1 0 0 - 1 0 "" "" @@ -9875,7 +9667,6 @@ 1 1 0 - 0 1 "" "" @@ -9903,7 +9694,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -9953,7 +9743,6 @@ 1 1 0 - 0 0 @@ -9978,7 +9767,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -10004,7 +9792,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -10062,7 +9849,6 @@ 1 0 0 - 1 0 "" "" @@ -10089,7 +9875,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -10143,7 +9928,6 @@ 1 1 0 - 0 1 "" "" @@ -10198,7 +9982,6 @@ 1 1 0 - 0 0 "" "" @@ -10226,7 +10009,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -10285,7 +10067,6 @@ 1 0 0 - 1 0 "" "" @@ -10341,7 +10122,6 @@ 1 1 0 - 0 0 "" "" @@ -10368,7 +10148,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -10427,7 +10206,6 @@ 1 0 0 - 1 0 "" "" @@ -10483,7 +10261,6 @@ 1 1 0 - 0 0 "" "" @@ -10550,7 +10327,6 @@ 1 1 0 - 0 0 "" "" @@ -10579,7 +10355,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -10604,7 +10379,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -10629,7 +10403,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -10686,7 +10459,6 @@ 1 0 0 - 1 0 "" "" @@ -10713,7 +10485,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -10738,7 +10509,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -10764,7 +10534,6 @@ 1 0 0 - 0 0 "<Any platform>" @@ -10814,7 +10583,6 @@ 1 1 0 - 0 0 "" "" @@ -10866,7 +10634,6 @@ 1 1 0 - 0 0 "" "" @@ -10918,7 +10685,6 @@ 1 1 0 - 0 0 "" "" @@ -10970,7 +10736,6 @@ 1 1 0 - 0 0 "" "" @@ -11022,7 +10787,6 @@ 1 1 0 - 0 0 "" "" @@ -11052,7 +10816,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -11102,7 +10865,6 @@ 0 1 0 - 0 0 @@ -11127,7 +10889,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -11153,7 +10914,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -11210,7 +10970,6 @@ 1 0 0 - 1 0 "" "" @@ -11237,7 +10996,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -11262,7 +11020,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -11294,7 +11051,6 @@ 0 0 0 - 0 0 "wxStaticText: wxID_STATIC" @@ -11350,7 +11106,6 @@ 1 1 0 - 1 0 "" "" @@ -11377,7 +11132,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -11446,7 +11200,6 @@ 1 1 0 - 0 0 "" "" @@ -11506,7 +11259,6 @@ 1 1 0 - 1 0 "" "" @@ -11533,7 +11285,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -11602,7 +11353,6 @@ 1 1 0 - 0 0 "" "" @@ -11662,7 +11412,6 @@ 1 1 0 - 1 0 "" "" @@ -11689,7 +11438,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -11758,7 +11506,6 @@ 1 1 0 - 0 0 "" "" @@ -11789,7 +11536,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -11839,7 +11585,6 @@ 1 1 0 - 0 0 @@ -11864,7 +11609,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -11890,7 +11634,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -11947,7 +11690,6 @@ 1 0 0 - 1 0 "" "" @@ -11974,7 +11716,6 @@ 1 1 0 - 0 0 "<Any platform>" @@ -11999,7 +11740,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -12031,7 +11771,6 @@ 0 0 0 - 0 0 "wxStaticText: wxID_STATIC" @@ -12087,7 +11826,6 @@ 1 1 0 - 1 0 "" "" @@ -12114,7 +11852,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -12183,7 +11920,6 @@ 1 1 0 - 0 0 "" "" @@ -12243,7 +11979,6 @@ 1 1 0 - 1 0 "" "" @@ -12270,7 +12005,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -12339,7 +12073,6 @@ 1 1 0 - 0 0 "" "" @@ -12399,7 +12132,6 @@ 1 1 0 - 1 0 "" "" @@ -12426,7 +12158,6 @@ 0 0 0 - 0 0 "<Any platform>" @@ -12478,7 +12209,6 @@ 1 1 0 - 0 0 "" "" @@ -12546,7 +12276,6 @@ 1 1 0 - 0 0 "" "%PARENT%, %ID%, wxEmptyString, %POSITION%, %SIZE%, %STYLE%" diff --git a/src/richtext/richtextfontpage.cpp b/src/richtext/richtextfontpage.cpp index 642bbfd92e..d2b5c8b067 100644 --- a/src/richtext/richtextfontpage.cpp +++ b/src/richtext/richtextfontpage.cpp @@ -126,7 +126,7 @@ void wxRichTextFontPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer5, 1, wxGROW, 5); wxStaticText* itemStaticText6 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Font:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_faceTextCtrl = new wxTextCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_FACETEXTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0 ); m_faceTextCtrl->SetHelpText(_("Type a font name.")); @@ -144,7 +144,7 @@ void wxRichTextFontPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer9, 0, wxGROW, 5); wxStaticText* itemStaticText10 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Size:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer9->Add(itemStaticText10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer9->Add(itemStaticText10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_sizeTextCtrl = new wxTextCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_SIZETEXTCTRL, _T(""), wxDefaultPosition, wxSize(50, -1), 0 ); m_sizeTextCtrl->SetHelpText(_("Type a size in points.")); @@ -166,7 +166,7 @@ void wxRichTextFontPage::CreateControls() itemBoxSizer13->Add(itemBoxSizer14, 1, wxGROW, 5); wxStaticText* itemStaticText15 = new wxStaticText( itemPanel1, wxID_STATIC, _("Font st&yle:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer14->Add(itemStaticText15, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_styleCtrlStrings = NULL; m_styleCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_STYLECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_styleCtrlStrings, wxCB_READONLY ); @@ -179,7 +179,7 @@ void wxRichTextFontPage::CreateControls() itemBoxSizer13->Add(itemBoxSizer17, 1, wxGROW, 5); wxStaticText* itemStaticText18 = new wxStaticText( itemPanel1, wxID_STATIC, _("Font &weight:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer17->Add(itemStaticText18, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_weightCtrlStrings = NULL; m_weightCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_WEIGHTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_weightCtrlStrings, wxCB_READONLY ); @@ -192,7 +192,7 @@ void wxRichTextFontPage::CreateControls() itemBoxSizer13->Add(itemBoxSizer20, 1, wxGROW, 5); wxStaticText* itemStaticText21 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Underlining:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer20->Add(itemStaticText21, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer20->Add(itemStaticText21, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_underliningCtrlStrings = NULL; m_underliningCtrl = new wxComboBox( itemPanel1, ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_underliningCtrlStrings, wxCB_READONLY ); @@ -205,7 +205,7 @@ void wxRichTextFontPage::CreateControls() itemBoxSizer13->Add(itemBoxSizer23, 0, wxGROW, 5); wxStaticText* itemStaticText24 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Colour:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer23->Add(itemStaticText24, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer23->Add(itemStaticText24, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_colourCtrl = new wxRichTextColourSwatchCtrl( itemPanel1, ID_RICHTEXTFONTPAGE_COLOURCTRL, wxDefaultPosition, wxSize(40, 20), wxSIMPLE_BORDER ); m_colourCtrl->SetHelpText(_("Click to change the text colour.")); diff --git a/src/richtext/richtextindentspage.cpp b/src/richtext/richtextindentspage.cpp index db9a294b41..5edb752512 100644 --- a/src/richtext/richtextindentspage.cpp +++ b/src/richtext/richtextindentspage.cpp @@ -136,7 +136,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer5, 0, wxGROW, 5); wxStaticText* itemStaticText6 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Alignment"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer5->Add(itemBoxSizer7, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); @@ -192,7 +192,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer18, 0, wxGROW, 5); wxStaticText* itemStaticText19 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Indentation (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer18->Add(itemStaticText19, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer18->Add(itemStaticText19, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer20 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer18->Add(itemBoxSizer20, 0, wxALIGN_LEFT|wxALL, 5); @@ -203,7 +203,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer20->Add(itemFlexGridSizer22, 0, wxALIGN_CENTER_VERTICAL, 5); wxStaticText* itemStaticText23 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText23, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer22->Add(itemStaticText23, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer24 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer22->Add(itemBoxSizer24, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); @@ -215,7 +215,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer24->Add(m_indentLeft, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText26 = new wxStaticText( itemPanel1, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText26, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer22->Add(itemStaticText26, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer27 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer22->Add(itemBoxSizer27, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); @@ -227,7 +227,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer27->Add(m_indentLeftFirst, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText29 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText29, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer22->Add(itemStaticText29, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer30 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer22->Add(itemBoxSizer30, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); @@ -239,7 +239,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer30->Add(m_indentRight, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText32 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Outline level:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer22->Add(itemStaticText32, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer22->Add(itemStaticText32, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString m_outlineLevelCtrlStrings[] = { _("Normal"), @@ -271,7 +271,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer37, 0, wxGROW, 5); wxStaticText* itemStaticText38 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer37->Add(itemStaticText38, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer37->Add(itemStaticText38, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer39 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer37->Add(itemBoxSizer39, 0, wxALIGN_LEFT|wxALL, 5); @@ -283,7 +283,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer39->Add(itemFlexGridSizer41, 0, wxALIGN_CENTER_VERTICAL, 5); wxStaticText* itemStaticText42 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer41->Add(itemStaticText42, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer41->Add(itemStaticText42, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer43 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer41->Add(itemBoxSizer43, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); @@ -295,7 +295,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer43->Add(m_spacingBefore, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText45 = new wxStaticText( itemPanel1, wxID_STATIC, _("&After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer41->Add(itemStaticText45, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer41->Add(itemStaticText45, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer46 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer41->Add(itemBoxSizer46, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5); @@ -306,7 +306,7 @@ void wxRichTextIndentsSpacingPage::CreateControls() itemBoxSizer46->Add(m_spacingAfter, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText48 = new wxStaticText( itemPanel1, wxID_STATIC, _("L&ine spacing:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer41->Add(itemStaticText48, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer41->Add(itemStaticText48, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer49 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer41->Add(itemBoxSizer49, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5); diff --git a/src/richtext/richtextliststylepage.cpp b/src/richtext/richtextliststylepage.cpp index bc08d77e07..28f8691877 100644 --- a/src/richtext/richtextliststylepage.cpp +++ b/src/richtext/richtextliststylepage.cpp @@ -180,7 +180,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer3->Add(itemBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL, 5); wxStaticText* itemStaticText5 = new wxStaticText( itemPanel1, wxID_STATIC, _("&List level:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer4->Add(itemStaticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_levelCtrl = new wxSpinCtrl( itemPanel1, ID_RICHTEXTLISTSTYLEPAGE_LEVEL, _T("1"), wxDefaultPosition, wxSize(60, -1), wxSP_ARROW_KEYS, 1, 10, 1 ); m_levelCtrl->SetHelpText(_("Selects the list level to edit.")); @@ -207,7 +207,7 @@ void wxRichTextListStylePage::CreateControls() wxBoxSizer* itemBoxSizer13 = new wxBoxSizer(wxVERTICAL); itemBoxSizer12->Add(itemBoxSizer13, 0, wxGROW, 5); wxStaticText* itemStaticText14 = new wxStaticText( itemPanel10, wxID_STATIC, _("&Bullet style:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer13->Add(itemStaticText14, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer13->Add(itemStaticText14, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_styleListBoxStrings = NULL; m_styleListBox = new wxListBox( itemPanel10, ID_RICHTEXTLISTSTYLEPAGE_STYLELISTBOX, wxDefaultPosition, wxSize(-1, 140), 0, m_styleListBoxStrings, wxLB_SINGLE ); @@ -242,7 +242,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer13->Add(2, 1, 0, wxALIGN_CENTER_HORIZONTAL, 5); wxStaticText* itemStaticText21 = new wxStaticText( itemPanel10, wxID_STATIC, _("Bullet &Alignment:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer13->Add(itemStaticText21, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer13->Add(itemStaticText21, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString m_bulletAlignmentCtrlStrings[] = { _("Left"), @@ -266,7 +266,7 @@ void wxRichTextListStylePage::CreateControls() wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxVERTICAL); itemBoxSizer12->Add(itemBoxSizer26, 0, wxGROW, 5); wxStaticText* itemStaticText27 = new wxStaticText( itemPanel10, ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC, _("&Symbol:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer26->Add(itemStaticText27, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer26->Add(itemStaticText27, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer28 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer26->Add(itemBoxSizer28, 0, wxGROW, 5); @@ -286,7 +286,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer26->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5); wxStaticText* itemStaticText32 = new wxStaticText( itemPanel10, ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC, _("Symbol &font:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer26->Add(itemStaticText32, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer26->Add(itemStaticText32, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_symbolFontCtrlStrings = NULL; m_symbolFontCtrl = new wxComboBox( itemPanel10, ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_symbolFontCtrlStrings, wxCB_DROPDOWN ); @@ -297,7 +297,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer26->Add(5, 5, 1, wxALIGN_CENTER_HORIZONTAL, 5); wxStaticText* itemStaticText35 = new wxStaticText( itemPanel10, ID_RICHTEXTLISTSTYLEPAGE_NAMESTATIC, _("S&tandard bullet name:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer26->Add(itemStaticText35, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer26->Add(itemStaticText35, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_bulletNameCtrlStrings = NULL; m_bulletNameCtrl = new wxComboBox( itemPanel10, ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL, _T(""), wxDefaultPosition, wxDefaultSize, 0, m_bulletNameCtrlStrings, wxCB_DROPDOWN ); @@ -317,7 +317,7 @@ void wxRichTextListStylePage::CreateControls() wxBoxSizer* itemBoxSizer40 = new wxBoxSizer(wxVERTICAL); itemBoxSizer39->Add(itemBoxSizer40, 0, wxGROW, 5); wxStaticText* itemStaticText41 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Alignment"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer40->Add(itemStaticText41, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer40->Add(itemStaticText41, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer42 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer40->Add(itemBoxSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); @@ -370,7 +370,7 @@ void wxRichTextListStylePage::CreateControls() wxBoxSizer* itemBoxSizer53 = new wxBoxSizer(wxVERTICAL); itemBoxSizer39->Add(itemBoxSizer53, 0, wxGROW, 5); wxStaticText* itemStaticText54 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Indentation (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer53->Add(itemStaticText54, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer53->Add(itemStaticText54, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer55 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer53->Add(itemBoxSizer55, 0, wxALIGN_LEFT|wxALL, 5); @@ -379,7 +379,7 @@ void wxRichTextListStylePage::CreateControls() wxFlexGridSizer* itemFlexGridSizer57 = new wxFlexGridSizer(2, 2, 0, 0); itemBoxSizer55->Add(itemFlexGridSizer57, 0, wxALIGN_CENTER_VERTICAL, 5); wxStaticText* itemStaticText58 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Left:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer57->Add(itemStaticText58, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer57->Add(itemStaticText58, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer59 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer57->Add(itemBoxSizer59, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -390,7 +390,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer59->Add(m_indentLeft, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText61 = new wxStaticText( itemPanel37, wxID_STATIC, _("Left (&first line):"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer57->Add(itemStaticText61, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer57->Add(itemStaticText61, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer62 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer57->Add(itemBoxSizer62, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -401,7 +401,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer62->Add(m_indentLeftFirst, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText64 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Right:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer57->Add(itemStaticText64, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer57->Add(itemStaticText64, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer65 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer57->Add(itemBoxSizer65, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -421,7 +421,7 @@ void wxRichTextListStylePage::CreateControls() wxBoxSizer* itemBoxSizer70 = new wxBoxSizer(wxVERTICAL); itemBoxSizer39->Add(itemBoxSizer70, 0, wxGROW, 5); wxStaticText* itemStaticText71 = new wxStaticText( itemPanel37, wxID_STATIC, _("&Spacing (tenths of a mm)"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer70->Add(itemStaticText71, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer70->Add(itemStaticText71, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxBoxSizer* itemBoxSizer72 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer70->Add(itemBoxSizer72, 0, wxALIGN_LEFT|wxALL, 5); @@ -430,7 +430,7 @@ void wxRichTextListStylePage::CreateControls() wxFlexGridSizer* itemFlexGridSizer74 = new wxFlexGridSizer(2, 2, 0, 0); itemBoxSizer72->Add(itemFlexGridSizer74, 0, wxALIGN_CENTER_VERTICAL, 5); wxStaticText* itemStaticText75 = new wxStaticText( itemPanel37, wxID_STATIC, _("Before a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer74->Add(itemStaticText75, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer74->Add(itemStaticText75, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer76 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer74->Add(itemBoxSizer76, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -441,7 +441,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer76->Add(m_spacingBefore, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText78 = new wxStaticText( itemPanel37, wxID_STATIC, _("After a paragraph:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer74->Add(itemStaticText78, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer74->Add(itemStaticText78, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer79 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer74->Add(itemBoxSizer79, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -452,7 +452,7 @@ void wxRichTextListStylePage::CreateControls() itemBoxSizer79->Add(m_spacingAfter, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText81 = new wxStaticText( itemPanel37, wxID_STATIC, _("Line spacing:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemFlexGridSizer74->Add(itemStaticText81, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexGridSizer74->Add(itemStaticText81, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxBoxSizer* itemBoxSizer82 = new wxBoxSizer(wxHORIZONTAL); itemFlexGridSizer74->Add(itemBoxSizer82, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); @@ -481,7 +481,7 @@ void wxRichTextListStylePage::CreateControls() ////@end wxRichTextListStylePage content construction m_dontUpdate = true; - + m_styleListBox->Append(_("(None)")); m_styleListBox->Append(_("Arabic")); m_styleListBox->Append(_("Upper case letters")); @@ -498,7 +498,7 @@ void wxRichTextListStylePage::CreateControls() m_symbolCtrl->Append(_(">")); m_symbolCtrl->Append(_("+")); m_symbolCtrl->Append(_("~")); - + wxArrayString standardBulletNames; if (wxRichTextBuffer::GetRenderer()) wxRichTextBuffer::GetRenderer()->EnumerateStandardBulletNames(standardBulletNames); @@ -527,7 +527,7 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n"); wxRichTextListStyleDefinition* def = wxDynamicCast(wxRichTextFormattingDialog::GetDialogStyleDefinition(this), wxRichTextListStyleDefinition); - + wxRichTextStyleSheet* styleSheet = wxRichTextFormattingDialog::GetDialog(this)->GetStyleSheet(); wxTextAttrEx attr(styleSheet ? def->GetStyle() : def->GetStyleMergedWithBase(styleSheet)); @@ -692,7 +692,7 @@ bool wxRichTextListStylePage::TransferDataFromWindow() bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_CENTRE; else if (m_bulletAlignmentCtrl->GetSelection() == 2) bulletStyle |= wxTEXT_ATTR_BULLET_STYLE_ALIGN_RIGHT; - // Left is implied + // Left is implied attr->SetBulletStyle(bulletStyle); } diff --git a/src/richtext/richtextstyledlg.cpp b/src/richtext/richtextstyledlg.cpp index bdc7637ed5..77f034d89b 100644 --- a/src/richtext/richtextstyledlg.cpp +++ b/src/richtext/richtextstyledlg.cpp @@ -188,7 +188,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_buttonSizerParent->Add(itemBoxSizer5, 1, wxGROW, 5); wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Styles:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_stylesListBox = new wxRichTextStyleListCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES, wxDefaultPosition, wxSize(200, 350), wxSIMPLE_BORDER|listCtrlStyle ); m_stylesListBox->SetHelpText(_("The available styles.")); @@ -200,7 +200,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() 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); + itemBoxSizer8->Add(itemStaticText9, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_previewCtrl = new wxRichTextCtrl( itemDialog1, ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW, wxEmptyString, wxDefaultPosition, wxSize(310, 200), wxSIMPLE_BORDER|wxTE_READONLY ); m_previewCtrl->SetHelpText(_("The style preview.")); @@ -212,7 +212,7 @@ void wxRichTextStyleOrganiserDialog::CreateControls() m_buttonSizerParent->Add(m_buttonSizer, 0, wxGROW, 5); wxStaticText* itemStaticText12 = new wxStaticText( itemDialog1, wxID_STATIC, _(" "), wxDefaultPosition, wxDefaultSize, 0 ); - m_buttonSizer->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + m_buttonSizer->Add(itemStaticText12, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); 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.")); diff --git a/src/richtext/richtextstylepage.cpp b/src/richtext/richtextstylepage.cpp index 92e54f8489..2b90f57b29 100644 --- a/src/richtext/richtextstylepage.cpp +++ b/src/richtext/richtextstylepage.cpp @@ -101,7 +101,7 @@ void wxRichTextStylePage::CreateControls() itemBoxSizer4->Add(itemBoxSizer5, 0, 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); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_styleName = new wxTextCtrl( itemPanel1, ID_RICHTEXTSTYLEPAGE_STYLE_NAME, wxEmptyString, wxDefaultPosition, wxSize(300, -1), wxTE_READONLY ); m_styleName->SetHelpText(_("The style name.")); @@ -110,7 +110,7 @@ void wxRichTextStylePage::CreateControls() 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); + itemBoxSizer5->Add(itemStaticText8, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_basedOnStrings = NULL; m_basedOn = new wxComboBox( itemPanel1, ID_RICHTEXTSTYLEPAGE_BASED_ON, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, m_basedOnStrings, wxCB_DROPDOWN ); @@ -120,7 +120,7 @@ void wxRichTextStylePage::CreateControls() 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); + itemBoxSizer5->Add(itemStaticText10, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); wxString* m_nextStyleStrings = NULL; m_nextStyle = new wxComboBox( itemPanel1, ID_RICHTEXTSTYLEPAGE_NEXT_STYLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, m_nextStyleStrings, wxCB_DROPDOWN ); diff --git a/src/richtext/richtextsymboldlg.cpp b/src/richtext/richtextsymboldlg.cpp index 252c9075a8..0f89a1dbc7 100644 --- a/src/richtext/richtextsymboldlg.cpp +++ b/src/richtext/richtextsymboldlg.cpp @@ -391,7 +391,7 @@ void wxSymbolPickerDialog::CreateControls() itemBoxSizer4->Add(itemBoxSizer5, 1, wxGROW, 5); wxStaticText* itemStaticText6 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Font:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString* m_fontCtrlStrings = NULL; m_fontCtrl = new wxComboBox( itemDialog1, ID_SYMBOLPICKERDIALOG_FONT, wxEmptyString, wxDefaultPosition, wxSize(240, -1), 0, m_fontCtrlStrings, wxCB_READONLY ); @@ -404,7 +404,7 @@ void wxSymbolPickerDialog::CreateControls() #if defined(__UNICODE__) wxStaticText* itemStaticText9 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Subset:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); #endif @@ -425,12 +425,12 @@ void wxSymbolPickerDialog::CreateControls() itemBoxSizer3->Add(itemBoxSizer12, 0, wxGROW, 5); m_symbolStaticCtrl = new wxStaticText( itemDialog1, wxID_STATIC, _("xxxx"), wxDefaultPosition, wxSize(40, -1), wxALIGN_CENTRE ); - itemBoxSizer12->Add(m_symbolStaticCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer12->Add(m_symbolStaticCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemBoxSizer12->Add(5, 5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText15 = new wxStaticText( itemDialog1, wxID_STATIC, _("&Character code:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer12->Add(itemStaticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer12->Add(itemStaticText15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); m_characterCodeCtrl = new wxTextCtrl( itemDialog1, ID_SYMBOLPICKERDIALOG_CHARACTERCODE, wxEmptyString, wxDefaultPosition, wxSize(140, -1), wxTE_READONLY|wxTE_CENTRE ); m_characterCodeCtrl->SetHelpText(_("The character code.")); @@ -442,7 +442,7 @@ void wxSymbolPickerDialog::CreateControls() #if defined(__UNICODE__) wxStaticText* itemStaticText18 = new wxStaticText( itemDialog1, wxID_STATIC, _("&From:"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer12->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer12->Add(itemStaticText18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); #endif diff --git a/src/richtext/richtexttabspage.cpp b/src/richtext/richtexttabspage.cpp index 9d2a764d43..6957462c39 100644 --- a/src/richtext/richtexttabspage.cpp +++ b/src/richtext/richtexttabspage.cpp @@ -111,7 +111,7 @@ void wxRichTextTabsPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer5, 0, wxGROW, 5); wxStaticText* itemStaticText6 = new wxStaticText( itemPanel1, wxID_STATIC, _("&Position (tenths of a mm):"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP|wxADJUST_MINSIZE, 5); + itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxTOP, 5); m_tabEditCtrl = new wxTextCtrl( itemPanel1, ID_RICHTEXTTABSPAGE_TABEDIT, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_tabEditCtrl->SetHelpText(_("The tab position.")); @@ -131,7 +131,7 @@ void wxRichTextTabsPage::CreateControls() itemBoxSizer4->Add(itemBoxSizer10, 0, wxGROW, 5); wxStaticText* itemStaticText11 = new wxStaticText( itemPanel1, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer10->Add(itemStaticText11, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxADJUST_MINSIZE, 5); + itemBoxSizer10->Add(itemStaticText11, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5); wxButton* itemButton12 = new wxButton( itemPanel1, ID_RICHTEXTTABSPAGE_NEW_TAB, _("&New"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton12->SetHelpText(_("Click to create a new tab position.")); diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp index d0b26df540..b77b9a5cfe 100644 --- a/src/xrc/xh_sizer.cpp +++ b/src/xrc/xh_sizer.cpp @@ -76,7 +76,6 @@ wxSizerXmlHandler::wxSizerXmlHandler() XRC_ADD_STYLE(wxALIGN_CENTER_VERTICAL); XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL); - XRC_ADD_STYLE(wxADJUST_MINSIZE); XRC_ADD_STYLE(wxFIXED_MINSIZE); }