compilation fix for systems with XtIMSignal

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 97b5521972cf33765fde71b3e0b1dc9f58d25012..f3c688fd4cf472a585d3bab290c34208ec180e90 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -21,6 +21,9 @@
     #pragma implementation "textctrl.h"
 #endif
 
     #pragma implementation "textctrl.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #ifdef __VMS
 #define XtParent XTPARENT
 #endif
 #ifdef __VMS
 #define XtParent XTPARENT
 #endif


@@ -94,8 +97,8 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba
 wxTextCtrl::wxTextCtrl()
 {
     m_tempCallbackStruct = (void*) NULL;
 wxTextCtrl::wxTextCtrl()
 {
     m_tempCallbackStruct = (void*) NULL;

-    m_modified = FALSE;
-    m_processedDefault = FALSE;
+    m_modified = false;
+    m_processedDefault = false;

 }
 
 bool wxTextCtrl::Create(wxWindow *parent,
 }
 
 bool wxTextCtrl::Create(wxWindow *parent,


@@ -111,32 +114,42 @@ bool wxTextCtrl::Create(wxWindow *parent,
         return false;
 
     m_tempCallbackStruct = (void*) NULL;
         return false;
 
     m_tempCallbackStruct = (void*) NULL;

-    m_modified = FALSE;
-    m_processedDefault = FALSE;
+    m_modified = false;
+    m_processedDefault = false;

 
     m_backgroundColour = *wxWHITE;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     m_backgroundColour = *wxWHITE;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 

-    bool wantHorizScrolling = ((m_windowStyle & wxHSCROLL) != 0);
-
+    Bool wantHorizScroll = (m_windowStyle & wxHSCROLL) != 0 ? True : False;

     // If we don't have horizontal scrollbars, we want word wrap.
     // If we don't have horizontal scrollbars, we want word wrap.

-    bool wantWordWrap = !wantHorizScrolling;
+    // OpenMotif 2.1 crashes if wantWordWrap is True in Japanese
+    // locale (and probably other multibyte locales). The check might be
+    // more precise
+#if wxCHECK_LESSTIF() || wxCHECK_MOTIF_VERSION( 2, 2 )
+    Bool wantWordWrap = wantHorizScroll == True ? False : True;
+#else
+    Bool wantWordWrap = False;
+#endif

 
     if (m_windowStyle & wxTE_MULTILINE)
     {
 
     if (m_windowStyle & wxTE_MULTILINE)
     {

-        Arg args[2];
-        XtSetArg (args[0], XmNscrollHorizontal, wantHorizScrolling ? True : False);
-        XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
-
-        m_mainWidget = (WXWidget) XmCreateScrolledText(parentWidget,
-                                                       wxConstCast(name.c_str(), char),
-                                                       args, 2);
-
-        XtVaSetValues ((Widget) m_mainWidget,
-                        XmNeditable, ((style & wxTE_READONLY) ? False : True),
-                        XmNeditMode, XmMULTI_LINE_EDIT,
-                        NULL);
+        Arg args[8];
+        int count = 0;
+        XtSetArg (args[count], XmNscrollHorizontal, wantHorizScroll); ++count;
+        XtSetArg (args[count], (String) wxFont::GetFontTag(),
+                  m_font.GetFontType( XtDisplay(parentWidget) ) ); ++count;
+        XtSetArg (args[count], XmNwordWrap, wantWordWrap); ++count;
+        XtSetArg (args[count], XmNvalue, value.c_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.c_str(), char),
+                                            args, count);
+

         XtManageChild ((Widget) m_mainWidget);
     }
     else
         XtManageChild ((Widget) m_mainWidget);
     }
     else


@@ -146,13 +159,14 @@ bool wxTextCtrl::Create(wxWindow *parent,
                                   wxConstCast(name.c_str(), char),
                                   xmTextWidgetClass,
                                   parentWidget,
                                   wxConstCast(name.c_str(), char),
                                   xmTextWidgetClass,
                                   parentWidget,

+                                  wxFont::GetFontTag(), m_font.GetFontType( XtDisplay(parentWidget) ),
+                                  XmNvalue, value.c_str(),
+                                  XmNeditable, (style & wxTE_READONLY) ?
+                                      False : True,

                                   NULL
                                  );
 
                                   NULL
                                  );
 

-        XtVaSetValues ((Widget) m_mainWidget,
-                        XmNeditable, ((style & wxTE_READONLY) ? False : True),
-                        NULL);
-
+#if 0

         // TODO: Is this relevant? What does it do?
         int noCols = 2;
         if (!value.IsNull() && (value.Length() > (unsigned int) noCols))
         // TODO: Is this relevant? What does it do?
         int noCols = 2;
         if (!value.IsNull() && (value.Length() > (unsigned int) noCols))


@@ -160,6 +174,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);
         XtVaSetValues((Widget) m_mainWidget,
                       XmNcolumns, noCols,
                       NULL);

+#endif

     }
 
     // remove border if asked for
     }
 
     // remove border if asked for


@@ -170,15 +185,6 @@ bool wxTextCtrl::Create(wxWindow *parent,
                       NULL);
     }
 
                       NULL);
     }
 

-    if ( !value.empty() )
-    {
-        // do this instead... MB
-        //
-        XtVaSetValues( (Widget) m_mainWidget,
-                       XmNvalue, wxConstCast(value.c_str(), char),
-                       NULL);
-    }
-    

     // install callbacks
     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 
     // install callbacks
     XtAddCallback((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc)wxTextWindowChangedProc, (XtPointer)this);
 


@@ -190,19 +196,12 @@ bool wxTextCtrl::Create(wxWindow *parent,
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 

-    // font
-    ChangeFont(FALSE);
-
-    wxSize best = GetBestSize();
-    if( size.x != -1 ) best.x = size.x;
-    if( size.y != -1 ) best.y = size.y;
-

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,

-                  pos.x, pos.y, best.x, best.y);
+                  pos.x, pos.y, size.x, size.y);

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;

 }
 
 WXWidget wxTextCtrl::GetTopWidget() const
 }
 
 WXWidget wxTextCtrl::GetTopWidget() const


@@ -243,23 +242,20 @@ wxString wxTextCtrl::GetValue() const
     return str;
 }
 
     return str;
 }
 

-void wxTextCtrl::SetValue(const wxString& value)
+void wxTextCtrl::SetValue(const wxString& text)

 {
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

 
 

-    // do this instead... MB
-    //
-    // with (at least) OpenMotif 2.1 this causes a lot of flicker
-#if 0
-    XtVaSetValues( (Widget) m_mainWidget,
-                   XmNvalue, wxConstCast(value.c_str(), char),
+    XmTextSetString ((Widget) m_mainWidget, wxConstCast(text.c_str(), char));
+    XtVaSetValues ((Widget) m_mainWidget,
+                   XmNcursorPosition, text.length(),

                    NULL);
                    NULL);

-#endif

 
 

-    Clear();
-    AppendText( value );
+    SetInsertionPoint(text.length());
+    XmTextShowPosition ((Widget) m_mainWidget, text.length());
+    m_modified = TRUE;

 
 

-    m_inSetValue = FALSE;
+    m_inSetValue = false;

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations


@@ -313,13 +309,13 @@ void wxTextCtrl::Redo()
 bool wxTextCtrl::CanUndo() const
 {
     // No Undo in Motif
 bool wxTextCtrl::CanUndo() const
 {
     // No Undo in Motif

-    return FALSE;
+    return false;

 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // No Redo in Motif
 }
 
 bool wxTextCtrl::CanRedo() const
 {
     // No Redo in Motif

-    return FALSE;
+    return false;

 }
 
 // If the return values from and to are the same, there is no
 }
 
 // If the return values from and to are the same, there is no


@@ -351,7 +347,7 @@ void wxTextCtrl::SetInsertionPoint(long pos)
 
 void wxTextCtrl::SetInsertionPointEnd()
 {
 
 void wxTextCtrl::SetInsertionPointEnd()
 {

-    long pos = GetLastPosition();
+    wxTextPos pos = GetLastPosition();

     SetInsertionPoint(pos);
 }
 
     SetInsertionPoint(pos);
 }
 


@@ -360,7 +356,7 @@ long wxTextCtrl::GetInsertionPoint() const
     return (long) XmTextGetInsertionPosition ((Widget) m_mainWidget);
 }
 
     return (long) XmTextGetInsertionPosition ((Widget) m_mainWidget);
 }
 

-long wxTextCtrl::GetLastPosition() const
+wxTextPos wxTextCtrl::GetLastPosition() const

 {
     return (long) XmTextGetLastPosition ((Widget) m_mainWidget);
 }
 {
     return (long) XmTextGetLastPosition ((Widget) m_mainWidget);
 }


@@ -389,30 +385,30 @@ void wxTextCtrl::SetSelection(long from, long to)
 
 void wxTextCtrl::WriteText(const wxString& text)
 {
 
 void wxTextCtrl::WriteText(const wxString& text)
 {

-    long textPosition = GetInsertionPoint() + strlen (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);
     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;
+    m_modified = true;

 }
 
 void wxTextCtrl::AppendText(const wxString& text)
 {
 }
 
 void wxTextCtrl::AppendText(const wxString& text)
 {

-    long textPosition = GetLastPosition() + text.length();
+    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);
     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;
+    m_modified = true;

 }
 
 void wxTextCtrl::Clear()
 {
     XmTextSetString ((Widget) m_mainWidget, "");
 }
 
 void wxTextCtrl::Clear()
 {
     XmTextSetString ((Widget) m_mainWidget, "");

-    m_modified = FALSE;
+    m_modified = false;

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


@@ -423,12 +419,12 @@ bool wxTextCtrl::IsModified() const
 // Makes modified or unmodified
 void wxTextCtrl::MarkDirty()
 {
 // Makes modified or unmodified
 void wxTextCtrl::MarkDirty()
 {

-    m_modified = FALSE;
+    m_modified = true;

 }
 
 void wxTextCtrl::DiscardEdits()
 {
 }
 
 void wxTextCtrl::DiscardEdits()
 {

-    m_modified = FALSE;
+    m_modified = false;

 }
 
 int wxTextCtrl::GetNumberOfLines() const
 }
 
 int wxTextCtrl::GetNumberOfLines() const


@@ -439,7 +435,7 @@ int wxTextCtrl::GetNumberOfLines() const
     {
         long i = 0;
         int currentLine = 0;
     {
         long i = 0;
         int currentLine = 0;

-        bool finished = FALSE;
+        bool finished = false;

         while (!finished)
         {
             int ch = s[i];
         while (!finished)
         {
             int ch = s[i];


@@ -450,7 +446,7 @@ int wxTextCtrl::GetNumberOfLines() const
             }
             else if (ch == 0)
             {
             }
             else if (ch == 0)
             {

-                finished = TRUE;
+                finished = true;

             }
             else
                 i++;
             }
             else
                 i++;


@@ -485,7 +481,7 @@ bool wxTextCtrl::PositionToXY(long pos, long *x, long *y) const
     if ( y )
         *y = yy;
 
     if ( y )
         *y = yy;
 

-    return TRUE;
+    return true;

 }
 
 void wxTextCtrl::ShowPosition(long pos)
 }
 
 void wxTextCtrl::ShowPosition(long pos)


@@ -548,7 +544,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     // Indicates that we should generate a normal command, because
     // we're letting default behaviour happen (otherwise it's vetoed
     // by virtue of overriding OnChar)
     // Indicates that we should generate a normal command, because
     // we're letting default behaviour happen (otherwise it's vetoed
     // by virtue of overriding OnChar)

-    m_processedDefault = TRUE;
+    m_processedDefault = true;

 
     if (m_tempCallbackStruct)
     {
 
     if (m_tempCallbackStruct)
     {


@@ -585,12 +581,12 @@ void wxTextCtrl::ChangeBackgroundColour()
             NULL);
         wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
         if (hsb)
             NULL);
         wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
         if (hsb)

-            wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
+            wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, true);

         if (vsb)
         if (vsb)

-            wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+            wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, true);

 
         // MBN: why change parent background?
 
         // MBN: why change parent background?

-        // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+        // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);

     }
 }
 
     }
 }
 


@@ -674,13 +670,19 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
 
     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?

-                   y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 ); 
+                   y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 );

 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     if( IsSingleLine() )
 }
 
 wxSize wxTextCtrl::DoGetBestSize() const
 {
     if( IsSingleLine() )

-        return wxDoGetSingleTextCtrlBestSize( (Widget)m_mainWidget, this );
+    {
+        wxSize best = wxControl::DoGetBestSize();
+
+        if( best.x < 110 ) best.x = 110;
+
+        return best;
+    }

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


@@ -753,14 +755,14 @@ wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr)
         return;
 
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
         return;
 
     wxTextCtrl *tw = (wxTextCtrl *) clientData;

-    tw->SetModified(TRUE);
+    tw->SetModified(true);

 }
 
 static void
 wxTextWindowModifyProc (Widget WXUNUSED(w), XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
 }
 
 static void
 wxTextWindowModifyProc (Widget WXUNUSED(w), XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;

-    tw->m_processedDefault = FALSE;
+    tw->m_processedDefault = false;

 
     // First, do some stuff if it's a password control: in this case, we need
     // to store the string inside the class because GetValue() can't retrieve
 
     // First, do some stuff if it's a password control: in this case, we need
     // to store the string inside the class because GetValue() can't retrieve