/////////////////////////////////////////////////////////////////////////////
-// Name: msw/textctrl.cpp
+// Name: src/msw/textctrl.cpp
// Purpose: wxTextCtrl
// Author: Julian Smart
// Modified by:
// declarations
// ============================================================================
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "textctrl.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#pragma hdrstop
#endif
-#if wxUSE_TEXTCTRL
+#if wxUSE_TEXTCTRL && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/menu.h"
+ #include "wx/math.h"
#endif
#include "wx/module.h"
+#include "wx/sysopt.h"
#if wxUSE_CLIPBOARD
#include "wx/clipbrd.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__)
class wxRichEditModule : public wxModule
{
public:
+ enum Version
+ {
+ Version_1, // riched32.dll
+ Version_2or3, // both use riched20.dll
+ Version_41, // msftedit.dll (XP SP1 and Windows 2003)
+ Version_Max
+ };
+
virtual bool OnInit();
virtual void OnExit();
- // load the richedit DLL of at least of required version
- static bool Load(int version = 1);
+ // load the richedit DLL for the specified version of rich edit
+ static bool Load(Version version);
+
+#if wxUSE_INKEDIT
+ // load the InkEdit library
+ static bool LoadInkEdit();
+#endif
private:
// the handles to richedit 1.0 and 2.0 (or 3.0) DLLs
- static HINSTANCE ms_hRichEdit[2];
+ static HINSTANCE ms_hRichEdit[Version_Max];
+
+#if wxUSE_INKEDIT
+ static wxDynamicLibrary ms_inkEditLib;
+ static bool ms_inkEditLibLoadAttemped;
+#endif
DECLARE_DYNAMIC_CLASS(wxRichEditModule)
};
-HINSTANCE wxRichEditModule::ms_hRichEdit[2] = { NULL, NULL };
+HINSTANCE wxRichEditModule::ms_hRichEdit[Version_Max] = { NULL, NULL, NULL };
+
+#if wxUSE_INKEDIT
+wxDynamicLibrary wxRichEditModule::ms_inkEditLib;
+bool wxRichEditModule::ms_inkEditLibLoadAttemped = false;
+#endif
IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
#endif // wxUSE_RICHEDIT
+// a small class used to set m_updatesCount to 0 (to filter duplicate events if
+// necessary) and to reset it back to -1 afterwards
+class UpdatesCountFilter
+{
+public:
+ UpdatesCountFilter(int& count)
+ : m_count(count)
+ {
+ wxASSERT_MSG( m_count == -1, _T("wrong initial m_updatesCount value") );
+
+ m_count = 0;
+ }
+
+ ~UpdatesCountFilter()
+ {
+ m_count = -1;
+ }
+
+ // return true if an event has been received
+ bool GotUpdate() const
+ {
+ return m_count == 1;
+ }
+
+private:
+ int& m_count;
+
+ DECLARE_NO_COPY_CLASS(UpdatesCountFilter)
+};
+
// ----------------------------------------------------------------------------
// event tables and other macros
// ----------------------------------------------------------------------------
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(wxTE_CENTRE)
wxFLAGS_MEMBER(wxTE_RIGHT)
wxFLAGS_MEMBER(wxTE_DONTWRAP)
- wxFLAGS_MEMBER(wxTE_LINEWRAP)
+ 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( 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( 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()
wxCONSTRUCTOR_6( wxTextCtrl , wxWindow* , Parent , wxWindowID , Id , wxString , Value , wxPoint , Position , wxSize , Size , long , WindowStyle)
#else
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase)
#endif
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
EVT_CHAR(wxTextCtrl::OnChar)
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
#if wxUSE_RICHEDIT
- EVT_RIGHT_UP(wxTextCtrl::OnRightClick)
+ EVT_CONTEXT_MENU(wxTextCtrl::OnContextMenu)
#endif
EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
EVT_SET_FOCUS(wxTextCtrl::OnSetFocus)
END_EVENT_TABLE()
+// ----------------------------------------------------------------------------
+// function prototypes
+// ----------------------------------------------------------------------------
+
+LRESULT APIENTRY _EXPORT wxTextCtrlWndProc(HWND hWnd,
+ UINT message,
+ WPARAM wParam,
+ LPARAM lParam);
+
+// ---------------------------------------------------------------------------
+// global vars
+// ---------------------------------------------------------------------------
+
+// the pointer to standard text control wnd proc
+static WNDPROC gs_wndprocEdit = (WNDPROC)NULL;
+
// ============================================================================
// implementation
// ============================================================================
+// ----------------------------------------------------------------------------
+// wnd proc for subclassed edit control
+// ----------------------------------------------------------------------------
+
+LRESULT APIENTRY _EXPORT wxTextCtrlWndProc(HWND hWnd,
+ UINT message,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ wxWindow *win = wxFindWinFromHandle((WXHWND)hWnd);
+
+ switch ( message )
+ {
+ case WM_CUT:
+ case WM_COPY:
+ case WM_PASTE:
+ if( win->HandleClipboardEvent( message ) )
+ return 0;
+ break;
+ }
+ return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
+}
+
// ----------------------------------------------------------------------------
// creation
// ----------------------------------------------------------------------------
m_verRichEdit = 0;
#endif // wxUSE_RICHEDIT
+#if wxUSE_INKEDIT && wxUSE_RICHEDIT
+ m_isInkEdit = 0;
+#endif
+
m_privateContextMenu = NULL;
- m_suppressNextUpdate = FALSE;
+ m_updatesCount = -1;
m_isNativeCaretShown = true;
}
wxTextCtrl::~wxTextCtrl()
{
- if (m_privateContextMenu)
- {
- delete m_privateContextMenu;
- m_privateContextMenu = NULL;
- }
+ delete m_privateContextMenu;
}
bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
#endif
// base initialization
- if ( !CreateBase(parent, id, pos, size, style, validator, name) )
- return FALSE;
-
- if ( parent )
- parent->AddChild(this);
+ if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+ return false;
// translate wxWin style flags to MSW ones
WXDWORD msStyle = MSWGetCreateWindowFlags();
// do create the control - either an EDIT or RICHEDIT
wxString windowClass = wxT("EDIT");
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
+ // A control that capitalizes the first letter
+ if (style & wxTE_CAPITALIZE)
+ windowClass = wxT("CAPEDIT");
+#endif
+
#if wxUSE_RICHEDIT
if ( m_windowStyle & wxTE_AUTO_URL )
{
// we need to load the richedit DLL before creating the rich edit control
if ( m_windowStyle & wxTE_RICH )
{
- static bool s_errorGiven = FALSE;// MT-FIXME
-
- // Which version do we need? Use 1.0 by default because it is much more
- // like the the standard EDIT or 2.0 if explicitly requested, but use
- // only 2.0 in Unicode mode as 1.0 doesn't support Unicode at all
+ // versions 2.0, 3.0 and 4.1 of rich edit are mostly compatible with
+ // each other but not with version 1.0, so we have separate flags for
+ // the version 1.0 and the others (and so m_verRichEdit may be 0 (plain
+ // EDIT control), 1 for version 1.0 or 2 for any higher version)
//
- // TODO: RichEdit 3.0 is apparently capable of emulating RichEdit 1.0
- // (and thus EDIT) much better than RichEdit 2.0 so we probably
- // should use 3.0 if available as it is the best of both worlds -
- // but as I can't test it right now I don't do it (VZ)
+ // notice that 1.0 has no Unicode support at all so in Unicode build we
+ // must use another version
+
#if wxUSE_UNICODE
- const int verRichEdit = 2;
+ m_verRichEdit = 2;
#else // !wxUSE_UNICODE
- int verRichEdit = m_windowStyle & wxTE_RICH2 ? 2 : 1;
+ m_verRichEdit = m_windowStyle & wxTE_RICH2 ? 2 : 1;
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
- // only give the error msg once if the DLL can't be loaded
- if ( !s_errorGiven )
+#if wxUSE_INKEDIT
+ // First test if we can load an ink edit control. Normally, all edit
+ // controls will be made ink edit controls if a tablet environment is
+ // found (or if msw.inkedit != 0 and the InkEd.dll is present).
+ // However, an application can veto ink edit controls by either specifying
+ // msw.inkedit = 0 or by removing wxTE_RICH[2] from the style.
+ //
+ if ((wxSystemSettings::HasFeature(wxSYS_TABLET_PRESENT) || wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) != 0) &&
+ !(wxSystemOptions::HasOption(wxT("msw.inkedit")) && wxSystemOptions::GetOptionInt(wxT("msw.inkedit")) == 0))
{
- // try to load the RichEdit DLL (will do nothing if already done)
- if ( !wxRichEditModule::Load(verRichEdit) )
+ if (wxRichEditModule::LoadInkEdit())
{
-#if !wxUSE_UNICODE
- // try another version?
- verRichEdit = 3 - verRichEdit; // 1 <-> 2
+ windowClass = INKEDIT_CLASS;
- if ( !wxRichEditModule::Load(verRichEdit) )
-#endif // wxUSE_UNICODE
- {
- wxLogError(_("Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"));
+#if wxUSE_INKEDIT && wxUSE_RICHEDIT
+ m_isInkEdit = 1;
+#endif
- s_errorGiven = TRUE;
- }
+ // Fake rich text version for other calls
+ m_verRichEdit = 2;
}
}
+#endif
- // have we managed to load any richedit version?
- if ( !s_errorGiven )
+ if (!IsInkEdit())
{
- m_verRichEdit = verRichEdit;
- if ( m_verRichEdit == 1 )
+ if ( m_verRichEdit == 2 )
{
- windowClass = wxT("RICHEDIT");
- }
- else
- {
-#ifndef RICHEDIT_CLASS
- wxString RICHEDIT_CLASS;
- RICHEDIT_CLASS.Printf(_T("RichEdit%d0"), m_verRichEdit);
+ if ( wxRichEditModule::Load(wxRichEditModule::Version_41) )
+ {
+ // yes, class name for version 4.1 really is 5.0
+ windowClass = _T("RICHEDIT50W");
+ }
+ else if ( wxRichEditModule::Load(wxRichEditModule::Version_2or3) )
+ {
+ windowClass = _T("RichEdit20")
#if wxUSE_UNICODE
- RICHEDIT_CLASS += _T('W');
+ _T("W");
#else // ANSI
- RICHEDIT_CLASS += _T('A');
+ _T("A");
#endif // Unicode/ANSI
-#endif // !RICHEDIT_CLASS
+ }
+ else // failed to load msftedit.dll and riched20.dll
+ {
+ m_verRichEdit = 1;
+ }
+ }
+
+ if ( m_verRichEdit == 1 )
+ {
+ if ( wxRichEditModule::Load(wxRichEditModule::Version_1) )
+ {
+ windowClass = _T("RICHEDIT");
+ }
+ else // failed to load any richedit control DLL
+ {
+ // only give the error msg once if the DLL can't be loaded
+ static bool s_errorGiven = false; // MT ok as only used by GUI
+
+ if ( !s_errorGiven )
+ {
+ wxLogError(_("Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"));
+
+ s_errorGiven = true;
+ }
- windowClass = RICHEDIT_CLASS;
+ m_verRichEdit = 0;
+ }
}
- }
+ } // !useInkEdit
}
#endif // wxUSE_RICHEDIT
}
if ( !MSWCreateControl(windowClass, msStyle, pos, size, valueWin) )
- return FALSE;
-
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
+ return false;
#if wxUSE_RICHEDIT
- if ( IsRich() )
+ if (IsRich())
{
+#if wxUSE_INKEDIT
+ if (IsInkEdit())
+ {
+ // Pass IEM_InsertText (0) as wParam, in order to have the ink always
+ // converted to text.
+ ::SendMessage(GetHwnd(), EM_SETINKINSERTMODE, 0, 0);
+
+ // Make sure the mouse can be used for input
+ ::SendMessage(GetHwnd(), EM_SETUSEMOUSEFORINPUT, 1, 0);
+ }
+#endif
+
// enable the events we're interested in: we want to get EN_CHANGE as
// for the normal controls
LPARAM mask = ENM_CHANGE;
- if ( GetRichVersion() == 1 )
+ if (GetRichVersion() == 1 && !IsInkEdit())
{
// we also need EN_MSGFILTER for richedit 1.0 for the reasons
// explained in its handler
mask |= ENM_MOUSEEVENTS;
+
+ // we also need to force the appearance of the vertical scrollbar
+ // initially as otherwise the control doesn't refresh correctly
+ // after resize: but once the vertical scrollbar had been shown
+ // (even if it's subsequently hidden) it does
+ //
+ // this is clearly a bug and for now it has been only noticed under
+ // Windows XP, so if we're sure it works correctly under other
+ // systems we could do this only for XP
+ SetSize(-1, 1); // 1 is small enough to force vert scrollbar
+ SetSize(size);
}
else if ( m_windowStyle & wxTE_AUTO_URL )
{
}
#endif // wxUSE_RICHEDIT
- return TRUE;
+ gs_wndprocEdit = wxSetWindowProc((HWND)GetHwnd(),
+ wxTextCtrlWndProc);
+
+ return true;
}
// Make sure the window style (etc.) reflects the HWND style (roughly)
#if wxUSE_RICHEDIT
wxString classname = wxGetWindowClass(GetHWND());
- if ( classname.IsSameAs(_T("EDIT"), FALSE /* no case */) )
+ if ( classname.IsSameAs(_T("EDIT"), false /* no case */) )
{
m_verRichEdit = 0;
}
if ( style & wxTE_DONTWRAP )
{
// automatically scroll the control horizontally as necessary
- msStyle |= WS_HSCROLL;
+ //
+ // NB: ES_AUTOHSCROLL is needed for richedit controls or they don't
+ // show horz scrollbar at all, even in spite of WS_HSCROLL, and as
+ // it doesn't seem to do any harm for plain edit controls, add it
+ // always
+ msStyle |= WS_HSCROLL | ES_AUTOHSCROLL;
}
if ( style & wxTE_READONLY )
textRange.chrg.cpMax = to;
textRange.lpstrText = p;
- (void)SendMessage(GetHwnd(), EM_GETTEXTRANGE,
- 0, (LPARAM)&textRange);
+ (void)::SendMessage(GetHwnd(), EM_GETTEXTRANGE,
+ 0, (LPARAM)&textRange);
if ( m_verRichEdit > 1 )
{
// edit controls mostly)
if ( (value.length() > 0x400) || (value != GetValue()) )
{
- DoWriteText(value, FALSE /* not selection only */);
-
+ DoWriteText(value, false /* not selection only */);
+
+ // mark the control as being not dirty - we changed its text, not the
+ // user
+ DiscardEdits();
+
// for compatibility, don't move the cursor when doing SetValue()
SetInsertionPoint(0);
}
else // same text
{
+ // still reset the modified flag even if the value didn't really change
+ // because now it comes from the program and not the user (and do it
+ // before generating the event so that the event handler could get the
+ // expected value from IsModified())
+ DiscardEdits();
+
// still send an event for consistency
SendUpdateEvent();
}
-
- // we should reset the modified flag even if the value didn't really change
-
- // mark the control as being not dirty - we changed its text, not the
- // user
- DiscardEdits();
}
#if wxUSE_RICHEDIT && (!wxUSE_UNICODE || wxUSE_UNICODE_MSLU)
// the cast below is needed for broken (very) old mingw32 headers
eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn;
- // we're going to receive 2 EN_CHANGE notifications if we got any selection
- // (same problem as in DoWriteText())
- if ( selectionOnly && HasSelection() )
- {
- // so suppress one of them
- m_suppressNextUpdate = TRUE;
- }
+ // same problem as in DoWriteText(): we can get multiple events here
+ UpdatesCountFilter ucf(m_updatesCount);
::SendMessage(GetHwnd(), EM_STREAMIN,
SF_TEXT |
(selectionOnly ? SFF_SELECTION : 0),
(LPARAM)&eds);
+ // It's okay for EN_UPDATE to not be sent if the selection is empty and
+ // the text is empty, otherwise warn the programmer about it.
+ wxASSERT_MSG( ucf.GotUpdate() || ( !HasSelection() && value.empty() ),
+ _T("EM_STREAMIN didn't send EN_UPDATE?") );
+
if ( eds.dwError )
{
wxLogLastError(_T("EM_STREAMIN"));
free(wchBuf);
#endif // !wxUSE_WCHAR_T
- return TRUE;
+ return true;
}
#if !wxUSE_UNICODE_MSLU
#if wxUSE_RICHEDIT
// there are several complications with the rich edit controls here
- bool done = FALSE;
+ bool done = false;
if ( IsRich() )
{
// first, ensure that the new text will be in the default style
#endif // wxUSE_RICHEDIT
{
// in some cases we get 2 EN_CHANGE notifications after the SendMessage
- // call below which is confusing for the client code and so should be
- // avoided
- //
- // these cases are: (a) plain EDIT controls if EM_REPLACESEL is used
- // and there is a non empty selection currently and (b) rich text
- // controls in any case
- if (
-#if wxUSE_RICHEDIT
- IsRich() ||
-#endif // wxUSE_RICHEDIT
- (selectionOnly && HasSelection()) )
- {
- m_suppressNextUpdate = TRUE;
- }
+ // call (this happens for plain EDITs with EM_REPLACESEL and under some
+ // -- undetermined -- conditions with rich edit) and sometimes we don't
+ // get any events at all (plain EDIT with WM_SETTEXT), so ensure that
+ // we generate exactly one of them by ignoring all but the first one in
+ // SendUpdateEvent() and generating one ourselves if we hadn't got any
+ // notifications from Windows
+ UpdatesCountFilter ucf(m_updatesCount);
::SendMessage(GetHwnd(), selectionOnly ? EM_REPLACESEL : WM_SETTEXT,
- 0, (LPARAM)valueDos.c_str());
+ // EM_REPLACESEL takes 1 to indicate the operation should be redoable
+ selectionOnly ? 1 : 0, (LPARAM)valueDos.c_str());
- // OTOH, non rich text controls don't generate any events at all when
- // we use WM_SETTEXT -- have to emulate them here
- if ( !selectionOnly
-#if wxUSE_RICHEDIT
- && !IsRich()
-#endif // wxUSE_RICHEDIT
- )
+ if ( !ucf.GotUpdate() )
{
- // Windows already sends an update event for single-line
- // controls.
- if ( m_windowStyle & wxTE_MULTILINE )
- SendUpdateEvent();
+ SendUpdateEvent();
}
}
-
- AdjustSpaceLimit();
}
void wxTextCtrl::AppendText(const wxString& text)
WriteText(text);
#if wxUSE_RICHEDIT
- if ( IsMultiLine() && GetRichVersion() > 1 )
+ // don't do this if we're frozen, saves some time
+ if ( !IsFrozen() && IsMultiLine() && GetRichVersion() > 1 )
{
// setting the caret to the end and showing it simply doesn't work for
// RichEdit 2.0 -- force it to still do what we want
size_t lenOld = GetValue().length();
wxUint32 code = event.GetRawKeyCode();
- ::keybd_event(code, 0, 0 /* key press */, 0);
- ::keybd_event(code, 0, KEYEVENTF_KEYUP, 0);
+ ::keybd_event((BYTE)code, 0, 0 /* key press */, 0);
+ ::keybd_event((BYTE)code, 0, KEYEVENTF_KEYUP, 0);
// assume that any alphanumeric key changes the total number of characters
// in the control - this should work in 99% of cases
bool wxTextCtrl::CanPaste() const
{
if ( !IsEditable() )
- return FALSE;
+ return false;
#if wxUSE_RICHEDIT
if ( IsRich() )
// Standard edit control: check for straight text on clipboard
if ( !::OpenClipboard(GetHwndOf(wxTheApp->GetTopWindow())) )
- return FALSE;
+ return false;
bool isTextAvailable = ::IsClipboardFormatAvailable(CF_TEXT) != 0;
::CloseClipboard();
void wxTextCtrl::SetEditable(bool editable)
{
HWND hWnd = GetHwnd();
- SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
+ ::SendMessage(hWnd, EM_SETREADONLY, (WPARAM)!editable, (LPARAM)0L);
}
void wxTextCtrl::SetInsertionPoint(long pos)
// doing it results in horrible flicker when appending big amounts of text
// to the control in a few chunks (see DoAddText() test in the text sample)
if ( GetInsertionPoint() == GetLastPosition() )
+ {
return;
+ }
long pos;
CHARRANGE range;
range.cpMin = 0;
range.cpMax = 0;
- SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) &range);
+ ::SendMessage(GetHwnd(), EM_EXGETSEL, 0, (LPARAM) &range);
return range.cpMin;
}
#endif // wxUSE_RICHEDIT
- DWORD Pos = (DWORD)SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
+ DWORD Pos = (DWORD)::SendMessage(GetHwnd(), EM_GETSEL, 0, 0L);
return Pos & 0xFFFF;
}
-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const
{
int numLines = GetNumberOfLines();
long posStartLastLine = XYToPosition(0, numLines - 1);
// own Create() calls MSWGetStyle() which calls AcceptsFocus() which calls
// us
if ( !m_hWnd )
- return TRUE;
+ return true;
long style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
CHARRANGE range;
range.cpMin = from;
range.cpMax = to;
- SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range);
+ ::SendMessage(hWnd, EM_EXSETSEL, 0, (LPARAM) &range);
}
else
#endif // wxUSE_RICHEDIT
{
- SendMessage(hWnd, EM_SETSEL, (WPARAM)from, (LPARAM)to);
+ ::SendMessage(hWnd, EM_SETSEL, (WPARAM)from, (LPARAM)to);
}
- if ( scrollCaret )
+ if ( scrollCaret && !IsFrozen() )
{
#if wxUSE_RICHEDIT
// richedit 3.0 (i.e. the version living in riched20.dll distributed
// ES_DISABLENOSCROLL
//
// this is very ugly but I don't see any other way to make this work
+ long style = 0;
if ( GetRichVersion() > 1 )
{
if ( !HasFlag(wxTE_NOHIDESEL) )
{
+ // setting ECO_NOHIDESEL also sets WS_VISIBLE and possibly
+ // others, remember the style so we can reset it later if needed
+ style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
::SendMessage(GetHwnd(), EM_SETOPTIONS,
ECOOP_OR, ECO_NOHIDESEL);
}
}
#endif // wxUSE_RICHEDIT
- SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
+ ::SendMessage(hWnd, EM_SCROLLCARET, (WPARAM)0, (LPARAM)0);
#if wxUSE_RICHEDIT
// restore ECO_NOHIDESEL if we changed it
{
::SendMessage(GetHwnd(), EM_SETOPTIONS,
ECOOP_AND, ~ECO_NOHIDESEL);
+ if ( style != ::GetWindowLong(GetHwnd(), GWL_STYLE) )
+ ::SetWindowLong(GetHwnd(), GWL_STYLE, style);
}
#endif // wxUSE_RICHEDIT
}
// update the size limit if needed
AdjustSpaceLimit();
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// ----------------------------------------------------------------------------
void wxTextCtrl::Replace(long from, long to, const wxString& value)
{
// Set selection and remove it
- DoSetSelection(from, to, FALSE /* don't scroll caret into view */);
+ DoSetSelection(from, to, false /* don't scroll caret into view */);
- DoWriteText(value, TRUE /* selection only */);
+ DoWriteText(value, true /* selection only */);
}
void wxTextCtrl::Remove(long from, long to)
bool wxTextCtrl::IsModified() const
{
- return SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0;
+ return ::SendMessage(GetHwnd(), EM_GETMODIFY, 0, 0) != 0;
}
void wxTextCtrl::MarkDirty()
{
- SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0L);
+ ::SendMessage(GetHwnd(), EM_SETMODIFY, TRUE, 0L);
}
void wxTextCtrl::DiscardEdits()
{
- SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
+ ::SendMessage(GetHwnd(), EM_SETMODIFY, FALSE, 0L);
}
int wxTextCtrl::GetNumberOfLines() const
{
- return (int)SendMessage(GetHwnd(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
+ return (int)::SendMessage(GetHwnd(), EM_GETLINECOUNT, (WPARAM)0, (LPARAM)0);
}
// ----------------------------------------------------------------------------
long wxTextCtrl::XYToPosition(long x, long y) const
{
// This gets the char index for the _beginning_ of this line
- long charIndex = SendMessage(GetHwnd(), EM_LINEINDEX, (WPARAM)y, (LPARAM)0);
+ long charIndex = ::SendMessage(GetHwnd(), EM_LINEINDEX, (WPARAM)y, (LPARAM)0);
return charIndex + x;
}
#if wxUSE_RICHEDIT
if ( IsRich() )
{
- lineNo = SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, (LPARAM)pos);
+ lineNo = ::SendMessage(hWnd, EM_EXLINEFROMCHAR, 0, (LPARAM)pos);
}
else
#endif // wxUSE_RICHEDIT
{
- lineNo = SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0);
+ lineNo = ::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, 0);
}
if ( lineNo == -1 )
{
// no such line
- return FALSE;
+ return false;
}
// This gets the char index for the _beginning_ of this line
- long charIndex = SendMessage(hWnd, EM_LINEINDEX, (WPARAM)lineNo, (LPARAM)0);
+ long charIndex = ::SendMessage(hWnd, EM_LINEINDEX, (WPARAM)lineNo, (LPARAM)0);
if ( charIndex == -1 )
{
- return FALSE;
+ return false;
}
// The X position must therefore be the different between pos and charIndex
if ( y )
*y = lineNo;
- return TRUE;
+ return true;
}
wxTextCtrlHitTestResult
-wxTextCtrl::HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const
+wxTextCtrl::HitTest(const wxPoint& pt, long *posOut) const
{
// first get the position from Windows
LPARAM lParam;
lParam = MAKELPARAM(pt.x, pt.y);
}
- LRESULT pos = SendMessage(GetHwnd(), EM_CHARFROMPOS, 0, lParam);
+ LRESULT pos = ::SendMessage(GetHwnd(), EM_CHARFROMPOS, 0, lParam);
if ( pos == -1 )
{
// we don't know how to do it
if ( IsRich() )
{
- SendMessage(GetHwnd(), EM_POSFROMCHAR, (WPARAM)&ptReal, pos);
+ ::SendMessage(GetHwnd(), EM_POSFROMCHAR, (WPARAM)&ptReal, pos);
}
else
#endif // wxUSE_RICHEDIT
{
- LRESULT lRc = SendMessage(GetHwnd(), EM_POSFROMCHAR, pos, 0);
+ LRESULT lRc = ::SendMessage(GetHwnd(), EM_POSFROMCHAR, pos, 0);
if ( lRc == -1 )
{
else
rc = wxTE_HT_ON_TEXT;
- // finally translate to column/row
- if ( !PositionToXY(pos, col, row) )
- {
- wxFAIL_MSG( _T("PositionToXY() not expected to fail in HitTest()") );
- }
+ if ( posOut )
+ *posOut = pos;
return rc;
}
// ----------------------------------------------------------------------------
-//
+//
// ----------------------------------------------------------------------------
void wxTextCtrl::ShowPosition(long pos)
// Is this where scrolling is relative to - the line containing the caret?
// Or is the first visible line??? Try first visible line.
-// int currentLineLineNo1 = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0L);
+// int currentLineLineNo1 = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0L);
- int currentLineLineNo = (int)SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, (WPARAM)0, (LPARAM)0L);
+ int currentLineLineNo = (int)::SendMessage(hWnd, EM_GETFIRSTVISIBLELINE, (WPARAM)0, (LPARAM)0L);
- int specifiedLineLineNo = (int)SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0L);
+ int specifiedLineLineNo = (int)::SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)pos, (LPARAM)0L);
int linesToScroll = specifiedLineLineNo - currentLineLineNo;
if (linesToScroll != 0)
- (void)SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)linesToScroll);
+ (void)::SendMessage(hWnd, EM_LINESCROLL, (WPARAM)0, (LPARAM)linesToScroll);
}
long wxTextCtrl::GetLengthOfLineContainingPos(long pos) const
void wxTextCtrl::SetMaxLength(unsigned long len)
{
- ::SendMessage(GetHwnd(), EM_LIMITTEXT, len, 0);
+#if wxUSE_RICHEDIT
+ if ( IsRich() )
+ {
+ ::SendMessage(GetHwnd(), EM_EXLIMITTEXT, 0, len ? len : 0x7fffffff);
+ }
+ else
+#endif // wxUSE_RICHEDIT
+ {
+ if ( len >= 0xffff )
+ {
+ // this will set it to a platform-dependent maximum (much more
+ // than 64Kb under NT)
+ len = 0;
+ }
+
+ ::SendMessage(GetHwnd(), EM_LIMITTEXT, len, 0);
+ }
}
// ----------------------------------------------------------------------------
{
if (CanRedo())
{
+#if wxUSE_RICHEDIT
+ if (GetRichVersion() > 1)
+ ::SendMessage(GetHwnd(), EM_REDO, 0, 0);
+ else
+#endif
// Same as Undo, since Undo undoes the undo, i.e. a redo.
::SendMessage(GetHwnd(), EM_UNDO, 0, 0);
}
bool wxTextCtrl::CanRedo() const
{
+#if wxUSE_RICHEDIT
+ if (GetRichVersion() > 1)
+ return ::SendMessage(GetHwnd(), EM_CANREDO, 0, 0) != 0;
+ else
+#endif
return ::SendMessage(GetHwnd(), EM_CANUNDO, 0, 0) != 0;
}
if ( (HIWORD(msg->lParam) & KF_ALTDOWN) == KF_ALTDOWN )
{
if ( vkey == VK_BACK )
- return FALSE;
+ return false;
}
else // no Alt
{
case VK_DELETE:
case VK_HOME:
case VK_END:
- return FALSE;
+ return false;
}
}
else // Shift is pressed
{
if ( vkey == VK_INSERT || vkey == VK_DELETE )
- return FALSE;
+ return false;
}
}
}
switch ( event.GetKeyCode() )
{
case WXK_RETURN:
- if ( !HasFlag(wxTE_MULTILINE) )
{
wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER, m_windowId);
InitCommandEvent(event);
event.SetString(GetValue());
if ( GetEventHandler()->ProcessEvent(event) )
+ if ( !HasFlag(wxTE_MULTILINE) )
return;
+ //else: multiline controls need Enter for themselves
}
- //else: multiline controls need Enter for themselves
-
break;
case WXK_TAB:
{
if ( FindFocus() == this )
{
- if (Navigate(!event.ShiftDown(), event.ControlDown()))
+ int flags = 0;
+ if (!event.ShiftDown())
+ flags |= wxNavigationKeyEvent::IsForward ;
+ if (event.ControlDown())
+ flags |= wxNavigationKeyEvent::WinChange ;
+ if (Navigate(flags))
return;
}
}
// Insert tab since calling the default Windows handler
// doesn't seem to do it
WriteText(wxT("\t"));
+ return;
}
break;
}
bool wxTextCtrl::SendUpdateEvent()
{
- // is event reporting suspended?
- if ( m_suppressNextUpdate )
+ switch ( m_updatesCount )
{
- // do process the next one
- m_suppressNextUpdate = FALSE;
+ case 0:
+ // remember that we've got an update
+ m_updatesCount++;
+ break;
+
+ case 1:
+ // we had already sent one event since the last control modification
+ return false;
- return FALSE;
+ default:
+ wxFAIL_MSG( _T("unexpected wxTextCtrl::m_updatesCount value") );
+ // fall through
+
+ case -1:
+ // we hadn't updated the control ourselves, this event comes from
+ // the user, don't need to ignore it nor update the count
+ break;
}
wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
InitCommandEvent(event);
- event.SetString(GetValue());
return ProcessCommand(event);
}
// the other edit notification messages are not processed
default:
- return FALSE;
+ return false;
}
// processed
- return TRUE;
+ return true;
}
-WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
-#if wxUSE_CTL3D
- WXUINT message,
- WXWPARAM wParam,
- WXLPARAM lParam
-#else
- WXUINT WXUNUSED(message),
- WXWPARAM WXUNUSED(wParam),
- WXLPARAM WXUNUSED(lParam)
-#endif
- )
+WXHBRUSH wxTextCtrl::MSWControlColor(WXHDC hDC, WXHWND hWnd)
{
-#if wxUSE_CTL3D
- if ( m_useCtl3D )
- {
- HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
- return (WXHBRUSH) hbrush;
- }
-#endif // wxUSE_CTL3D
-
- HDC hdc = (HDC)pDC;
- wxColour colBack = GetBackgroundColour();
+ if ( !IsEnabled() && !HasFlag(wxTE_MULTILINE) )
+ return MSWControlColorDisabled(hDC);
- if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
- colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-
- ::SetBkColor(hdc, wxColourToRGB(colBack));
- ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
-
- wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
-
- return (WXHBRUSH)brush->GetResourceHandle();
+ return wxTextCtrlBase::MSWControlColor(hDC, hWnd);
}
-bool wxTextCtrl::AdjustSpaceLimit()
+bool wxTextCtrl::HasSpaceLimit(unsigned int *len) const
{
- unsigned int limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0);
-
// HACK: we try to automatically extend the limit for the amount of text
// to allow (interactively) entering more than 64Kb of text under
// Win9x but we shouldn't reset the text limit which was previously
// set explicitly with SetMaxLength()
//
- // we could solve this by storing the limit we set in wxTextCtrl but
- // to save space we prefer to simply test here the actual limit
- // value: we consider that SetMaxLength() can only be called for
- // values < 32Kb
- if ( limit < 0x8000 )
- {
- // we've got more text than limit set by SetMaxLength()
- return FALSE;
- }
+ // Unfortunately there is no EM_GETLIMITTEXTSETBYUSER and so we don't
+ // know the limit we set (if any). We could solve this by storing the
+ // limit we set in wxTextCtrl but to save space we prefer to simply
+ // test here the actual limit value: we consider that SetMaxLength()
+ // can only be called for small values while EN_MAXTEXT is only sent
+ // for large values (in practice the default limit seems to be 30000
+ // but make it smaller just to be on the safe side)
+ *len = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0);
+ return *len < 10001;
+
+}
+
+bool wxTextCtrl::AdjustSpaceLimit()
+{
+ unsigned int limit;
+ if ( HasSpaceLimit(&limit) )
+ return false;
unsigned int len = ::GetWindowTextLength(GetHwnd());
if ( len >= limit )
{
- limit = len + 0x8000; // 32Kb
-
-#if wxUSE_RICHEDIT
- if ( IsRich() )
- {
- // as a nice side effect, this also allows passing limit > 64Kb
- ::SendMessage(GetHwnd(), EM_EXLIMITTEXT, 0, limit);
- }
- else
-#endif // wxUSE_RICHEDIT
- {
- if ( limit > 0xffff )
- {
- // this will set it to a platform-dependent maximum (much more
- // than 64Kb under NT)
- limit = 0;
- }
-
- ::SendMessage(GetHwnd(), EM_LIMITTEXT, limit, 0);
- }
+ // increment in 32Kb chunks
+ SetMaxLength(len + 0x8000);
}
// we changed the limit
- return TRUE;
+ return true;
}
bool wxTextCtrl::AcceptsFocus() const
wxSize wxTextCtrl::DoGetBestSize() const
{
int cx, cy;
- wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+ wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
int wText = DEFAULT_ITEM_WIDTH;
int hText = cy;
if ( m_windowStyle & wxTE_MULTILINE )
{
- hText *= wxMax(GetNumberOfLines(), 5);
+ hText *= wxMax(wxMin(GetNumberOfLines(), 10), 2);
}
//else: for single line control everything is ok
event.Enable(GetLastPosition() > 0);
}
-void wxTextCtrl::OnRightClick(wxMouseEvent& event)
+void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
{
#if wxUSE_RICHEDIT
if (IsRich())
m_privateContextMenu->AppendSeparator();
m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
}
- PopupMenu(m_privateContextMenu, event.GetPosition());
+ PopupMenu(m_privateContextMenu);
return;
}
else
}
}
+// ----------------------------------------------------------------------------
+// Default colors for MSW text control
+//
+// Set default background color to the native white instead of
+// the default wxSYS_COLOUR_BTNFACE (is triggered with wxNullColour).
+// ----------------------------------------------------------------------------
+
+wxVisualAttributes wxTextCtrl::GetDefaultAttributes() const
+{
+ wxVisualAttributes attrs;
+ attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+ attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+ attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW); //white
+
+ return attrs;
+}
+
// the rest of the file only deals with the rich edit controls
#if wxUSE_RICHEDIT
}
}
- // return TRUE to process the event (and FALSE to ignore it)
- return TRUE;
+ // return true to process the event (and false to ignore it)
+ return true;
case EN_LINK:
{
case WM_SETCURSOR:
// ok, so it is hardcoded - do we really nee to
// customize it?
- ::SetCursor(GetHcursorOf(wxCursor(wxCURSOR_HAND)));
- *result = TRUE;
- break;
+ {
+ wxCursor cur(wxCURSOR_HAND);
+ ::SetCursor(GetHcursorOf(cur));
+ *result = TRUE;
+ break;
+ }
case WM_MOUSEMOVE:
case WM_LBUTTONDOWN:
break;
}
}
- return TRUE;
+ return true;
}
// not processed, leave it to the base class
if ( !wxTextCtrlBase::SetBackgroundColour(colour) )
{
// colour didn't really change
- return FALSE;
+ return false;
}
if ( IsRich() )
::SendMessage(GetHwnd(), EM_SETBKGNDCOLOR, 0, wxColourToRGB(colour));
}
- return TRUE;
+ return true;
}
bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
if ( !wxTextCtrlBase::SetForegroundColour(colour) )
{
// colour didn't really change
- return FALSE;
+ return false;
}
if ( IsRich() )
::SendMessage(GetHwnd(), EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
if ( !IsRich() )
{
// can't do it with normal text control
- return FALSE;
+ return false;
}
// the richedit 1.0 doesn't handle setting background colour, so don't
!style.HasLeftIndent() && !style.HasRightIndent() && !style.HasAlignment() &&
!style.HasTabs() )
{
- // nothing to do: return TRUE if there was really nothing to do and
- // FALSE if we failed to set bg colour
+ // nothing to do: return true if there was really nothing to do and
+ // false if we failed to set bg colour
return !style.HasBackgroundColour();
}
if ( changeSel )
{
- DoSetSelection(start, end, FALSE /* don't scroll caret into view */);
+ DoSetSelection(start, end, false /* don't scroll caret into view */);
}
// initialize CHARFORMAT struct
const wxArrayInt& tabs = style.GetTabs();
- pf.cTabCount = wxMin(tabs.GetCount(), MAX_TAB_STOPS);
+ pf.cTabCount = (SHORT)wxMin(tabs.GetCount(), MAX_TAB_STOPS);
size_t i;
for (i = 0; i < (size_t) pf.cTabCount; i++)
{
if ( changeSel )
{
// restore the original selection
- DoSetSelection(startOld, endOld, FALSE);
+ DoSetSelection(startOld, endOld, false);
}
return ok;
bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
{
if ( !wxTextCtrlBase::SetDefaultStyle(style) )
- return FALSE;
+ return false;
- // we have to do this or the style wouldn't apply for the text typed by the
- // user
- long posLast = GetLastPosition();
- SetStyle(posLast, posLast, m_defaultStyle);
+ if ( IsEditable() )
+ {
+ // we have to do this or the style wouldn't apply for the text typed by
+ // the user
+ wxTextPos posLast = GetLastPosition();
+ SetStyle(posLast, posLast, m_defaultStyle);
+ }
- return TRUE;
+ return true;
}
bool wxTextCtrl::GetStyle(long position, wxTextAttr& style)
if ( !IsRich() )
{
// can't do it with normal text control
- return FALSE;
+ return false;
}
// initialize CHARFORMAT struct
if ( changeSel )
{
- DoSetSelection(position, position, FALSE /* don't scroll caret into view */);
+ DoSetSelection(position, position+1, false /* don't scroll caret into view */);
}
// get the selection formatting
(void) ::SendMessage(GetHwnd(), EM_GETCHARFORMAT,
SCF_SELECTION, (LPARAM)&cf) ;
+
LOGFONT lf;
lf.lfHeight = cf.yHeight;
lf.lfWidth = 0;
lf.lfClipPrecision = 0;
lf.lfEscapement = 0;
wxStrcpy(lf.lfFaceName, cf.szFaceName);
+
+ //NOTE: we _MUST_ set each of these values to _something_ since we
+ //do not call wxZeroMemory on the LOGFONT lf
if (cf.dwEffects & CFE_ITALIC)
lf.lfItalic = TRUE;
+ else
+ lf.lfItalic = FALSE;
+
lf.lfOrientation = 0;
lf.lfPitchAndFamily = cf.bPitchAndFamily;
lf.lfQuality = 0;
+
if (cf.dwEffects & CFE_STRIKEOUT)
lf.lfStrikeOut = TRUE;
+ else
+ lf.lfStrikeOut = FALSE;
+
if (cf.dwEffects & CFE_UNDERLINE)
lf.lfUnderline = TRUE;
+ else
+ lf.lfUnderline = FALSE;
+
if (cf.dwEffects & CFE_BOLD)
lf.lfWeight = FW_BOLD;
+ else
+ lf.lfWeight = FW_NORMAL;
wxFont font = wxCreateFontFromLogFont(& lf);
if (font.Ok())
if ( changeSel )
{
// restore the original selection
- DoSetSelection(startOld, endOld, FALSE);
+ DoSetSelection(startOld, endOld, false);
}
- return TRUE;
+ return true;
}
#endif
// wxRichEditModule
// ----------------------------------------------------------------------------
+static const HINSTANCE INVALID_HINSTANCE = (HINSTANCE)-1;
+
bool wxRichEditModule::OnInit()
{
// don't do anything - we will load it when needed
- return TRUE;
+ return true;
}
void wxRichEditModule::OnExit()
{
for ( size_t i = 0; i < WXSIZEOF(ms_hRichEdit); i++ )
{
- if ( ms_hRichEdit[i] )
+ if ( ms_hRichEdit[i] && ms_hRichEdit[i] != INVALID_HINSTANCE )
{
::FreeLibrary(ms_hRichEdit[i]);
ms_hRichEdit[i] = NULL;
}
}
+#if wxUSE_INKEDIT
+ if (ms_inkEditLib.IsLoaded())
+ ms_inkEditLib.Unload();
+#endif
}
/* static */
-bool wxRichEditModule::Load(int version)
+bool wxRichEditModule::Load(Version version)
{
- // we don't support loading richedit 3.0 as I don't know how to distinguish
- // it from 2.0 anyhow
- wxCHECK_MSG( version == 1 || version == 2, FALSE,
- _T("incorrect richedit control version requested") );
-
- // make it the index in the array
- version--;
-
- if ( ms_hRichEdit[version] == (HINSTANCE)-1 )
+ if ( ms_hRichEdit[version] == INVALID_HINSTANCE )
{
// we had already tried to load it and failed
- return FALSE;
+ return false;
}
if ( ms_hRichEdit[version] )
{
// we've already got this one
- return TRUE;
+ return true;
}
- wxString dllname = version ? _T("riched20") : _T("riched32");
- dllname += _T(".dll");
+ static const wxChar *dllnames[] =
+ {
+ _T("riched32"),
+ _T("riched20"),
+ _T("msftedit"),
+ };
+
+ wxCOMPILE_TIME_ASSERT( WXSIZEOF(dllnames) == Version_Max,
+ RichEditDllNamesVersionsMismatch );
- ms_hRichEdit[version] = ::LoadLibrary(dllname);
+ ms_hRichEdit[version] = ::LoadLibrary(dllnames[version]);
if ( !ms_hRichEdit[version] )
{
- wxLogSysError(_("Could not load Rich Edit DLL '%s'"), dllname.c_str());
+ ms_hRichEdit[version] = INVALID_HINSTANCE;
- ms_hRichEdit[version] = (HINSTANCE)-1;
-
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
+#if wxUSE_INKEDIT
+// load the InkEdit library
+bool wxRichEditModule::LoadInkEdit()
+{
+ static wxDynamicLibrary ms_inkEditLib;
+ static bool ms_inkEditLibLoadAttemped;
+ if (ms_inkEditLibLoadAttemped)
+ ms_inkEditLib.IsLoaded();
+
+ ms_inkEditLibLoadAttemped = true;
+
+ wxLogNull logNull;
+ return ms_inkEditLib.Load(wxT("inked"));
+}
+#endif
+
+
#endif // wxUSE_RICHEDIT
-#endif // wxUSE_TEXTCTRL
+#endif // wxUSE_TEXTCTRL && !(__SMARTPHONE__ && __WXWINCE__)
projects / wxWidgets.git / blobdiff