use unsgined int instead of int for 1 bit bitfields (SGI CC warning fix)

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 7bb9799cae4a5f6d2e0cd2656115631bb65ae002..4e9b4655cb4a20bd1a9b80a906405f639de19c28 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -17,10 +17,13 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #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,


@@ -107,62 +110,63 @@ bool wxTextCtrl::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-    m_tempCallbackStruct = (void*) NULL;
-    m_modified = FALSE;
-    m_processedDefault = FALSE;
-    //    m_backgroundColour = parent->GetBackgroundColour();
-    m_backgroundColour = * wxWHITE;
-    m_foregroundColour = parent->GetForegroundColour();
-
-    SetName(name);
-    SetValidator(validator);
-    if (parent)
-        parent->AddChild(this);
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;

 
 

-    m_windowStyle = style;
+    m_tempCallbackStruct = (void*) NULL;
+    m_modified = false;
+    m_processedDefault = false;

 
 

-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
+    m_backgroundColour = *wxWHITE;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     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,
-                                                       (char*)name.c_str(),
-                                                       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
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (
         XtManageChild ((Widget) m_mainWidget);
     }
     else
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (

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

                                   xmTextWidgetClass,
                                   parentWidget,
                                   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))


@@ -170,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


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

-    if ( !!value )
-    {
-#if 0
-        // don't do this because it is just linking the text to a source
-        // string which is unsafe. MB
-        //
-        XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());
-#else
-        // do this instead... MB
-        //
-        XtVaSetValues( (Widget) m_mainWidget,
-                       XmNvalue, (char *)value.c_str(),
-                       NULL);
-#endif
-    }
-    

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


@@ -207,21 +196,18 @@ bool wxTextCtrl::Create(wxWindow *parent,
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 
 
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 

-    // font
-    m_font = parent->GetFont();
-    ChangeFont(FALSE);
-
-    SetCanAddEventHandler(TRUE);
-    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();
 
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;

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

-    return ((m_windowStyle & wxTE_MULTILINE) ? (WXWidget) XtParent((Widget) m_mainWidget) : m_mainWidget);
+    return IsMultiLine() ? (WXWidget)XtParent((Widget)m_mainWidget)
+                         : m_mainWidget;

 }
 
 wxString wxTextCtrl::GetValue() const
 }
 
 wxString wxTextCtrl::GetValue() const


@@ -256,24 +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;

 
 

-#if 0
-    // don't do this because it is just linking the text to a source
-    // string which is unsafe. MB
-    //
-    XmTextSetString ((Widget) m_mainWidget, (char*)value.c_str());
-#else
-    // do this instead... MB
-    //
-    XtVaSetValues( (Widget) m_mainWidget,
-                   XmNvalue, (char *)value.c_str(),
+    XmTextSetString ((Widget) m_mainWidget, wxConstCast(text.c_str(), char));
+    XtVaSetValues ((Widget) m_mainWidget,
+                   XmNcursorPosition, text.length(),

                    NULL);
                    NULL);

-#endif

 
 

-    m_inSetValue = FALSE;
+    SetInsertionPoint(text.length());
+    XmTextShowPosition ((Widget) m_mainWidget, text.length());
+    m_modified = TRUE;
+
+    m_inSetValue = false;

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations


@@ -327,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


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

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

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


@@ -374,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);
 }


@@ -382,7 +364,7 @@ long wxTextCtrl::GetLastPosition() const
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,

-        (char*) (const char*) value);
+        wxConstCast(value.c_str(), char));

 }
 
 void wxTextCtrl::Remove(long from, long to)
 }
 
 void wxTextCtrl::Remove(long from, long to)


@@ -401,109 +383,32 @@ void wxTextCtrl::SetSelection(long from, long to)
                       (Time) 0);
 }
 
                       (Time) 0);
 }
 

-bool wxTextCtrl::LoadFile(const wxString& file)
-{
-    if (!wxFileExists(file))
-        return FALSE;
-
-    m_fileName = file;
-
-    Clear();
-
-    Widget textWidget = (Widget) m_mainWidget;
-    FILE *fp = 0;
-
-    struct stat statb;
-    if ((stat ((char*) (const char*) file, &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
-        !(fp = fopen ((char*) (const char*) file, "r")))
-    {
-        return FALSE;
-    }
-    else
-    {
-        long len = statb.st_size;
-        char *text;
-        if (!(text = XtMalloc ((unsigned) (len + 1))))
-        {
-            fclose (fp);
-            return FALSE;
-        }
-        if (fread (text, sizeof (char), len, fp) != (size_t) len)
-        {
-        }
-        fclose (fp);
-
-        text[len] = 0;
-        XmTextSetString (textWidget, text);
-        //      m_textPosition = len;
-        XtFree (text);
-        m_modified = FALSE;
-        return TRUE;
-    }
-}
-
-// If file is null, try saved file name first
-// Returns TRUE if succeeds.
-bool wxTextCtrl::SaveFile(const wxString& file)
-{
-    wxString theFile(file);
-    if (theFile == "")
-        theFile = m_fileName;
-    if (theFile == "")
-        return FALSE;
-    m_fileName = theFile;
-
-    Widget textWidget = (Widget) m_mainWidget;
-    FILE *fp;
-
-    if (!(fp = fopen ((char*) (const char*) theFile, "w")))
-    {
-        return FALSE;
-    }
-    else
-    {
-        char *text = XmTextGetString (textWidget);
-        long len = XmTextGetLastPosition (textWidget);
-
-        if (fwrite (text, sizeof (char), len, fp) != (size_t) len)
-        {
-            // Did not write whole file
-        }
-        // Make sure newline terminates the file
-        if (text[len - 1] != '\n')
-            fputc ('\n', fp);
-
-        fclose (fp);
-        XtFree (text);
-        m_modified = FALSE;
-        return TRUE;
-    }
-}
-

 void wxTextCtrl::WriteText(const wxString& text)
 {
 void wxTextCtrl::WriteText(const wxString& text)
 {

-    long textPosition = GetInsertionPoint() + strlen (text);
-    XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(), (char*) (const char*) 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);
     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() + strlen(text);
-    XmTextInsert ((Widget) m_mainWidget, GetLastPosition(), (char*) (const char*) 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);
     XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
     SetInsertionPoint(textPosition);
     XmTextShowPosition ((Widget) m_mainWidget, textPosition);

-    m_modified = TRUE;
+    m_modified = true;

 }
 
 void wxTextCtrl::Clear()
 {
 }
 
 void wxTextCtrl::Clear()
 {

-    XmTextSetString ((Widget) m_mainWidget, "");
-    m_modified = FALSE;
+    XmTextSetString ((Widget) m_mainWidget, wxMOTIF_STR(""));
+    m_modified = false;

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


@@ -511,10 +416,15 @@ bool wxTextCtrl::IsModified() const
     return m_modified;
 }
 
     return m_modified;
 }
 

-// Makes 'unmodified'
+// Makes modified or unmodified
+void wxTextCtrl::MarkDirty()
+{
+    m_modified = true;
+}
+

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

-    m_modified = FALSE;
+    m_modified = false;

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


@@ -525,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];


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

-                finished = TRUE;
+                finished = true;

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


@@ -571,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)


@@ -634,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)
     {


@@ -671,11 +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)

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

         if (vsb)
         if (vsb)

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

 
 

-        DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+        // MBN: why change parent background?
+        // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);

     }
 }
 
     }
 }
 


@@ -700,7 +611,7 @@ void wxTextCtrl::ChangeForegroundColour()
             if (vsb)
             DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
         */
             if (vsb)
             DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
         */

-        DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) parent, m_foregroundColour);

     }
 }
 
     }
 }
 


@@ -735,6 +646,48 @@ void wxTextCtrl::DoSendEvents(void *wxcbs, long keycode)
     m_tempCallbackStruct = NULL;
 }
 
     m_tempCallbackStruct = NULL;
 }
 

+wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
+                                      const wxWindow* window )
+{
+    Dimension xmargin, ymargin, highlight, shadow;
+    char* value;
+
+    XtVaGetValues( textWidget,
+                   XmNmarginWidth, &xmargin,
+                   XmNmarginHeight, &ymargin,
+                   XmNvalue, &value,
+                   XmNhighlightThickness, &highlight,
+                   XmNshadowThickness, &shadow,
+                   NULL );
+
+    if( !value )
+        value = wxMOTIF_STR("|");
+
+    int x, y;
+    window->GetTextExtent( value, &x, &y );
+
+    if( x < 100 )
+        x = 100;
+
+    return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
+                   // MBN: +2 necessary: Lesstif bug or mine?
+                   y + 2 * ymargin + 2 * highlight + 2 * shadow + 2 );
+}
+
+wxSize wxTextCtrl::DoGetBestSize() const
+{
+    if( IsSingleLine() )
+    {
+        wxSize best = wxControl::DoGetBestSize();
+
+        if( best.x < 110 ) best.x = 110;
+
+        return best;
+    }
+    else
+        return wxWindow::DoGetBestSize();
+}
+

 // ----------------------------------------------------------------------------
 // helpers and Motif callbacks
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helpers and Motif callbacks
 // ----------------------------------------------------------------------------


@@ -803,14 +756,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


@@ -830,6 +783,9 @@ wxTextWindowModifyProc (Widget WXUNUSED(w), XtPointer clientData, XmTextVerifyCa
         }
     }
 
         }
     }
 

+    if(tw->InSetValue())
+        return;
+

     // If we're already within an OnChar, return: probably a programmatic
     // insertion.
     if (tw->m_tempCallbackStruct)
     // If we're already within an OnChar, return: probably a programmatic
     // insertion.
     if (tw->m_tempCallbackStruct)