move code ignoring VK_SPACE and VK_RETURN WM_CHAR messages to MSWDefWindowProc()...

[wxWidgets.git] / src / common / textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 541c5732da5ec23ffb1543c3e766688563762006..977de53640d86688e1414db8ecf5fce69ae8e4cb 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -53,18 +53,6 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_ENTER)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_URL)
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_MAXLEN)
 

-// ----------------------------------------------------------------------------
-// ctor
-// ----------------------------------------------------------------------------
-
-wxTextCtrlBase::wxTextCtrlBase()
-{
-}
-
-wxTextCtrlBase::~wxTextCtrlBase()
-{
-}
-

 // ----------------------------------------------------------------------------
 // style functions - not implemented here
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // style functions - not implemented here
 // ----------------------------------------------------------------------------


@@ -232,7 +220,7 @@ bool wxTextCtrlBase::LoadFile(const wxString& filename)
 
 bool wxTextCtrlBase::SaveFile(const wxString& filename)
 {
 
 bool wxTextCtrlBase::SaveFile(const wxString& filename)
 {

-    wxString filenameToUse = filename.IsEmpty() ? m_filename : filename;
+    wxString filenameToUse = filename.empty() ? m_filename : filename;

     if ( filenameToUse.empty() )
     {
         // what kind of message to give? is it an error or a program bug?
     if ( filenameToUse.empty() )
     {
         // what kind of message to give? is it an error or a program bug?


@@ -406,9 +394,8 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
         case WXK_NUMPAD_DELETE:
             // delete the character at cursor
             {
         case WXK_NUMPAD_DELETE:
             // delete the character at cursor
             {

-                const long pos = GetInsertionPoint(),
-                           last = GetLastPosition();
-                if ( pos < last )
+                const long pos = GetInsertionPoint();
+                if ( pos < GetLastPosition() )

                     Remove(pos, pos + 1);
             }
             break;
                     Remove(pos, pos + 1);
             }
             break;


@@ -423,6 +410,13 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
             break;
 
         default:
             break;
 
         default:

+#if wxUSE_UNICODE
+            if ( event.GetUnicodeKey() )
+            {
+                ch = event.GetUnicodeKey();
+            }
+            else
+#endif

             if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
             {
                 // FIXME this is not going to work for non letters...
             if ( keycode < 256 && keycode >= 0 && wxIsprint(keycode) )
             {
                 // FIXME this is not going to work for non letters...