#include <stdlib.h>
#include <sys/types.h>
-#if wxUSE_RICHEDIT && (!defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__))
+#if wxUSE_RICHEDIT
+
+// old mingw32 has richedit stuff directly in windows.h and doesn't have
+// richedit.h at all
+#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
#include <richedit.h>
#endif
// Watcom C++ doesn't define this
#ifndef SCF_ALL
-#define SCF_ALL 0x0004
+ #define SCF_ALL 0x0004
#endif
+#endif // wxUSE_RICHEDIT
+
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
// have we managed to load any richedit version?
if ( !s_errorGiven )
{
- msStyle |= ES_AUTOVSCROLL;
-
m_verRichEdit = verRichEdit;
if ( m_verRichEdit == 1 )
{
long msStyle = wxControl::MSWGetStyle(style, exstyle);
- // default styles
- msStyle |= ES_LEFT;
-
+ // styles which we alaways add by default
if ( style & wxTE_MULTILINE )
{
wxASSERT_MSG( !(style & wxTE_PROCESS_ENTER),
msStyle |= ES_MULTILINE | ES_WANTRETURN;
if ( !(style & wxTE_NO_VSCROLL) )
- msStyle |= WS_VSCROLL;
+ {
+ // always adjust the vertical scrollbar automatically if we have it
+ msStyle |= WS_VSCROLL | ES_AUTOVSCROLL;
+
+ // we have to use this style for the rich edit controls because
+ // without it the vertical scrollbar never appears at all in
+ // richedit 3.0 because of our ECO_NOHIDESEL hack (search for it)
+ if ( style & wxTE_RICH2 )
+ {
+ msStyle |= ES_DISABLENOSCROLL;
+ }
+ }
style |= wxTE_PROCESS_ENTER;
}
msStyle |= ES_AUTOHSCROLL;
}
+ // styles which we add depending on the specified wxWindows styles
if ( style & wxHSCROLL )
- msStyle |= WS_HSCROLL | ES_AUTOHSCROLL;
+ {
+ // automatically scroll the control horizontally as necessary
+ msStyle |= WS_HSCROLL;// | ES_AUTOHSCROLL;
+ }
if ( style & wxTE_READONLY )
msStyle |= ES_READONLY;
if ( style & wxTE_PASSWORD )
msStyle |= ES_PASSWORD;
- if ( style & wxTE_AUTO_SCROLL )
- msStyle |= ES_AUTOHSCROLL;
-
if ( style & wxTE_NOHIDESEL )
msStyle |= ES_NOHIDESEL;
+ // note that we can't do do "& wxTE_LEFT" as wxTE_LEFT == 0
if ( style & wxTE_CENTRE )
msStyle |= ES_CENTER;
-
- if ( style & wxTE_RIGHT )
+ else if ( style & wxTE_RIGHT )
msStyle |= ES_RIGHT;
+ else
+ msStyle |= ES_LEFT; // ES_LEFT if 0 as well but for consistency...
return msStyle;
}
extern long wxEncodingToCodepage(wxFontEncoding encoding); // from utils.cpp
-#ifdef __WXWINE__
-bool wxTextCtrl::StreamIn(const wxString& value,
- wxFontEncoding WXUNUSED(encoding),
- bool selectionOnly)
-{
- return FALSE;
-}
-#else // !__WXWINE__
-
#if wxUSE_UNICODE_MSLU
bool wxTextCtrl::StreamIn(const wxString& value,
wxFontEncoding WXUNUSED(encoding),
return TRUE;
}
-#endif // __WXWINE__/!__WXWINE__
-
#endif // wxUSE_RICHEDIT
void wxTextCtrl::WriteText(const wxString& value)
}
#endif // wxUSE_UNICODE_MSLU
-#if !wxUSE_UNICODE && !defined(__WXWINE__)
+#if !wxUSE_UNICODE
// next check if the text we're inserting must be shown in a non
// default charset -- this only works for RichEdit > 1.0
if ( GetRichVersion() > 1 )
#endif // wxUSE_RICHEDIT
)
{
- SendUpdateEvent();
+ // Windows already sends an update event for single-line
+ // controls.
+ if ( m_windowStyle & wxTE_MULTILINE )
+ SendUpdateEvent();
}
}
// rich edit controls send EN_UPDATE from WM_SETTEXT handler themselves
// but the normal ones don't -- make Clear() behaviour consistent by
// always sending this event
- SendUpdateEvent();
+
+ // Windows already sends an update event for single-line
+ // controls.
+ if ( m_windowStyle & wxTE_MULTILINE )
+ SendUpdateEvent();
}
}
#if wxUSE_RICHEDIT
if ( IsRich() )
{
+ CHARRANGE range;
+ range.cpMin = from;
+ range.cpMax = to;
+ SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range);
+ }
+ else
+#endif // wxUSE_RICHEDIT
+ {
+ SendMessage(hWnd, EM_SETSEL, (WPARAM)from, (LPARAM)to);
+ }
+
+ if ( scrollCaret )
+ {
+#if wxUSE_RICHEDIT
// richedit 3.0 (i.e. the version living in riched20.dll distributed
// with Windows 2000 and beyond) doesn't honour EM_SCROLLCARET when
// emulating richedit 2.0 unless the control has focus or ECO_NOHIDESEL
// will probably create many problems (dummy focus events; window
// containing the text control being brought to foreground
// unexpectedly; ...) or to temporarily set ECO_NOHIDESEL which may
- // create other problems too -- or it might not, so let's try to do it
+ // create other problems too -- and in fact it does because if we turn
+ // on/off this style while appending the text to the control, the
+ // vertical scrollbar never appears in it even if we append tons of
+ // text and to work around this the only solution I found was to use
+ // ES_DISABLENOSCROLL
+ //
+ // this is very ugly but I don't see any other way to make this work
if ( GetRichVersion() > 1 )
{
if ( !HasFlag(wxTE_NOHIDESEL) )
}
//else: everything is already ok
}
-
- CHARRANGE range;
- range.cpMin = from;
- range.cpMax = to;
- SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range);
- }
- else
#endif // wxUSE_RICHEDIT
- {
- SendMessage(hWnd, EM_SETSEL, (WPARAM)from, (LPARAM)to);
- }
- if ( scrollCaret )
- {
SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
- }
#if wxUSE_RICHEDIT
- // restore ECO_NOHIDESEL if we changed it
- if ( GetRichVersion() > 1 && !HasFlag(wxTE_NOHIDESEL) )
- {
- ::SendMessage(GetHwnd(), EM_SETOPTIONS,
- ECOOP_AND, ~ECO_NOHIDESEL);
- }
+ // restore ECO_NOHIDESEL if we changed it
+ if ( GetRichVersion() > 1 && !HasFlag(wxTE_NOHIDESEL) )
+ {
+ ::SendMessage(GetHwnd(), EM_SETOPTIONS,
+ ECOOP_AND, ~ECO_NOHIDESEL);
+ }
#endif // wxUSE_RICHEDIT
-
+ }
#else // Win16
// WPARAM is 0: selection is scrolled into view
SendMessage(hWnd, EM_SETSEL, (WPARAM)0, (LPARAM)MAKELONG(from, to));
void wxTextCtrl::OnChar(wxKeyEvent& event)
{
- switch ( event.KeyCode() )
+ switch ( event.GetKeyCode() )
{
case WXK_RETURN:
if ( !(m_windowStyle & wxTE_MULTILINE) )
bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
-#ifndef __WXWINE__
NMHDR *hdr = (NMHDR* )lParam;
switch ( hdr->code )
{
}
return TRUE;
}
-#endif
// not processed, leave it to the base class
return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result);
bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{
-#ifdef __WXWINE__
- return FALSE;
-#else
if ( !IsRich() )
{
// can't do it with normal text control
}
return ok;
-#endif
}
bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
projects / wxWidgets.git / blobdiff