<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40325 >
2008/6/25 Andreas Røsdal:
>
> Hello,
>
> I get a compilation error in client/editor.c when compiling a non gtk-2.0
> client, because editgui_popup_properties() from gtk-2.0 is used in
> client/editor.c. Code in editor.c should really be common to all clients.
Fix
- ML
diff -Nurd -X.diff_ignore freeciv/client/gui-ftwl/gui_main.c
freeciv/client/gui-ftwl/gui_main.c
--- freeciv/client/gui-ftwl/gui_main.c 2008-02-02 09:04:26.000000000 +0200
+++ freeciv/client/gui-ftwl/gui_main.c 2008-06-25 11:24:16.000000000 +0300
@@ -18,17 +18,22 @@
#include <stdio.h>
#include <assert.h>
+/* utility */
#include "fcintl.h"
#include "fciconv.h"
#include "log.h"
#include "registry.h"
+/* client */
+#include "clinet.h"
+#include "editgui_g.h"
+#include "graphics_g.h"
+
#include "chatline.h"
#include "colors_common.h"
#include "colors.h"
#include "back_end.h"
#include "widget.h"
-#include "graphics_g.h"
#include "civclient.h"
#include "shared.h"
#include "support.h"
@@ -37,7 +42,6 @@
#include "chat.h"
#include "mapview.h"
#include "control.h"
-#include "clinet.h"
#include "gui_main.h"
@@ -345,3 +349,21 @@
{
sw_add_timeout(-1, callback, data);
}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_tileset_changed(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_refresh(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_popup_properties(const struct tile_list *tiles)
+{}
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/gui_main.c
freeciv/client/gui-sdl/gui_main.c
--- freeciv/client/gui-sdl/gui_main.c 2008-03-08 16:13:02.000000000 +0200
+++ freeciv/client/gui-sdl/gui_main.c 2008-06-25 11:20:42.000000000 +0300
@@ -51,6 +51,7 @@
/* client */
#include "civclient.h"
#include "clinet.h"
+#include "editgui_g.h"
#include "ggzclient.h"
#include "tilespec.h"
@@ -1120,3 +1121,21 @@
callback_list_prepend(callbacks, cb);
}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_tileset_changed(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_refresh(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_popup_properties(const struct tile_list *tiles)
+{}
diff -Nurd -X.diff_ignore freeciv/client/gui-stub/gui_main.c
freeciv/client/gui-stub/gui_main.c
--- freeciv/client/gui-stub/gui_main.c 2007-08-04 18:39:12.000000000 +0300
+++ freeciv/client/gui-stub/gui_main.c 2008-06-25 11:25:29.000000000 +0300
@@ -17,10 +17,13 @@
#include <stdio.h>
+/* utility */
#include "fciconv.h"
#include "log.h"
+/* client */
#include "civclient.h"
+#include "editgui_g.h"
#include "options.h"
#include "gui_main.h"
@@ -170,3 +173,21 @@
freelog(LOG_ERROR, "Unimplemented add_idle_callback.");
(callback)(data);
}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_tileset_changed(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_refresh(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_popup_properties(const struct tile_list *tiles)
+{}
diff -Nurd -X.diff_ignore freeciv/client/gui-win32/gui_main.c
freeciv/client/gui-win32/gui_main.c
--- freeciv/client/gui-win32/gui_main.c 2008-02-04 08:53:36.000000000 +0200
+++ freeciv/client/gui-win32/gui_main.c 2008-06-25 11:26:10.000000000 +0300
@@ -41,6 +41,7 @@
#include "connectdlg.h"
#include "control.h"
#include "dialogs.h"
+#include "editgui_g.h"
#include "gotodlg.h"
#include "gui_stuff.h"
#include "graphics.h"
@@ -906,3 +907,21 @@
callback_list_prepend(callbacks, cb);
}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_tileset_changed(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_refresh(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_popup_properties(const struct tile_list *tiles)
+{}
diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/gui_main.c
freeciv/client/gui-xaw/gui_main.c
--- freeciv/client/gui-xaw/gui_main.c 2008-03-08 16:12:58.000000000 +0200
+++ freeciv/client/gui-xaw/gui_main.c 2008-06-25 11:23:03.000000000 +0300
@@ -48,14 +48,17 @@
#include "unitlist.h"
#include "version.h"
+/* client */
#include "civclient.h"
#include "climisc.h"
#include "clinet.h"
#include "control.h"
+#include "editgui_g.h"
#include "options.h"
#include "text.h"
#include "tilespec.h"
+/* gui-xaw */
#include "actions.h"
#include "colors.h"
#include "dialogs.h"
@@ -1050,3 +1053,21 @@
}
}
}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_tileset_changed(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_refresh(void)
+{}
+
+/****************************************************************************
+ Stub for editor function
+****************************************************************************/
+void editgui_popup_properties(const struct tile_list *tiles)
+{}
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
