Fix interface definition of GetMouseCursorAt

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index ef011a5056cb6e140e087dc82b23b38a477a35a8..03514e834d31e70b27cfef25bb4ee91d0985115b 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -20,20 +20,18 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtParent XTPARENT
-#endif
-
-#include "wx/defs.h"
-

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include "wx/textctrl.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
 #include "wx/textctrl.h"

-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+#endif
+

 #include "wx/filefn.h"
 #include "wx/filefn.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -61,9 +59,7 @@ static void wxTextWindowGainFocusProc(Widget w, XtPointer clientData, XmAnyCallb
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 
 static void wxTextWindowLoseFocusProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs);
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallbackStruct *ptr);
 

-    IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-
-    BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
+    BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)

         EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         EVT_CHAR(wxTextCtrl::OnChar)
 
         EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
         EVT_CHAR(wxTextCtrl::OnChar)
 


@@ -92,7 +88,7 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba
 // Text item
 wxTextCtrl::wxTextCtrl()
 {
 // Text item
 wxTextCtrl::wxTextCtrl()
 {

-    m_tempCallbackStruct = (void*) NULL;
+    m_tempCallbackStruct = NULL;

     m_modified = false;
     m_processedDefault = false;
 }
     m_modified = false;
     m_processedDefault = false;
 }


@@ -108,13 +104,12 @@ bool wxTextCtrl::Create(wxWindow *parent,
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;

+    PreCreation();

 
 

-    m_tempCallbackStruct = (void*) NULL;
+    m_tempCallbackStruct = NULL;

     m_modified = false;
     m_processedDefault = false;
 
     m_modified = false;
     m_processedDefault = false;
 

-    m_backgroundColour = *wxWHITE;
-

     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Bool wantHorizScroll = (m_windowStyle & wxHSCROLL) != 0 ? True : False;
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Bool wantHorizScroll = (m_windowStyle & wxHSCROLL) != 0 ? True : False;


@@ -133,17 +128,18 @@ bool wxTextCtrl::Create(wxWindow *parent,
         Arg args[8];
         int count = 0;
         XtSetArg (args[count], XmNscrollHorizontal, wantHorizScroll); ++count;
         Arg args[8];
         int count = 0;
         XtSetArg (args[count], XmNscrollHorizontal, wantHorizScroll); ++count;

-        XtSetArg (args[count], (String) wxFont::GetFontTag(),
-                  m_font.GetFontType( XtDisplay(parentWidget) ) ); ++count;
+        if( m_font.IsOk() )
+            XtSetArg (args[count], (String) wxFont::GetFontTag(),
+                      m_font.GetFontType( XtDisplay(parentWidget) ) ); ++count;

         XtSetArg (args[count], XmNwordWrap, wantWordWrap); ++count;
         XtSetArg (args[count], XmNwordWrap, wantWordWrap); ++count;

-        XtSetArg (args[count], XmNvalue, value.c_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,
         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.c_str(), char),
+                                            name.char_str(),

                                             args, count);
 
         XtManageChild ((Widget) m_mainWidget);
                                             args, count);
 
         XtManageChild ((Widget) m_mainWidget);


@@ -152,11 +148,11 @@ bool wxTextCtrl::Create(wxWindow *parent,
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (

-                                  wxConstCast(name.c_str(), char),
+                                  name.mb_str(),

                                   xmTextWidgetClass,
                                   parentWidget,
                                   wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
                                   xmTextWidgetClass,
                                   parentWidget,
                                   wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),

-                                  XmNvalue, value.c_str(),
+                                  XmNvalue, (const char*)value.mb_str(),

                                   XmNeditable, (style & wxTE_READONLY) ?
                                       False : True,
                                   NULL
                                   XmNeditable, (style & wxTE_READONLY) ?
                                       False : True,
                                   NULL


@@ -165,8 +161,8 @@ bool wxTextCtrl::Create(wxWindow *parent,
 #if 0
         // TODO: Is this relevant? What does it do?
         int noCols = 2;
 #if 0
         // TODO: Is this relevant? What does it do?
         int noCols = 2;

-        if (!value.IsNull() && (value.Length() > (unsigned int) noCols))
-            noCols = value.Length();
+        if (!value.empty() && (value.length() > (unsigned int) noCols))
+            noCols = value.length();

         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);
         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);


@@ -192,11 +188,10 @@ bool wxTextCtrl::Create(wxWindow *parent,
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 

+    PostCreation();

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, size.x, size.y);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, size.x, size.y);
 

-    ChangeBackgroundColour();
-

     return true;
 }
 
     return true;
 }
 


@@ -218,14 +213,7 @@ wxString wxTextCtrl::GetValue() const
     }
     else
     {
     }
     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 )
         {
 
         if ( m_tempCallbackStruct )
         {


@@ -238,11 +226,11 @@ wxString wxTextCtrl::GetValue() const
     return str;
 }
 
     return str;
 }
 

-void wxTextCtrl::SetValue(const wxString& text)
+void wxTextCtrl::DoSetValue(const wxString& text, int flags)

 {
     m_inSetValue = true;
 
 {
     m_inSetValue = true;
 

-    XmTextSetString ((Widget) m_mainWidget, wxConstCast(text.c_str(), char));
+    XmTextSetString ((Widget) m_mainWidget, text.char_str());

     XtVaSetValues ((Widget) m_mainWidget,
                    XmNcursorPosition, text.length(),
                    NULL);
     XtVaSetValues ((Widget) m_mainWidget,
                    XmNcursorPosition, text.length(),
                    NULL);


@@ -252,159 +240,9 @@ void wxTextCtrl::SetValue(const wxString& text)
     m_modified = true;
 
     m_inSetValue = false;
     m_modified = true;
 
     m_inSetValue = false;

-}
-
-// 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.c_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.c_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.c_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;
+    if ( flags & SetValue_SendEvent )
+        SendTextUpdatedEvent();

 }
 
 bool wxTextCtrl::IsModified() const
 }
 
 bool wxTextCtrl::IsModified() const


@@ -488,7 +326,7 @@ void wxTextCtrl::ShowPosition(long pos)
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);
 int wxTextCtrl::GetLineLength(long lineNo) const
 {
     wxString str = GetLineText (lineNo);

-    return (int) str.Length();
+    return (int) str.length();

 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const
 }
 
 wxString wxTextCtrl::GetLineText(long lineNo) const


@@ -547,7 +385,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
         XmTextVerifyCallbackStruct *textStruct =
             (XmTextVerifyCallbackStruct *) m_tempCallbackStruct;
         textStruct->doit = True;
         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);
         }
         {
             textStruct->text->ptr[0] = (char)((event.m_keyCode == WXK_RETURN) ? 10 : event.m_keyCode);
         }


@@ -627,12 +465,12 @@ void wxTextCtrl::DoSendEvents(void *wxcbs, long keycode)
     // the character passed through)
     cbs->doit = False;
 
     // the character passed through)
     cbs->doit = False;
 

-    GetEventHandler()->ProcessEvent(event);
+    HandleWindowEvent(event);

 
     if ( !InSetValue() && m_processedDefault )
     {
         // Can generate a command
 
     if ( !InSetValue() && m_processedDefault )
     {
         // Can generate a command

-        wxCommandEvent commandEvent(wxEVT_COMMAND_TEXT_UPDATED, GetId());
+        wxCommandEvent commandEvent(wxEVT_TEXT, GetId());

         commandEvent.SetEventObject(this);
         ProcessCommand(commandEvent);
     }
         commandEvent.SetEventObject(this);
         ProcessCommand(commandEvent);
     }


@@ -662,8 +500,8 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
     int x, y;
     window->GetTextExtent( value, &x, &y );
 
     int x, y;
     window->GetTextExtent( value, &x, &y );
 

-    if( x < 100 )
-        x = 100;
+    if( x < 90 )
+        x = 90;

 
     return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
                    // MBN: +2 necessary: Lesstif bug or mine?
 
     return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
                    // MBN: +2 necessary: Lesstif bug or mine?


@@ -675,10 +513,16 @@ wxSize wxTextCtrl::DoGetBestSize() const
     if( IsSingleLine() )
     {
         wxSize best = wxControl::DoGetBestSize();
     if( IsSingleLine() )
     {
         wxSize best = wxControl::DoGetBestSize();

-
-        if( best.x < 110 ) best.x = 110;
+#if wxCHECK_MOTIF_VERSION( 2, 3 )
+        // OpenMotif 2.3 gives way too big X sizes
+        wxSize other_best = wxDoGetSingleTextCtrlBestSize
+                                ( (Widget) GetTopWidget(), this );
+        return wxSize( other_best.x, best.y );
+#else
+        if( best.x < 90 ) best.x = 90;

 
         return best;
 
         return best;

+#endif

     }
     else
         return wxWindow::DoGetBestSize();
     }
     else
         return wxWindow::DoGetBestSize();


@@ -817,7 +661,7 @@ wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
     event.SetEventObject(tw);
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_SET_FOCUS, tw->GetId());
     event.SetEventObject(tw);

-    tw->GetEventHandler()->ProcessEvent(event);
+    tw->HandleWindowEvent(event);

 }
 
 static void
 }
 
 static void


@@ -829,7 +673,7 @@ wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     wxFocusEvent event(wxEVT_KILL_FOCUS, tw->GetId());
     event.SetEventObject(tw);
     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,
 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,


@@ -843,7 +687,7 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
     if (tw->InSetValue())
         return;
 
     if (tw->InSetValue())
         return;
 

-    wxCommandEvent event(wxEVT_COMMAND_TEXT_ENTER);
+    wxCommandEvent event(wxEVT_TEXT_ENTER);

     event.SetId(tw->GetId());
     event.SetEventObject(tw);
     tw->ProcessCommand(event);
     event.SetId(tw->GetId());
     event.SetEventObject(tw);
     tw->ProcessCommand(event);