X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/105fbe1ffa8968cb85fd2cac7192957e522d17ba..f675b4f521c6696648674d8901e2d6162ab5e2fb:/src/motif/textctrl.cpp

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 1fd22c3af5..4cd726bc04 100644
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -94,7 +90,7 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba
 // Text item
 wxTextCtrl::wxTextCtrl()
 {
-    m_tempCallbackStruct = (void*) NULL;
+    m_tempCallbackStruct = NULL;
     m_modified = false;
     m_processedDefault = false;
 }
@@ -112,7 +108,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
         return false;
     PreCreation();
 
-    m_tempCallbackStruct = (void*) NULL;
+    m_tempCallbackStruct = NULL;
     m_modified = false;
     m_processedDefault = false;
 
@@ -138,14 +134,14 @@ bool wxTextCtrl::Create(wxWindow *parent,
             XtSetArg (args[count], (String) wxFont::GetFontTag(),
                       m_font.GetFontType( XtDisplay(parentWidget) ) ); ++count;
         XtSetArg (args[count], XmNwordWrap, wantWordWrap); ++count;
-        XtSetArg (args[count], XmNvalue, value.mb_str()); ++count;
+        XtSetArg (args[count], XmNvalue, (const char*)value.mb_str()); ++count;
         XtSetArg (args[count], XmNeditable,
                   style & wxTE_READONLY ? False : True); ++count;
         XtSetArg (args[count], XmNeditMode, XmMULTI_LINE_EDIT ); ++count;
 
         m_mainWidget =
             (WXWidget) XmCreateScrolledText(parentWidget,
-                                            wxConstCast(name.mb_str(), char),
+                                            name.char_str(),
                                             args, count);
 
         XtManageChild ((Widget) m_mainWidget);
@@ -154,11 +150,11 @@ bool wxTextCtrl::Create(wxWindow *parent,
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (
-                                  wxConstCast(name.mb_str(), char),
+                                  name.mb_str(),
                                   xmTextWidgetClass,
                                   parentWidget,
                                   wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
-                                  XmNvalue, value.mb_str(),
+                                  XmNvalue, (const char*)value.mb_str(),
                                   XmNeditable, (style & wxTE_READONLY) ?
                                       False : True,
                                   NULL
@@ -219,14 +215,7 @@ wxString wxTextCtrl::GetValue() const
     }
     else
     {
-        // just get the string from Motif
-        char *s = XmTextGetString ((Widget) m_mainWidget);
-        if ( s )
-        {
-            str = s;
-            XtFree (s);
-        }
-        //else: return empty string
+        str = wxTextEntry::GetValue();
 
         if ( m_tempCallbackStruct )
         {
@@ -243,7 +232,7 @@ void wxTextCtrl::DoSetValue(const wxString& text, int flags)
 {
     m_inSetValue = true;
 
-    XmTextSetString ((Widget) m_mainWidget, wxConstCast(text.mb_str(), char));
+    XmTextSetString ((Widget) m_mainWidget, text.char_str());
     XtVaSetValues ((Widget) m_mainWidget,
                    XmNcursorPosition, text.length(),
                    NULL);
@@ -258,159 +247,6 @@ void wxTextCtrl::DoSetValue(const wxString& text, int flags)
         SendTextUpdatedEvent();
 }
 
-// Clipboard operations
-void wxTextCtrl::Copy()
-{
-    XmTextCopy((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxTextCtrl::Cut()
-{
-    XmTextCut((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxTextCtrl::Paste()
-{
-    XmTextPaste((Widget) m_mainWidget);
-}
-
-bool wxTextCtrl::CanCopy() const
-{
-    // Can copy if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) ;
-}
-
-bool wxTextCtrl::CanCut() const
-{
-    // Can cut if there's a selection
-    long from, to;
-    GetSelection(& from, & to);
-    return (from != to) && (IsEditable());
-}
-
-bool wxTextCtrl::CanPaste() const
-{
-    return IsEditable() ;
-}
-
-// Undo/redo
-void wxTextCtrl::Undo()
-{
-    // Not possible in Motif
-}
-
-void wxTextCtrl::Redo()
-{
-    // Not possible in Motif
-}
-
-bool wxTextCtrl::CanUndo() const
-{
-    // No Undo in Motif
-    return false;
-}
-
-bool wxTextCtrl::CanRedo() const
-{
-    // No Redo in Motif
-    return false;
-}
-
-// If the return values from and to are the same, there is no
-// selection.
-void wxTextCtrl::GetSelection(long* from, long* to) const
-{
-    XmTextPosition left, right;
-
-    XmTextGetSelectionPosition((Widget) m_mainWidget, & left, & right);
-
-    *from = (long) left;
-    *to = (long) right;
-}
-
-bool wxTextCtrl::IsEditable() const
-{
-    return (XmTextGetEditable((Widget) m_mainWidget) != 0);
-}
-
-void wxTextCtrl::SetEditable(bool editable)
-{
-    XmTextSetEditable((Widget) m_mainWidget, (Boolean) editable);
-}
-
-void wxTextCtrl::SetInsertionPoint(long pos)
-{
-    XmTextSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) pos);
-}
-
-void wxTextCtrl::SetInsertionPointEnd()
-{
-    wxTextPos pos = GetLastPosition();
-    SetInsertionPoint(pos);
-}
-
-long wxTextCtrl::GetInsertionPoint() const
-{
-    return (long) XmTextGetInsertionPosition ((Widget) m_mainWidget);
-}
-
-wxTextPos wxTextCtrl::GetLastPosition() const
-{
-    return (long) XmTextGetLastPosition ((Widget) m_mainWidget);
-}
-
-void wxTextCtrl::Replace(long from, long to, const wxString& value)
-{
-    XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-        wxConstCast(value.mb_str(), char));
-}
-
-void wxTextCtrl::Remove(long from, long to)
-{
-    XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                      (Time) 0);
-    XmTextRemove ((Widget) m_mainWidget);
-}
-
-void wxTextCtrl::SetSelection(long from, long to)
-{
-    if( to == -1 )
-        to = GetLastPosition();
-
-    XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                      (Time) 0);
-}
-
-void wxTextCtrl::WriteText(const wxString& text)
-{
-    long textPosition = GetInsertionPoint() + text.length();
-    XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(),
-                  wxConstCast(text.mb_str(), char));
-    XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
-    SetInsertionPoint(textPosition);
-    XmTextShowPosition ((Widget) m_mainWidget, textPosition);
-    m_modified = true;
-}
-
-void wxTextCtrl::AppendText(const wxString& text)
-{
-    wxTextPos textPosition = GetLastPosition() + text.length();
-    XmTextInsert ((Widget) m_mainWidget, GetLastPosition(),
-                  wxConstCast(text.mb_str(), char));
-    XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
-    SetInsertionPoint(textPosition);
-    XmTextShowPosition ((Widget) m_mainWidget, textPosition);
-    m_modified = true;
-}
-
-void wxTextCtrl::Clear()
-{
-    XmTextSetString ((Widget) m_mainWidget, wxMOTIF_STR(""));
-    m_modified = false;
-}
-
 bool wxTextCtrl::IsModified() const
 {
     return m_modified;
@@ -551,7 +387,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         XmTextVerifyCallbackStruct *textStruct =
             (XmTextVerifyCallbackStruct *) m_tempCallbackStruct;
         textStruct->doit = True;
-        if (isascii(event.m_keyCode) && (textStruct->text->length == 1))
+        if (wxIsascii(event.m_keyCode) && (textStruct->text->length == 1))
         {
             textStruct->text->ptr[0] = (char)((event.m_keyCode == WXK_RETURN) ? 10 : event.m_keyCode);
         }
@@ -631,7 +467,7 @@ void wxTextCtrl::DoSendEvents(void *wxcbs, long keycode)
     // the character passed through)
     cbs->doit = False;
 
-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);
 
     if ( !InSetValue() && m_processedDefault )
     {
@@ -827,7 +663,7 @@ wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
     event.SetEventObject(tw);
-    tw->GetEventHandler()->ProcessEvent(event);
+    tw->HandleWindowEvent(event);
 }
 
 static void
@@ -839,7 +675,7 @@ wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_KILL_FOCUS, tw->GetId());
     event.SetEventObject(tw);
-    tw->GetEventHandler()->ProcessEvent(event);
+    tw->HandleWindowEvent(event);
 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,