From 8414b45f48d68b898a6dda27069c377088687fb8 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sat, 5 Apr 2008 14:54:35 +0000
Subject: * configure.ac.pamphlet (oa_shrlib_flags): Tidy.
(oa_shrobj_flags): Likewise. * config/var-def.mk (LINK_SHRLIB): Tidy.
* INSTALL: Update. * TODO: Likewise.
---
src/ChangeLog | 5 +++++
src/graph/view2D/process2d.c | 37 +------------------------------------
src/graph/view3D/process3d.c | 11 +----------
3 files changed, 7 insertions(+), 46 deletions(-)
(limited to 'src')
diff --git a/src/ChangeLog b/src/ChangeLog
index 8a5e1373..b33da222 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-05 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * graph/view2D/process2d.c (processEvents): Tidy.
+ * graph/view3D/process3d.c (processEvents): Likewise.
+
2008-04-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
* hyper/hyper.h: Simplify font definitions.
diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c
index 7df82480..97f641ef 100644
--- a/src/graph/view2D/process2d.c
+++ b/src/graph/view2D/process2d.c
@@ -59,12 +59,7 @@ static int doit=0; /* globish variable for picking/dropping/clearing - all sort
void
-#ifdef _NO_PROTO
-doPick (i,bKey)
- int i,bKey;
-#else
doPick (int i,int bKey)
-#endif
{
int vCommand=pick2D;
@@ -86,12 +81,7 @@ doPick (int i,int bKey)
void
-#ifdef _NO_PROTO
-doDrop (i,bKey)
- int i,bKey;
-#else
doDrop (int i,int bKey)
-#endif
{
int vCommand=drop2D;
int viewGoAhead;
@@ -121,12 +111,7 @@ doDrop (int i,int bKey)
}
void
-#ifdef _NO_PROTO
-clickedOnGraphSelect (i,bKey)
- int i,bKey;
-#else
clickedOnGraphSelect (int i,int bKey)
-#endif
{
int strlength;
@@ -182,13 +167,7 @@ clickedOnGraphSelect (int i,int bKey)
static void
-#ifndef _NO_PROTO
drawControlPushButton(int isOn, int index)
-#else
- drawControlPushButton(isOn,index)
- int isOn;
- int index;
-#endif
{
GDrawPushButton(dsply, processGC, processGC, processGC,
control->controlWindow,
@@ -206,12 +185,7 @@ drawControlPushButton(int isOn, int index)
void
-#ifdef _NO_PROTO
-buttonAction (bKey)
- int bKey;
-#else
buttonAction (int bKey)
-#endif
{
int i;
@@ -509,11 +483,7 @@ buttonAction (int bKey)
/*********************** X Event Processing ***************************/
void
-#ifdef _NO_PROTO
-processEvents()
-#else
processEvents(void)
-#endif
{
XEvent *event,
@@ -851,7 +821,7 @@ processEvents(void)
} /* else - not closing */
} /* if checkButton */
} /* if FD_ISSET(Xcon.... */
- else if FD_ISSET(0,&rd) {
+ else if (FD_ISSET(0,&rd)) {
externalControl=spadAction(); /* returns (-1) if broken ,0 if success */
if (spadDraw && (externalControl==0)) drawViewport(Xoption);
}
@@ -864,12 +834,7 @@ processEvents(void)
void
-#ifdef _NO_PROTO
-clickedOnGraph (i,bKey)
- int i,bKey;
-#else
clickedOnGraph (int i,int bKey)
-#endif
{
switch (doit) {
diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c
index 79c11b42..9f267279 100644
--- a/src/graph/view3D/process3d.c
+++ b/src/graph/view3D/process3d.c
@@ -66,12 +66,7 @@
void
-#ifdef _NO_PROTO
-buttonAction (bKey)
-int bKey;
-#else
buttonAction (int bKey)
-#endif
{
char *s1, *s2;
@@ -855,11 +850,7 @@ buttonAction (int bKey)
/************************** X Event Processing *****************************/
void
-#ifdef _NO_PROTO
-processEvents()
-#else
processEvents(void)
-#endif
{
XEvent *event, tempEvent;
@@ -1594,7 +1585,7 @@ processEvents(void)
} /* else - not closing */
} /* if checkButton */
} /* if FD_ISSET(Xcon,.. */
- else if FD_ISSET(0,&rd) {
+ else if (FD_ISSET(0,&rd)) {
externalControl = spadAction();
if (spadDraw && (externalControl==0)) drawViewport(Xoption);
}
--
cgit v1.2.3