moved loadnextpositionproc, loadprevpositionproc and reloadpositionproc to GTK

diff --git a/callback.c b/callback.c
index d2e42f3..1d10abe 100644 (file)
--- a/callback.c
+++ b/callback.c
@@ -176,6 +176,10 @@ void IcsClientProc(object, user_data)
     return;
 }
 
+/*
+ * File menu
+ */
+
 void LoadNextGameProc(object, user_data)
      GtkObject *object;
      gpointer user_data;
@@ -200,6 +204,34 @@ void ReloadGameProc(object, user_data)
     return;
 }
 
+
+void LoadNextPositionProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    ReloadPosition(1);
+    return;
+}
+
+void LoadPrevPositionProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    ReloadPosition(-1);
+    return;
+}
+
+void ReloadPositionProc(object, user_data)
+     GtkObject *object;
+     gpointer user_data;
+{
+    ReloadPosition(0);
+    return;
+}
+
+
+/* End File Menu */
+
 void MachineWhiteProc(object, user_data)
      GtkObject *object;
      gpointer user_data;

diff --git a/callback.h b/callback.h
index b61f26f..f1e5973 100644 (file)
--- a/callback.h
+++ b/callback.h
@@ -1,4 +1,3 @@
-void QuitProc P((GtkObject *object, gpointer user_data));
 void IcsClientProc P((GtkObject *object, gpointer user_data));
 void MachineBlackProc P((GtkObject *object, gpointer user_data));
 void MachineWhiteProc P((GtkObject *object, gpointer user_data));
@@ -21,6 +20,15 @@ void WhiteClockProc P((GtkObject *object, gpointer user_data));
 void BlackClockProc P((GtkObject *object, gpointer user_data));
 gboolean ExposeProc P((GtkObject *object, gpointer user_data));
 
+/* File Menu */
+void QuitProc P((GtkObject *object, gpointer user_data));
+void LoadNextGameProc P((GtkObject *object, gpointer user_data));
+void LoadPrevGameProc P((GtkObject *object, gpointer user_data));
+void ReloadGameProc P((GtkObject *object, gpointer user_data));
+void LoadNextPositionProc P((GtkObject *object, gpointer user_data));
+void LoadPrevPositionProc P((GtkObject *object, gpointer user_data));
+void ReloadPositionProc P((GtkObject *object, gpointer user_data));
+
 /* Step Menu */
 void BackwardProc P((GtkObject *object, gpointer user_data));
 void ForwardProc P((GtkObject *object, gpointer user_data));
@@ -49,9 +57,6 @@ void AboutProc  P((GtkObject *object, gpointer user_data));
 void ShowCoordsProc P((GtkObject *object, gpointer user_data));
 void ErrorPopDownProc P((GtkObject *object, gpointer user_data));
 void PauseProc P((GtkObject *object, gpointer user_data));
-void LoadNextGameProc P((GtkObject *object, gpointer user_data));
-void LoadPrevGameProc P((GtkObject *object, gpointer user_data));
-void ReloadGameProc P((GtkObject *object, gpointer user_data));
 void EventProc P((GtkWindow *window, GdkEvent *event, gpointer data));
 void UserMoveProc P((GtkWindow *window, GdkEvent *event, gpointer data));
 gboolean CloseWindowProc P((GtkWidget *button));

diff --git a/xboard.c b/xboard.c
index 4793a1d..ead2202 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -295,12 +295,6 @@ void EditCommentCallback P((Widget w, XtPointer client_data,
 void SelectCommand P((Widget w, XtPointer client_data, XtPointer call_data));
 void LoadPositionProc P((Widget w, XEvent *event,
                         String *prms, Cardinal *nprms));
-void LoadNextPositionProc P((Widget w, XEvent *event, String *prms,
-                        Cardinal *nprms));
-void LoadPrevPositionProc P((Widget w, XEvent *event, String *prms,
-                        Cardinal *nprms));
-void ReloadPositionProc P((Widget w, XEvent *event, String *prms,
-                      Cardinal *nprms));
 void CopyPositionProc P((Widget w, XEvent *event, String *prms,
                         Cardinal *nprms));
 void PastePositionProc P((Widget w, XEvent *event, String *prms,
@@ -657,9 +651,9 @@ MenuItem fileMenu[] = {
     {N_("Paste Game"), PasteGameProc},
     {"----", NothingProc},
     {N_("Load Position"), LoadPositionProc},
-    {N_("Load Next Position"), LoadNextPositionProc},
-    {N_("Load Previous Position"), LoadPrevPositionProc},
-    {N_("Reload Same Position"), ReloadPositionProc},
+    //    {N_("Load Next Position"), LoadNextPositionProc},
+    //    {N_("Load Previous Position"), LoadPrevPositionProc},
+    //    {N_("Reload Same Position"), ReloadPositionProc},
     {N_("Save Position"), SavePositionProc},
     {"----", NothingProc},
     {N_("Copy Position"), CopyPositionProc},
@@ -1813,9 +1807,9 @@ XtActionsRec boardActions[] = {
     { "Iconify", Iconify },
     { "LoadSelectedProc", LoadSelectedProc },
     { "LoadPositionProc", LoadPositionProc },
-    { "LoadNextPositionProc", LoadNextPositionProc },
-    { "LoadPrevPositionProc", LoadPrevPositionProc },
-    { "ReloadPositionProc", ReloadPositionProc },
+    //    { "LoadNextPositionProc", LoadNextPositionProc },
+    //    { "LoadPrevPositionProc", LoadPrevPositionProc },
+    //    { "ReloadPositionProc", ReloadPositionProc },
     { "CopyPositionProc", CopyPositionProc },
     { "PastePositionProc", PastePositionProc },
     { "CopyGameProc", CopyGameProc },
@@ -3013,6 +3007,8 @@ char *FindFont(pattern, targetPxlSize)
 
 void CreateGCs()
 {
+  /* GCs are not needed anymore for GTK  just left them in here for the moment, since there is a lot of X-code still around that's wants them*/
+
     XtGCMask value_mask = GCLineWidth | GCLineStyle | GCForeground
       | GCBackground | GCFunction | GCPlaneMask;
     XGCValues gc_values;
@@ -5216,34 +5212,6 @@ int LoadGamePopUp(f, gameNumber, title)
     return LoadGame(f, gameNumber, title, FALSE);
 }
 
-
-void LoadNextPositionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ReloadPosition(1);
-}
-
-void LoadPrevPositionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ReloadPosition(-1);
-}
-
-void ReloadPositionProc(w, event, prms, nprms)
-     Widget w;
-     XEvent *event;
-     String *prms;
-     Cardinal *nprms;
-{
-    ReloadPosition(0);
-}
-
 void LoadPositionProc(w, event, prms, nprms)
      Widget w;
      XEvent *event;