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

Changed the capitalisation of 'span' of Set/GetRow/Colspan to be less jarring

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-05 15:35:05 +00:00
parent e3d4bdd52b
commit a4f491405d
4 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/richtext/richtext.cpp
View File

@@ -919,7 +919,7 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
wxFont boldFont = wxFont(12, wxROMAN, wxNORMAL, wxBOLD);
wxFont italicFont = wxFont(12, wxROMAN, wxITALIC, wxNORMAL);
m_richTextCtrl = new MyRichTextCtrl(splitter, ID_RICHTEXT_CTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxVSCROLL|wxHSCROLL|wxWANTS_CHARS);
m_richTextCtrl = new MyRichTextCtrl(splitter, ID_RICHTEXT_CTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxVSCROLL|wxHSCROLL/*|wxWANTS_CHARS*/);
wxASSERT(!m_richTextCtrl->GetBuffer().GetAttributes().HasFontPixelSize());
wxFont font(12, wxROMAN, wxNORMAL, wxNORMAL);
@@ -1236,20 +1236,20 @@ void MyFrame::WriteInitialText()
// Demonstrate colspan and rowspan
wxRichTextCell* cell = table->GetCell(1, 0);
cell->SetColspan(2);
cell->SetColSpan(2);
r.SetFocusObject(cell);
cell->Clear();
r.WriteText("This cell spans 2 columns");
cell = table->GetCell(1, 3);
cell->SetRowspan(2);
cell->SetRowSpan(2);
r.SetFocusObject(cell);
cell->Clear();
r.WriteText("This cell spans 2 rows");
cell = table->GetCell(2, 1);
cell->SetColspan(2);
cell->SetRowspan(3);
cell->SetColSpan(2);
cell->SetRowSpan(3);
r.SetFocusObject(cell);
cell->Clear();
r.WriteText("This cell spans 2 columns and 3 rows");