Add ability to test tab stops. Very slightly modified patch from #1518114 (Tim Kosse)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2006-07-23 12:07:56 +00:00
parent 5826659c99
commit 7fb3f3c448

View File

@@ -43,6 +43,7 @@
#include "wx/colordlg.h" #include "wx/colordlg.h"
#include "wx/fontdlg.h" #include "wx/fontdlg.h"
#include "wx/numdlg.h" #include "wx/numdlg.h"
#include "wx/tokenzr.h"
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// class definitions // class definitions
@@ -348,6 +349,7 @@ public:
void OnChangeBackgroundColour(wxCommandEvent& event); void OnChangeBackgroundColour(wxCommandEvent& event);
void OnLeftIndent(wxCommandEvent& event); void OnLeftIndent(wxCommandEvent& event);
void OnRightIndent(wxCommandEvent& event); void OnRightIndent(wxCommandEvent& event);
void OnTabStops(wxCommandEvent& event);
private: private:
wxTextCtrl *m_textCtrl; wxTextCtrl *m_textCtrl;
@@ -1513,7 +1515,8 @@ enum
RICHTEXT_CHANGE_TEXT_COLOUR, RICHTEXT_CHANGE_TEXT_COLOUR,
RICHTEXT_CHANGE_BACKGROUND_COLOUR, RICHTEXT_CHANGE_BACKGROUND_COLOUR,
RICHTEXT_LEFT_INDENT, RICHTEXT_LEFT_INDENT,
RICHTEXT_RIGHT_INDENT RICHTEXT_RIGHT_INDENT,
RICHTEXT_TAB_STOPS
}; };
BEGIN_EVENT_TABLE(RichTextFrame, wxFrame) BEGIN_EVENT_TABLE(RichTextFrame, wxFrame)
@@ -1528,6 +1531,7 @@ BEGIN_EVENT_TABLE(RichTextFrame, wxFrame)
EVT_MENU(RICHTEXT_CHANGE_BACKGROUND_COLOUR, RichTextFrame::OnChangeBackgroundColour) EVT_MENU(RICHTEXT_CHANGE_BACKGROUND_COLOUR, RichTextFrame::OnChangeBackgroundColour)
EVT_MENU(RICHTEXT_LEFT_INDENT, RichTextFrame::OnLeftIndent) EVT_MENU(RICHTEXT_LEFT_INDENT, RichTextFrame::OnLeftIndent)
EVT_MENU(RICHTEXT_RIGHT_INDENT, RichTextFrame::OnRightIndent) EVT_MENU(RICHTEXT_RIGHT_INDENT, RichTextFrame::OnRightIndent)
EVT_MENU(RICHTEXT_TAB_STOPS, RichTextFrame::OnTabStops)
END_EVENT_TABLE() END_EVENT_TABLE()
RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title): RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title):
@@ -1566,7 +1570,8 @@ RichTextFrame::RichTextFrame(wxWindow* parent, const wxString& title):
editMenu->Append(RICHTEXT_CHANGE_BACKGROUND_COLOUR, _("Change Background Colour")); editMenu->Append(RICHTEXT_CHANGE_BACKGROUND_COLOUR, _("Change Background Colour"));
editMenu->AppendSeparator(); editMenu->AppendSeparator();
editMenu->Append(RICHTEXT_LEFT_INDENT, _("Left Indent")); editMenu->Append(RICHTEXT_LEFT_INDENT, _("Left Indent"));
editMenu->Append(RICHTEXT_RIGHT_INDENT, _("Right indent")); editMenu->Append(RICHTEXT_RIGHT_INDENT, _("Right Indent"));
editMenu->Append(RICHTEXT_TAB_STOPS, _("Tab Stops"));
menuBar->Append(editMenu, _("Edit")); menuBar->Append(editMenu, _("Edit"));
SetMenuBar(menuBar); SetMenuBar(menuBar);
@@ -1758,6 +1763,35 @@ void RichTextFrame::OnRightIndent(wxCommandEvent& WXUNUSED(event))
} }
} }
void RichTextFrame::OnTabStops(wxCommandEvent& WXUNUSED(event))
{
wxString tabsStr = wxGetTextFromUser
(
_("Please enter the tab stop positions in tenths of a millimetre, separated by spaces.\nLeave empty to reset tab stops."),
_("Tab Stops"),
wxEmptyString,
this
);
wxArrayInt tabs;
wxStringTokenizer tokens(tabsStr, _T(" "));
while (tokens.HasMoreTokens())
{
wxString token = tokens.GetNextToken();
tabs.Add(wxAtoi(token));
}
wxTextAttr attr;
attr.SetTabs(tabs);
long start, end;
m_textCtrl->GetSelection(& start, & end);
m_textCtrl->SetStyle(start, end, attr);
m_currentPosition = -1;
}
void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
{ {
long insertionPoint = m_textCtrl->GetInsertionPoint(); long insertionPoint = m_textCtrl->GetInsertionPoint();