Patch [ 1100272 ] wxFlexGridSizer works wrong when some rows/cols are hidden

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 623de21836100e92c0893282d1a372baeba56464..090da09f5ae193a5bab9f6587b3b7593b26e63a8 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -17,13 +17,21 @@
 // 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
+
+#include "wx/defs.h"
+

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

-#include <fstream.h>

 #include <ctype.h>
 
 #include "wx/textctrl.h"
 #include <ctype.h>
 
 #include "wx/textctrl.h"


@@ -31,7 +39,13 @@
 #include "wx/filefn.h"
 #include "wx/utils.h"
 
 #include "wx/filefn.h"
 #include "wx/utils.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Text.h>
 #include <Xm/Text.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 


@@ -51,7 +65,6 @@ 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);
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
     BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
 
     BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)


@@ -71,7 +84,6 @@ static void wxTextWindowActivateProc(Widget w, XtPointer clientData, XmAnyCallba
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 
     END_EVENT_TABLE()
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 
     END_EVENT_TABLE()

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -98,24 +110,14 @@ bool wxTextCtrl::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;
+

     m_tempCallbackStruct = (void*) NULL;
     m_modified = FALSE;
     m_processedDefault = FALSE;
     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);

 
 

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

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -131,7 +133,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
         XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
 
         m_mainWidget = (WXWidget) XmCreateScrolledText(parentWidget,
         XtSetArg (args[1], XmNwordWrap, wantWordWrap ? True : False);
 
         m_mainWidget = (WXWidget) XmCreateScrolledText(parentWidget,

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

                                                        args, 2);
 
         XtVaSetValues ((Widget) m_mainWidget,
                                                        args, 2);
 
         XtVaSetValues ((Widget) m_mainWidget,


@@ -144,7 +146,7 @@ bool wxTextCtrl::Create(wxWindow *parent,
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (
     {
         m_mainWidget = (WXWidget)XtVaCreateManagedWidget
                                  (

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

                                   xmTextWidgetClass,
                                   parentWidget,
                                   NULL
                                   xmTextWidgetClass,
                                   parentWidget,
                                   NULL


@@ -171,20 +173,13 @@ bool wxTextCtrl::Create(wxWindow *parent,
                       NULL);
     }
 
                       NULL);
     }
 

-    if ( !!value )
+    if ( !value.empty() )

     {
     {

-#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,
         // do this instead... MB
         //
         XtVaSetValues( (Widget) m_mainWidget,

-                       XmNvalue, (char *)value.c_str(),
+                       XmNvalue, wxConstCast(value.c_str(), char),

                        NULL);
                        NULL);

-#endif

     }
     
     // install callbacks
     }
     
     // install callbacks


@@ -199,11 +194,14 @@ bool wxTextCtrl::Create(wxWindow *parent,
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 
     // font
     XtAddCallback((Widget) m_mainWidget, XmNlosingFocusCallback, (XtCallbackProc)wxTextWindowLoseFocusProc, (XtPointer)this);
 
     // font

-    m_font = parent->GetFont();

     ChangeFont(FALSE);
 
     ChangeFont(FALSE);
 

-    SetCanAddEventHandler(TRUE);
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    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,
+                  pos.x, pos.y, best.x, best.y);

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 


@@ -212,7 +210,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


@@ -251,19 +250,18 @@ void wxTextCtrl::SetValue(const wxString& value)
 {
     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
     //
     // do this instead... MB
     //

+    // with (at least) OpenMotif 2.1 this causes a lot of flicker
+#if 0

     XtVaSetValues( (Widget) m_mainWidget,
     XtVaSetValues( (Widget) m_mainWidget,

-                   XmNvalue, (char *)value.c_str(),
+                   XmNvalue, wxConstCast(value.c_str(), char),

                    NULL);
 #endif
 
                    NULL);
 #endif
 

+    Clear();
+    AppendText( value );
+

     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 


@@ -296,7 +294,7 @@ bool wxTextCtrl::CanCut() const
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);
     // Can cut if there's a selection
     long from, to;
     GetSelection(& from, & to);

-    return (from != to) ;
+    return (from != to) && (IsEditable());

 }
 
 bool wxTextCtrl::CanPaste() const
 }
 
 bool wxTextCtrl::CanPaste() const


@@ -373,7 +371,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)


@@ -385,93 +383,18 @@ void wxTextCtrl::Remove(long from, long to)
 
 void wxTextCtrl::SetSelection(long from, long to)
 {
 
 void wxTextCtrl::SetSelection(long from, long to)
 {

+    if( to == -1 )
+        to = GetLastPosition();
+

     XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
                       (Time) 0);
 }
 
     XmTextSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
                       (Time) 0);
 }
 

-bool wxTextCtrl::LoadFile(const wxString& file)
-{
-    if (!wxFileExists(file))
-        return FALSE;
-
-    m_fileName = file;
-
-    Clear();
-
-    Widget textWidget = (Widget) m_mainWidget;
-    FILE *fp;
-
-    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)
 {
     long textPosition = GetInsertionPoint() + strlen (text);
 void wxTextCtrl::WriteText(const wxString& text)
 {
     long textPosition = GetInsertionPoint() + strlen (text);

-    XmTextInsert ((Widget) m_mainWidget, GetInsertionPoint(), (char*) (const char*) text);
+    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);


@@ -480,8 +403,9 @@ void wxTextCtrl::WriteText(const wxString& text)
 
 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);
+    long 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);


@@ -499,7 +423,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;


@@ -657,13 +586,14 @@ void wxTextCtrl::ChangeBackgroundColour()
             XmNhorizontalScrollBar, &hsb,
             XmNverticalScrollBar, &vsb,
             NULL);
             XmNhorizontalScrollBar, &hsb,
             XmNverticalScrollBar, &vsb,
             NULL);

-        wxColour backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE);
+        wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

         if (hsb)
         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);

     }
 }
 
     }
 }
 


@@ -688,7 +618,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);

     }
 }
 
     }
 }
 


@@ -723,6 +653,41 @@ 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 = "|";
+
+    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() )
+        return wxDoGetSingleTextCtrlBestSize( (Widget)m_mainWidget, this );
+    else
+        return wxWindow::DoGetBestSize();
+}
+

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


@@ -752,7 +717,9 @@ static void MergeChangesIntoString(wxString& value,
         const char * const passwd = value;
         int len = value.length();
 
         const char * const passwd = value;
         int len = value.length();
 

-        len += strlen(cbs->text->ptr) + 1;     // + new text (if any) + NUL
+        len += ( cbs->text->ptr ?
+                 strlen(cbs->text->ptr) :
+                 0 ) + 1;                      // + new text (if any) + NUL

         len -= cbs->endPos - cbs->startPos;    // - text from affected region.
 
         char * newS = new char [len];
         len -= cbs->endPos - cbs->startPos;    // - text from affected region.
 
         char * newS = new char [len];


@@ -766,8 +733,9 @@ static void MergeChangesIntoString(wxString& value,
             *dest++ = *p++;
 
         // Copy the text to be inserted).
             *dest++ = *p++;
 
         // Copy the text to be inserted).

-        while (*insert)
-            *dest++ = *insert++;
+        if (insert)
+            while (*insert)
+                *dest++ = *insert++;

 
         // Finally, copy into newS any remaining text from passwd[endPos] on.
         for (p = passwd + cbs->endPos; *p; )
 
         // Finally, copy into newS any remaining text from passwd[endPos] on.
         for (p = passwd + cbs->endPos; *p; )


@@ -781,7 +749,7 @@ static void MergeChangesIntoString(wxString& value,
 }
 
 static void
 }
 
 static void

-wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
+wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))

 {
     if (!wxGetWindowFromTable(w))
         // Widget has been deleted!
 {
     if (!wxGetWindowFromTable(w))
         // Widget has been deleted!


@@ -792,7 +760,7 @@ wxTextWindowChangedProc (Widget w, XtPointer clientData, XtPointer ptr)
 }
 
 static void
 }
 
 static void

-wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStruct *cbs)
+wxTextWindowModifyProc (Widget WXUNUSED(w), XtPointer clientData, XmTextVerifyCallbackStruct *cbs)

 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->m_processedDefault = FALSE;
 {
     wxTextCtrl *tw = (wxTextCtrl *) clientData;
     tw->m_processedDefault = FALSE;


@@ -815,6 +783,9 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
         }
     }
 
         }
     }
 

+    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)


@@ -842,7 +813,7 @@ wxTextWindowModifyProc (Widget w, XtPointer clientData, XmTextVerifyCallbackStru
 }
 
 static void
 }
 
 static void

-wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *WXUNUSED(cbs))

 {
     if (!wxGetWindowFromTable(w))
         return;
 {
     if (!wxGetWindowFromTable(w))
         return;


@@ -854,7 +825,7 @@ wxTextWindowGainFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
 }
 
 static void
 }
 
 static void

-wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *cbs)
+wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *WXUNUSED(cbs))

 {
     if (!wxGetWindowFromTable(w))
         return;
 {
     if (!wxGetWindowFromTable(w))
         return;


@@ -866,7 +837,7 @@ wxTextWindowLoseFocusProc (Widget w, XtPointer clientData, XmAnyCallbackStruct *
 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,
 }
 
 static void wxTextWindowActivateProc(Widget w, XtPointer clientData,

-                                     XmAnyCallbackStruct *ptr)
+                                     XmAnyCallbackStruct *WXUNUSED(ptr))

 {
     if (!wxGetWindowFromTable(w))
         return;
 {
     if (!wxGetWindowFromTable(w))
         return;