no message

[wxWidgets.git] / src / msw / textctrl.cpp

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 162933d4c1471f6e085f39a3c398e60dd76ecd98..c23b395533ab88bb1fcf3ff5c77aded55ed85e3b 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -58,7 +58,7 @@
 #   include <fstream>
 #endif
 
 #   include <fstream>
 #endif
 

-#if wxUSE_RICHEDIT && (!defined(__GNUWIN32__) || defined(wxUSE_NORLANDER_HEADERS))
+#if wxUSE_RICHEDIT && !defined(__GNUWIN32_OLD__)

     #include <richedit.h>
 #endif
 
     #include <richedit.h>
 #endif
 


@@ -175,8 +175,6 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     if (m_windowStyle & wxTE_READONLY)
         msStyle |= ES_READONLY;
 
     if (m_windowStyle & wxTE_READONLY)
         msStyle |= ES_READONLY;
 

-    if (m_windowStyle & wxHSCROLL)
-        msStyle |= (WS_HSCROLL | ES_AUTOHSCROLL);

     if (m_windowStyle & wxTE_PASSWORD) // hidden input
         msStyle |= ES_PASSWORD;
 
     if (m_windowStyle & wxTE_PASSWORD) // hidden input
         msStyle |= ES_PASSWORD;
 


@@ -237,7 +235,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
 #ifndef RICHEDIT_CLASS
                 wxString RICHEDIT_CLASS;
                 RICHEDIT_CLASS.Printf(_T("RichEdit%d0"), ver);
 #ifndef RICHEDIT_CLASS
                 wxString RICHEDIT_CLASS;
                 RICHEDIT_CLASS.Printf(_T("RichEdit%d0"), ver);

-#ifdef wxUSE_UNICODE
+#if wxUSE_UNICODE

                 RICHEDIT_CLASS += _T('W');
 #else // ANSI
                 RICHEDIT_CLASS += _T('A');
                 RICHEDIT_CLASS += _T('W');
 #else // ANSI
                 RICHEDIT_CLASS += _T('A');


@@ -264,7 +262,7 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     //     might be -1 in which case we should use the default values (and
     //     SetSize called below takes care of it)
     m_hWnd = (WXHWND)::CreateWindowEx(exStyle,
     //     might be -1 in which case we should use the default values (and
     //     SetSize called below takes care of it)
     m_hWnd = (WXHWND)::CreateWindowEx(exStyle,

-                                      windowClass,
+                                      windowClass.c_str(),

                                       NULL,
                                       msStyle,
                                       0, 0, 0, 0,
                                       NULL,
                                       msStyle,
                                       0, 0, 0, 0,


@@ -353,10 +351,8 @@ void wxTextCtrl::AdoptAttributesFromHWND()
 
 void wxTextCtrl::SetupColours()
 {
 
 void wxTextCtrl::SetupColours()
 {

-    // FIXME why is bg colour not inherited from parent?
-

     wxColour bkgndColour;
     wxColour bkgndColour;

-    if (IsEditable())
+    if (IsEditable() || (m_windowStyle & wxTE_MULTILINE))

         bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
     else
         bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
         bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
     else
         bkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);


@@ -376,9 +372,9 @@ wxString wxTextCtrl::GetValue() const
 #if wxUSE_RICHEDIT
     if ( m_isRich )
     {
 #if wxUSE_RICHEDIT
     if ( m_isRich )
     {

-        wxString str;
-

         int len = GetWindowTextLength(GetHwnd()) + 1;
         int len = GetWindowTextLength(GetHwnd()) + 1;

+
+        wxString str;

         wxChar *p = str.GetWriteBuf(len);
 
         TEXTRANGE textRange;
         wxChar *p = str.GetWriteBuf(len);
 
         TEXTRANGE textRange;


@@ -420,8 +416,8 @@ void wxTextCtrl::SetValue(const wxString& value)
     if ( (value.length() > 0x400) || (value != GetValue()) )
     {
         wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);
     if ( (value.length() > 0x400) || (value != GetValue()) )
     {
         wxString valueDos = wxTextFile::Translate(value, wxTextFileType_Dos);

-
-        SetWindowText(GetHwnd(), valueDos);
+                               
+        SetWindowText(GetHwnd(), valueDos.c_str());

 
         AdjustSpaceLimit();
     }
 
         AdjustSpaceLimit();
     }


@@ -895,30 +891,19 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
             // ourselves the fact that we got here means that the user code
             // decided to skip processing of this TAB - probably to let it
             // do its default job.
             // ourselves the fact that we got here means that the user code
             // decided to skip processing of this TAB - probably to let it
             // do its default job.

-            //
-            // NB: Notice that Ctrl-Tab is handled elsewhere and Alt-Tab is
-            //     handled by Windows

             {
                 wxNavigationKeyEvent eventNav;
                 eventNav.SetDirection(!event.ShiftDown());
             {
                 wxNavigationKeyEvent eventNav;
                 eventNav.SetDirection(!event.ShiftDown());

-                eventNav.SetWindowChange(FALSE);
+                eventNav.SetWindowChange(event.ControlDown());

                 eventNav.SetEventObject(this);
 
                 eventNav.SetEventObject(this);
 

-                if ( GetEventHandler()->ProcessEvent(eventNav) )
+                if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )

                     return;
             }
             break;
                     return;
             }
             break;

-
-        default:
-            event.Skip();
-            return;

     }
 
     }
 

-    // don't just call event.Skip() because this will cause TABs and ENTERs
-    // be passed upwards and we don't always want this - instead process it
-    // right here
-
-    // FIXME
+    // no, we didn't process it

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -940,11 +925,9 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
         case EN_CHANGE:
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);
         case EN_CHANGE:
             {
                 wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, m_windowId);

-                wxString val(GetValue());
-                if ( !val.IsNull() )
-                    event.m_commandString = WXSTRINGCAST val;

                 event.SetEventObject( this );
                 event.SetEventObject( this );

-                ProcessCommand(event);
+                event.SetString( GetValue() );
+                ProcessCommand( event );

             }
             break;
 
             }
             break;