Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / stc / stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index c406e6a6876c267b288a163e47d042b3280d73bf..434783c223b5d28deba4fa5a480934a8e6027de1 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -12,7 +12,6 @@
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000
 // Author:      Robin Dunn
 //
 // Created:     13-Jan-2000

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 by Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -4557,8 +4556,8 @@ public:
     }
     virtual void Replace(long from, long to, const wxString& text)
     {
     }
     virtual void Replace(long from, long to, const wxString& text)
     {

-        SetTargetStart(from);
-        SetTargetEnd(to);
+        SetTargetStart((int)from);
+        SetTargetEnd((int)to);

         ReplaceTarget(text);
     }
 
         ReplaceTarget(text);
     }
 


@@ -4579,7 +4578,7 @@ public:
 
     virtual void SetInsertionPoint(long pos)
     {
 
     virtual void SetInsertionPoint(long pos)
     {

-        SetCurrentPos(pos == -1 ? GetLastPosition() : pos);
+        SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos));

     }
     virtual long GetInsertionPoint() const { return GetCurrentPos(); }
     virtual long GetLastPosition() const { return GetTextLength(); }
     }
     virtual long GetInsertionPoint() const { return GetCurrentPos(); }
     virtual long GetLastPosition() const { return GetTextLength(); }


@@ -4592,8 +4591,8 @@ public:
         }
         else
         {
         }
         else
         {

-            SetSelectionStart(from);
-            SetSelectionEnd(to);
+            SetSelectionStart((int)from);
+            SetSelectionEnd((int)to);

         }
     }
 
         }
     }
 


@@ -4619,9 +4618,9 @@ public:
         long f, t;
         GetSelection(&f, &t);
         if ( from )
         long f, t;
         GetSelection(&f, &t);
         if ( from )

-            *from = f;
+            *from = (int)f;

         if ( to )
         if ( to )

-            *to = t;
+            *to = (int)t;

     }
 #endif
 
     }
 #endif
 


@@ -4673,14 +4672,14 @@ public:
 
     virtual long XYToPosition(long x, long y) const
     {
 
     virtual long XYToPosition(long x, long y) const
     {

-        long pos = PositionFromLine(y);
+        long pos = PositionFromLine((int)y);

         pos += x;
         return pos;
     }
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {
         pos += x;
         return pos;
     }
 
     virtual bool PositionToXY(long pos, long *x, long *y) const
     {

-        long l = LineFromPosition(pos);
+        int l = LineFromPosition((int)pos);

         if ( l == -1 )
             return false;
 
         if ( l == -1 )
             return false;
 


@@ -4693,7 +4692,7 @@ public:
         return true;
     }
 
         return true;
     }
 

-    virtual void ShowPosition(long pos) { GotoPos(pos); }
+    virtual void ShowPosition(long pos) { GotoPos((int)pos); }

 
     // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal
     //            access declaration: 'wxWindow' is not a direct base of
 
     // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal
     //            access declaration: 'wxWindow' is not a direct base of