[Freeciv-Dev] (PR#11177) fix GUI client bugs

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11177 >

This patch fixes some bugs in the GUI clients from PR#11146.

gui-win32 however is not tested.

jason

? confdefs.h
? conftest.c
? conftest.er1
Index: client/gui-gtk/cma_fe.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/cma_fe.h,v
retrieving revision 1.3
diff -u -r1.3 cma_fe.h
--- client/gui-gtk/cma_fe.h     24 Nov 2004 03:34:56 -0000      1.3
+++ client/gui-gtk/cma_fe.h     24 Nov 2004 08:11:16 -0000
@@ -38,9 +38,9 @@
   GtkWidget *change_command;
   GtkWidget *perm_command;
   GtkWidget *release_command;
-  GtkAdjustment *minimal_surplus[O_COUNT];
+  GtkAdjustment *minimal_surplus[O_MAX];
   GtkWidget *happy_button;
-  GtkAdjustment *factor[O_COUNT + 1];
+  GtkAdjustment *factor[O_MAX + 1];
   int id;                      /* needed to pass a preset_index */
 };
 
Index: client/gui-win32/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/cma_fe.c,v
retrieving revision 1.3
diff -u -r1.3 cma_fe.c
--- client/gui-win32/cma_fe.c   24 Nov 2004 03:34:56 -0000      1.3
+++ client/gui-win32/cma_fe.c   24 Nov 2004 08:11:16 -0000
@@ -52,9 +52,9 @@
   HWND change;
   HWND perm;
   HWND release;
-  HWND minimal_surplus[O_COUNT];
+  HWND minimal_surplus[O_MAX];
   HWND happy;
-  HWND factor[O_COUNT + 1];
+  HWND factor[O_MAX + 1];
   int id;
 };
 
Index: client/gui-xaw/cma_fe.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/cma_fe.c,v
retrieving revision 1.3
diff -u -r1.3 cma_fe.c
--- client/gui-xaw/cma_fe.c     24 Nov 2004 03:34:56 -0000      1.3
+++ client/gui-xaw/cma_fe.c     24 Nov 2004 08:11:16 -0000
@@ -70,9 +70,9 @@
 Widget *stat_surplus_label, *stat_factor_label;
 Widget control_button, change_button, preset_list, cma_dialog;
 Widget celebrate_toggle, result_label, release_button;
-Widget surplus_slider[O_COUNT], factor_slider[O_COUNT + 1];
+Widget surplus_slider[O_MAX], factor_slider[O_MAX + 1];
 
-int minimal_surplus[O_COUNT], factors[O_COUNT + 1];
+int minimal_surplus[O_MAX], factors[O_MAX + 1];
 struct city *current_city;
 char *initial_preset_list[] = {
       N_("For information on:"),