Cleaning up

7 files changed, 5 insertions, 20 deletions

diff --git a/Linux_C_12/cCrossCallClipboard_121.c b/Linux_C_12/cCrossCallClipboard_121.c
index 0c092b7..525483f 100644
--- a/Linux_C_12/cCrossCallClipboard_121.c
+++ b/Linux_C_12/cCrossCallClipboard_121.c
@@ -8,7 +8,7 @@
     About this module:

     Routines related to clipboard handling.

 ********************************************************************************************/

-#include <string.h>

+

 #include "cCrossCallClipboard_121.h"

 #include "cCrossCall_121.h"

 

@@ -29,7 +29,7 @@ void EvalCcRqSETCLIPBOARDTEXT (CrossCallInfo *pcci)		/* textptr; no result. */
 

     printf("EvalCcRqSETCLIPBOARDTEXT\n");

     gtk_clipboard_set_text (gtk_clipboard_get(GDK_NONE),

-                            text, strlen(text));

+                            text, rstrlen(text));

 

     MakeReturn0Cci (pcci);

 }

diff --git a/Linux_C_12/cCrossCallWindows_121.c b/Linux_C_12/cCrossCallWindows_121.c
index 38ba9ca..30fa5b0 100644
--- a/Linux_C_12/cCrossCallWindows_121.c
+++ b/Linux_C_12/cCrossCallWindows_121.c
@@ -10,12 +10,9 @@
 ********************************************************************************************/

 

 #include "cCrossCallWindows_121.h"

-#include "cCCallWindows_121.h"

-#include "cCCallSystem_121.h"

 #include "cCrossCall_121.h"

 #include "cCrossCallxDI_121.h"

 #include <gdk/gdkkeysyms.h>

-#include <string.h>

 

 /*	Global data:

 */

@@ -834,7 +831,7 @@ void EvalCcRqSETWINDOWTITLE (CrossCallInfo *pcci)		/* hwnd, textptr		no result.
     {

         printf("Setting for text view.\n");

         GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(window));

-        gtk_text_buffer_set_text (buffer, title, strlen(title));

+        gtk_text_buffer_set_text (buffer, title, rstrlen(title));

     }

     else

     {

diff --git a/Linux_C_12/cCrossCall_121.c b/Linux_C_12/cCrossCall_121.c
index 7028348..37bc4e0 100644
--- a/Linux_C_12/cCrossCall_121.c
+++ b/Linux_C_12/cCrossCall_121.c
@@ -26,13 +26,8 @@
 #include "cCrossCall_121.h"

 #include "cCrossCallWindows_121.h"		/* Contains the implementation of cursors. */

 #include <gdk/gdkkeysyms.h>

-#include <pthread.h>

-#include <unistd.h>

 #include <errno.h>

-#include <sys/types.h>

 #include <stdlib.h>

-#include <string.h>

-#include <inttypes.h>

 

 char** global_argv;

 int global_argc = 0;

@@ -622,8 +617,8 @@ void WinLaunchApp2 (CLEAN_STRING commandline, CLEAN_STRING pathname,
 

     exname = cstring(pathname);

     cl = cstring (commandline);

-    strcpy (path, cl);

-    for (i = strlen (path); path[i] != '\\' && i >= 0; i--)

+    rscopy (path, cl);

+    for (i = rstrlen (path); path[i] != '\\' && i >= 0; i--)

     {

         path[i] = 0;

     }

diff --git a/Linux_C_12/cCrossCallxDI_121.c b/Linux_C_12/cCrossCallxDI_121.c
index aa509f7..42225ff 100644
--- a/Linux_C_12/cCrossCallxDI_121.c
+++ b/Linux_C_12/cCrossCallxDI_121.c
@@ -604,8 +604,6 @@ OS InstallCrossCallxDI (OS ios)
     AddCrossCallEntry (newTable, CcRqCREATETOOLBARSEPARATOR, EvalCcRqCREATETOOLBARSEPARATOR);

     AddCrossCallEntries (gCrossCallProcedureTable, newTable);

 

-    printf("Done\n");

-

     return ios;

 }

 

diff --git a/oswindow.icl b/oswindow.icl
index 54ac7ac..d1027d1 100644
--- a/oswindow.icl
+++ b/oswindow.icl
@@ -196,7 +196,6 @@ osGetSliderControlMinWidth _ = 0
 

 /*	Window creation functions.

 */

-import StdMisc

 osCreateDialog :: !Bool !Bool !String !(!Int,!Int) !(!Int,!Int) !OSWindowPtr

 				  !(u:s->*(OSWindowPtr,u:s))

 				  !(OSWindowPtr->u:s->u:(*OSToolbox->*(u:s,*OSToolbox)))

@@ -568,7 +567,6 @@ osCreateSliderControl parentWindow parentPos show able horizontal (x,y) (w,h) (m
 instance toString (a,b) | toString a & toString b

 where

     toString (a,b) = "(" +++ toString a +++ "," +++ toString b +++")"

-from StdMisc import abort

 osCreateTextControl :: !OSWindowPtr !(!Int,!Int) !String !Bool !(!Int,!Int) !(!Int,!Int) !*OSToolbox -> (!OSWindowPtr,!*OSToolbox)

 osCreateTextControl parentWindow parentPos text show (x,y) (w,h) tb

     //| True = abort ("osCreateTextControl\n" +++ toString parentWindow +++ "\n" +++

diff --git a/windowCrossCall_12.icl b/windowCrossCall_12.icl
index 8291f81..0b725d7 100644
--- a/windowCrossCall_12.icl
+++ b/windowCrossCall_12.icl
@@ -97,7 +97,6 @@ winObscureCursor tb
 winSetWindowTitle :: !HWND !String !*OSToolbox -> *OSToolbox

 winSetWindowTitle hwnd title tb

 	# (textptr,tb)	= winMakeCString title tb

-    //| True = abort ("CSTRING : " +++ title +++ "; " +++ toString textptr +++ "\n")

 	# (_,tb)		= issueCleanRequest2 (errorCallback2 "SetWindowTitle") (Rq2Cci CcRqSETWINDOWTITLE hwnd textptr) tb

 	= winReleaseCString textptr tb

 

diff --git a/windowevent.icl b/windowevent.icl
index da02c10..72f0a30 100644
--- a/windowevent.icl
+++ b/windowevent.icl
@@ -25,10 +25,8 @@ windoweventFatalError function error
 	For the time being no timer controls are added, so these events are ignored.

 	windowEvent assumes that it is not applied to an empty IOSt.

 */

-import StdMisc

 windowEvent :: !SchedulerEvent !(PSt .l) -> (!Bool,!Maybe DeviceEvent,!SchedulerEvent,!PSt .l)

 windowEvent schedulerEvent pState

-    //| True = abort "windowevent\n"

 	# (hasDevice,pState)	= accPIO (ioStHasDevice WindowDevice) pState

 	| not hasDevice			// This condition should never occur: WindowDevice must have been 'installed'

 		= windoweventFatalError "windowFunctions.dEvent" "could not retrieve WindowSystemState from IOSt"