use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index ced2808927541e99439d3178e16d5184003c72ae..53f5a047ca7556212b55d43ca87ec06d42a3a89e 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "textctrl.h"
 #endif
 
     #pragma implementation "textctrl.h"
 #endif
 


@@ -197,7 +197,6 @@ bool wxTextCtrl::Create(wxWindow *parent,
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
 
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
 

-    SetCanAddEventHandler(TRUE);

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


@@ -208,7 +207,8 @@ bool wxTextCtrl::Create(wxWindow *parent,
 
 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


@@ -249,9 +249,15 @@ void wxTextCtrl::SetValue(const wxString& value)
 
     // do this instead... MB
     //
 
     // 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),
                    NULL);
     XtVaSetValues( (Widget) m_mainWidget,
                    XmNvalue, wxConstCast(value.c_str(), char),
                    NULL);

+#endif
+
+    Clear();
+    AppendText( value );

 
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }


@@ -381,85 +387,6 @@ 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 (wxConstCast(file.c_str(), char), &statb) == -1) || (statb.st_mode & S_IFMT) != S_IFREG ||
-        !(fp = fopen (wxConstCast(file.c_str(), char), "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 (wxConstCast(theFile.c_str(), char), "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)
 {
     long textPosition = GetInsertionPoint() + strlen (text);
 void wxTextCtrl::WriteText(const wxString& text)
 {
     long textPosition = GetInsertionPoint() + strlen (text);


@@ -473,7 +400,7 @@ void wxTextCtrl::WriteText(const wxString& text)
 
 void wxTextCtrl::AppendText(const wxString& text)
 {
 
 void wxTextCtrl::AppendText(const wxString& text)
 {

-    long textPosition = GetLastPosition() + strlen(text);
+    long textPosition = GetLastPosition() + text.length();

     XmTextInsert ((Widget) m_mainWidget, GetLastPosition(),
                   wxConstCast(text.c_str(), char));
     XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);
     XmTextInsert ((Widget) m_mainWidget, GetLastPosition(),
                   wxConstCast(text.c_str(), char));
     XtVaSetValues ((Widget) m_mainWidget, XmNcursorPosition, textPosition, NULL);


@@ -493,7 +420,12 @@ 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()
 {
     m_modified = FALSE;
 void wxTextCtrl::DiscardEdits()
 {
     m_modified = FALSE;


@@ -653,9 +585,9 @@ 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);

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


@@ -683,7 +615,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);

     }
 }
 
     }
 }
 


@@ -848,6 +780,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)