added pragmas to disable icc warning when va_arg is used with a pointer type

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

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index f3c688fd4cf472a585d3bab290c34208ec180e90..0efb6c71d03a514e46354fee1d38bd4a002322b0 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "textctrl.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -407,7 +403,7 @@ void wxTextCtrl::AppendText(const wxString& text)
 
 void wxTextCtrl::Clear()
 {
-    XmTextSetString ((Widget) m_mainWidget, "");
+    XmTextSetString ((Widget) m_mainWidget, wxMOTIF_STR(""));
     m_modified = false;
 }
 
@@ -661,12 +657,13 @@ wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
                    NULL );
 
     if( !value )
-        value = "|";
+        value = wxMOTIF_STR("|");
 
     int x, y;
     window->GetTextExtent( value, &x, &y );
 
-    if( x < 100 ) x = 100;
+    if( x < 100 )
+        x = 100;
 
     return wxSize( x + 2 * xmargin + 2 * highlight + 2 * shadow,
                    // MBN: +2 necessary: Lesstif bug or mine?