#include "wx/textctrl.h"
#include "wx/settings.h"
#include "wx/brush.h"
+ #include "wx/dcclient.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/log.h"
#if wxUSE_RICHEDIT
-#if wxUSE_INKEDIT
-#include "wx/dynlib.h"
-#endif
-
// old mingw32 has richedit stuff directly in windows.h and doesn't have
// richedit.h at all
#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
#include "wx/msw/missing.h"
+// FIXME-VC6: This seems to be only missing from VC6 headers.
+#ifndef SPI_GETCARETWIDTH
+ #define SPI_GETCARETWIDTH 0x2006
+#endif
+
#if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
// dummy value used for m_dropTarget, different from any valid pointer value
// event tables and other macros
// ----------------------------------------------------------------------------
-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxTextCtrlStyle )
-
-wxBEGIN_FLAGS( wxTextCtrlStyle )
- // new style border flags, we put them first to
- // use them for streaming out
- wxFLAGS_MEMBER(wxBORDER_SIMPLE)
- wxFLAGS_MEMBER(wxBORDER_SUNKEN)
- wxFLAGS_MEMBER(wxBORDER_DOUBLE)
- wxFLAGS_MEMBER(wxBORDER_RAISED)
- wxFLAGS_MEMBER(wxBORDER_STATIC)
- wxFLAGS_MEMBER(wxBORDER_NONE)
-
- // old style border flags
- wxFLAGS_MEMBER(wxSIMPLE_BORDER)
- wxFLAGS_MEMBER(wxSUNKEN_BORDER)
- wxFLAGS_MEMBER(wxDOUBLE_BORDER)
- wxFLAGS_MEMBER(wxRAISED_BORDER)
- wxFLAGS_MEMBER(wxSTATIC_BORDER)
- wxFLAGS_MEMBER(wxBORDER)
-
- // standard window styles
- wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
- wxFLAGS_MEMBER(wxCLIP_CHILDREN)
- wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
- wxFLAGS_MEMBER(wxWANTS_CHARS)
- wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
- wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
- wxFLAGS_MEMBER(wxVSCROLL)
- wxFLAGS_MEMBER(wxHSCROLL)
-
- wxFLAGS_MEMBER(wxTE_PROCESS_ENTER)
- wxFLAGS_MEMBER(wxTE_PROCESS_TAB)
- wxFLAGS_MEMBER(wxTE_MULTILINE)
- wxFLAGS_MEMBER(wxTE_PASSWORD)
- wxFLAGS_MEMBER(wxTE_READONLY)
- wxFLAGS_MEMBER(wxHSCROLL)
- wxFLAGS_MEMBER(wxTE_RICH)
- wxFLAGS_MEMBER(wxTE_RICH2)
- wxFLAGS_MEMBER(wxTE_AUTO_URL)
- wxFLAGS_MEMBER(wxTE_NOHIDESEL)
- wxFLAGS_MEMBER(wxTE_LEFT)
- wxFLAGS_MEMBER(wxTE_CENTRE)
- wxFLAGS_MEMBER(wxTE_RIGHT)
- wxFLAGS_MEMBER(wxTE_DONTWRAP)
- wxFLAGS_MEMBER(wxTE_CHARWRAP)
- wxFLAGS_MEMBER(wxTE_WORDWRAP)
-
-wxEND_FLAGS( wxTextCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxTextCtrl, wxControl,"wx/textctrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTextCtrl)
- wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
- wxEVENT_PROPERTY( TextEnter , wxEVT_COMMAND_TEXT_ENTER , wxCommandEvent )
-
- wxPROPERTY( Font , wxFont , SetFont , GetFont , EMPTY_MACROVALUE, 0 /*flags*/ , wxT("Helpstring") , wxT("group") )
- wxPROPERTY( Value , wxString , SetValue, GetValue, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
- wxPROPERTY_FLAGS( WindowStyle , wxTextCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxTextCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
-#endif
-
-
BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)
// implementation detail
m_updatesCount = -2;
- if ( !MSWCreateControl(windowClass.wx_str(), msStyle, pos, size, valueWin) )
+ if ( !MSWCreateControl(windowClass.t_str(), msStyle, pos, size, valueWin) )
return false;
m_updatesCount = -1;
SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0,
SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_NOACTIVATE|
SWP_FRAMECHANGED);
-#endif
+
+ if ( IsSingleLine() )
+ {
+ // If we don't set the margins explicitly, their size depends on the
+ // control initial size, see #2438. So explicitly set them to something
+ // consistent. And for this we have 2 candidates: EC_USEFONTINFO (which
+ // sets the left margin to 3 pixels, at least under Windows 7) or 0. We
+ // use the former because it looks like it was meant to be used as the
+ // default (what else would it be there for?) and 0 looks bad in
+ // classic mode, i.e. without themes. Also, the margin can be reset to
+ // 0 easily by calling SetMargins() explicitly but setting it to the
+ // default value is not currently supported.
+ //
+ // Finally, notice that EC_USEFONTINFO is used differently for plain
+ // and rich text controls.
+ WPARAM wParam;
+ LPARAM lParam;
+ if ( IsRich() )
+ {
+ wParam = EC_USEFONTINFO;
+ lParam = 0;
+ }
+ else // plain EDIT, EC_USEFONTINFO is used in lParam with them.
+ {
+ wParam = EC_LEFTMARGIN | EC_RIGHTMARGIN;
+ lParam = MAKELPARAM(EC_USEFONTINFO, EC_USEFONTINFO);
+ }
+
+ ::SendMessage(GetHwnd(), EM_SETMARGINS, wParam, lParam);
+ }
+#endif // !__WXWINCE__
return true;
}
wxFontEncoding encoding = wxFONTENCODING_SYSTEM;
wxFont font = m_defaultStyle.GetFont();
- if ( !font.Ok() )
+ if ( !font.IsOk() )
font = GetFont();
- if ( font.Ok() )
+ if ( font.IsOk() )
{
encoding = font.GetEncoding();
}
EDITSTREAM eds;
wxZeroMemory(eds);
- eds.dwCookie = (DWORD)&data;
+ eds.dwCookie = (DWORD_PTR)&data;
eds.pfnCallback = wxRichEditStreamOut;
::SendMessage
if ( GetRichVersion() > 1 )
{
wxFont font = m_defaultStyle.GetFont();
- if ( !font.Ok() )
+ if ( !font.IsOk() )
font = GetFont();
- if ( font.Ok() )
+ if ( font.IsOk() )
{
wxFontEncoding encoding = font.GetEncoding();
if ( encoding != wxFONTENCODING_SYSTEM )
::SendMessage(GetHwnd(), selectionOnly ? EM_REPLACESEL : WM_SETTEXT,
// EM_REPLACESEL takes 1 to indicate the operation should be redoable
- selectionOnly ? 1 : 0, (LPARAM)valueDos.wx_str());
+ selectionOnly ? 1 : 0, wxMSW_CONV_LPARAM(valueDos));
if ( !ucf.GotUpdate() && (flags & SetValue_SendEvent) )
{
// don't do this if we're frozen, saves some time
if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 )
{
- ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, NULL);
+ ::SendMessage(GetHwnd(), WM_VSCROLL, SB_BOTTOM, (LPARAM)NULL);
}
#endif // wxUSE_RICHEDIT
}
return rc;
}
+wxPoint wxTextCtrl::DoPositionToCoords(long pos) const
+{
+ // FIXME: This code is broken for rich edit version 2.0 as it uses the same
+ // API as plain edit i.e. the coordinates are returned directly instead of
+ // filling the POINT passed as WPARAM with them but we can't distinguish
+ // between 2.0 and 3.0 unfortunately (see also the use of EM_POSFROMCHAR
+ // above).
+#if wxUSE_RICHEDIT
+ if ( IsRich() )
+ {
+ POINT pt;
+ LRESULT rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, (WPARAM)&pt, pos);
+ if ( rc != -1 )
+ return wxPoint(pt.x, pt.y);
+ }
+ else
+#endif // wxUSE_RICHEDIT
+ {
+ LRESULT rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, pos, 0);
+ if ( rc == -1 )
+ {
+ // Finding coordinates for the last position of the control fails
+ // in plain EDIT control, try to compensate for it by finding it
+ // ourselves from the position of the previous character.
+ if ( pos < GetLastPosition() )
+ {
+ // It's not the expected correctable failure case so just fail.
+ return wxDefaultPosition;
+ }
+
+ if ( pos == 0 )
+ {
+ // We're being asked the coordinates of the first (and last and
+ // only) position in an empty control. There is no way to get
+ // it directly with EM_POSFROMCHAR but EM_GETMARGINS returns
+ // the correct value for at least the horizontal offset.
+ rc = ::SendMessage(GetHwnd(), EM_GETMARGINS, 0, 0);
+
+ // Text control seems to effectively add 1 to margin.
+ return wxPoint(LOWORD(rc) + 1, 1);
+ }
+
+ // We do have a previous character, try to get its coordinates.
+ rc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, pos - 1, 0);
+ if ( rc == -1 )
+ {
+ // If getting coordinates of the previous character failed as
+ // well, just give up.
+ return wxDefaultPosition;
+ }
+
+ wxString prevChar = GetRange(pos - 1, pos);
+ wxSize prevCharSize = GetTextExtent(prevChar);
+
+ if ( prevChar == wxT("\n" ))
+ {
+ // 'pos' is at the beginning of a new line so its X coordinate
+ // should be the same as X coordinate of the first character of
+ // any other line while its Y coordinate will be approximately
+ // (but we can't compute it exactly...) one character height
+ // more than that of the previous character.
+ LRESULT coords0 = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, 0, 0);
+ if ( coords0 == -1 )
+ return wxDefaultPosition;
+
+ rc = MAKELPARAM(LOWORD(coords0), HIWORD(rc) + prevCharSize.y);
+ }
+ else
+ {
+ // Simple case: previous character is in the same line so this
+ // one is just after it.
+ rc += MAKELPARAM(prevCharSize.x, 0);
+ }
+ }
+
+ // Notice that {LO,HI}WORD macros return WORDs, i.e. unsigned shorts,
+ // while we want to have signed values here (the y coordinate of any
+ // position above the first currently visible line is negative, for
+ // example), hence the need for casts.
+ return wxPoint(static_cast<short>(LOWORD(rc)),
+ static_cast<short>(HIWORD(rc)));
+ }
+
+ return wxDefaultPosition;
+}
+
+
// ----------------------------------------------------------------------------
//
// ----------------------------------------------------------------------------
// fall through
case 0:
- if ( IsMultiLine() && vkey == VK_RETURN )
- return false;
+ switch ( vkey )
+ {
+ case VK_RETURN:
+ // This one is only special for multi line controls.
+ if ( !IsMultiLine() )
+ break;
+ // fall through
+
+ case VK_DELETE:
+ case VK_HOME:
+ case VK_END:
+ return false;
+ }
// fall through
case 2:
break;
{
case WXK_RETURN:
{
- wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
+ wxCommandEvent event(wxEVT_TEXT_ENTER, m_windowId);
InitCommandEvent(event);
event.SetString(GetValue());
if ( HandleWindowEvent(event) )
}
}
+ // Default window procedure of multiline edit controls posts WM_CLOSE to
+ // the parent window when it gets Escape key press for some reason, prevent
+ // it from doing this as this resulted in dialog boxes being closed on
+ // Escape even when they shouldn't be (we do handle Escape ourselves
+ // correctly in the situations when it should close them).
+ if ( event.GetKeyCode() == WXK_ESCAPE && IsMultiLine() )
+ return;
+
// no, we didn't process it
event.Skip();
}
// live with it.
lRc = lDlgCode;
}
+ if (IsMultiLine())
+ // Clear the DLGC_HASSETSEL bit from the return value
+ lRc &= ~DLGC_HASSETSEL;
}
break;
// the text size limit has been hit -- try to increase it
if ( !AdjustSpaceLimit() )
{
- wxCommandEvent event(wxEVT_COMMAND_TEXT_MAXLEN, m_windowId);
+ wxCommandEvent event(wxEVT_TEXT_MAXLEN, m_windowId);
InitCommandEvent(event);
event.SetString(GetValue());
ProcessCommand(event);
WXHBRUSH wxTextCtrl::MSWControlColor(WXHDC hDC, WXHWND hWnd)
{
- if ( !IsEnabled() && !HasFlag(wxTE_MULTILINE) )
+ if ( !IsThisEnabled() && !HasFlag(wxTE_MULTILINE) )
return MSWControlColorDisabled(hDC);
return wxTextCtrlBase::MSWControlColor(hDC, hWnd);
}
wxSize wxTextCtrl::DoGetBestSize() const
+{
+ return DoGetSizeFromTextSize( DEFAULT_ITEM_WIDTH );
+}
+
+wxSize wxTextCtrl::DoGetSizeFromTextSize(int xlen, int ylen) const
{
int cx, cy;
wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
- int wText = DEFAULT_ITEM_WIDTH;
+ DWORD wText = 1;
+ ::SystemParametersInfo(SPI_GETCARETWIDTH, 0, &wText, 0);
+ wText += xlen;
int hText = cy;
if ( m_windowStyle & wxTE_MULTILINE )
{
- hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2);
+ // add space for vertical scrollbar
+ if ( !(m_windowStyle & wxTE_NO_VSCROLL) )
+ wText += ::GetSystemMetrics(SM_CXVSCROLL);
+
+ if ( ylen <= 0 )
+ {
+ hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2);
+ // add space for horizontal scrollbar
+ if ( m_windowStyle & wxHSCROLL )
+ hText += ::GetSystemMetrics(SM_CYHSCROLL);
+ }
+ }
+ // for single line control cy (height + external leading) is ok
+ else
+ {
+ // Add the margins we have previously set
+ wxPoint marg( GetMargins() );
+ wText += wxMax(0, marg.x);
+ hText += wxMax(0, marg.y);
+ }
+
+ // Text controls without border are special and have the same height as
+ // static labels (they also have the same appearance when they're disable
+ // and are often used as a sort of copyable to the clipboard label so it's
+ // important that they have the same height as the normal labels to not
+ // stand out).
+ if ( !HasFlag(wxBORDER_NONE) )
+ {
+ wText += 9; // borders and inner margins
+
+ // we have to add the adjustments for the control height only once, not
+ // once per line, so do it after multiplication above
+ hText += EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) - cy;
}
- //else: for single line control everything is ok
- // we have to add the adjustments for the control height only once, not
- // once per line, so do it after multiplication above
- hText += EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy) - cy;
+ // Perhaps the user wants something different from CharHeight, or ylen
+ // is used as the height of a multiline text.
+ if ( ylen > 0 )
+ hText += ylen - GetCharHeight();
return wxSize(wText, hText);
}
if ( IsRich() )
{
// change the colour of everything
- CHARFORMAT cf;
- wxZeroMemory(cf);
- cf.cbSize = sizeof(cf);
+ WinStruct<CHARFORMAT> cf;
cf.dwMask = CFM_COLOR;
cf.crTextColor = wxColourToRGB(colour);
::SendMessage(GetHwnd(), EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);
LOGFONT lf;
- lf.lfHeight = cf.yHeight;
+ // Convert the height from the units of 1/20th of the point in which
+ // CHARFORMAT stores it to pixel-based units used by LOGFONT.
+ const wxCoord ppi = wxClientDC(this).GetPPI().y;
+ lf.lfHeight = -MulDiv(cf.yHeight/20, ppi, 72);
lf.lfWidth = 0;
lf.lfCharSet = ANSI_CHARSET; // FIXME: how to get correct charset?
lf.lfClipPrecision = 0;
lf.lfWeight = FW_NORMAL;
wxFont font = wxCreateFontFromLogFont(& lf);
- if (font.Ok())
+ if (font.IsOk())
{
style.SetFont(font);
}
projects / wxWidgets.git / blobdiff