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

implemented wxTE_RIGHT, wxTE_CENTRE for wxGTK2 (patch 957687)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-05-25 10:35:34 +00:00
parent b3a1545d5f
commit c663fbea68
4 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -141,6 +141,10 @@ wxMSW:
- fixed wxFileDataObject in Unicode build (Alex D)
- subdindented paragraphs support (Tim Kosse)
wxGTK:
- added support for wxTE_RIGHT and wxTE_CENTRE styles under GTK2 (Mart Raudsepp)
wxMotif:
- removed wxMenuItem::DeleteSubMenu()

4
docs/latex/wx/text.tex
View File

@@ -304,8 +304,8 @@ it to always show it. It doesn't do anything under other platforms.}
\twocolitem{\windowstyle{wxHSCROLL}}{A horizontal scrollbar will be created and
used, so that text won't be wrapped. No effect under GTK+.}
\twocolitem{\windowstyle{wxTE\_LEFT}}{The text in the control will be left-justified (default).}
\twocolitem{\windowstyle{wxTE\_CENTRE}}{The text in the control will be centered.}
\twocolitem{\windowstyle{wxTE\_RIGHT}}{The text in the control will be right-justified.}
\twocolitem{\windowstyle{wxTE\_CENTRE}}{The text in the control will be centered (currently wxMSW and wxGTK2 only).}
\twocolitem{\windowstyle{wxTE\_RIGHT}}{The text in the control will be right-justified (currently wxMSW and wxGTK2 only).}
\twocolitem{\windowstyle{wxTE\_DONTWRAP}}{Same as {\tt wxHSCROLL} style.}
\twocolitem{\windowstyle{wxTE\_LINEWRAP}}{Wrap the lines too long to be shown entirely at any position (wxUniv only currently).}
\twocolitem{\windowstyle{wxTE\_WORDWRAP}}{Wrap the lines too long to be shown entirely at word boundaries only (wxUniv only currently).}

20
src/gtk/textctrl.cpp
View File

@@ -414,6 +414,26 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
#ifdef __WXGTK20__
else
#ifdef __WXGTK20__
if (multi_line)
{
if (style & wxTE_RIGHT)
gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_RIGHT );
else if (style & wxTE_CENTRE)
gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
// Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
}
// gtk_entry_set_alignment was introduced in gtk+-2.3.5
#if GTK_CHECK_VERSION(2, 3, 5)
else
{
if (style & wxTE_RIGHT)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
else if (style & wxTE_CENTRE)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
}
#endif // gtk+-2.3.5
#endif // __WXGTK20__
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
#else
}

20
src/gtk1/textctrl.cpp
View File

@@ -414,6 +414,26 @@ bool wxTextCtrl::Create( wxWindow *parent,
gtk_entry_set_editable( GTK_ENTRY(m_text), FALSE );
#ifdef __WXGTK20__
else
#ifdef __WXGTK20__
if (multi_line)
{
if (style & wxTE_RIGHT)
gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_RIGHT );
else if (style & wxTE_CENTRE)
gtk_text_view_set_justification( GTK_TEXT_VIEW(m_text), GTK_JUSTIFY_CENTER );
// Left justify (alignment) is the default and we don't need to apply GTK_JUSTIFY_LEFT
}
// gtk_entry_set_alignment was introduced in gtk+-2.3.5
#if GTK_CHECK_VERSION(2, 3, 5)
else
{
if (style & wxTE_RIGHT)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 1.0 );
else if (style & wxTE_CENTRE)
gtk_entry_set_alignment( GTK_ENTRY(m_text), 0.5 );
}
#endif // gtk+-2.3.5
#endif // __WXGTK20__
gtk_text_view_set_editable( GTK_TEXT_VIEW( m_text), FALSE);
#else
}