Some aid for compiler warnings

src/fe-gtk/chanlist.c

@@ -22,7 +22,9 @@
 #include <fcntl.h>
 #include <time.h>
 
-#ifndef WIN32
+#ifdef WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 
@@ -54,6 +56,7 @@
 #include "../common/server.h"
 #include "gtkutil.h"
 #include "maingui.h"
+#include "menu.h"
 
 
 #include "custom-list.h"

src/fe-gtk/editlist.c

@@ -23,7 +23,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifndef WIN32
+#ifdef WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 

src/fe-gtk/fe-gtk.c

@@ -57,6 +57,7 @@
 #include "fkeys.h"
 #include "plugin-tray.h"
 #include "urlgrab.h"
+#include "setup.h"
 
 #ifdef USE_XLIB
 #include <gdk/gdkx.h>
@@ -866,7 +867,7 @@ fe_ctrl_gui (session *sess, fe_gui_action action, int arg)
 		mg_detach (sess, arg);	/* arg: 0=toggle 1=detach 2=attach */
 		break;
 	case FE_GUI_APPLY:
-		setup_apply_real (TRUE, TRUE);
+		setup_apply_real (TRUE, TRUE, TRUE);
 	}
 }
 

src/fe-gtk/fe-gtk.vcxproj

@@ -120,6 +120,8 @@
     <ClInclude Include="plugingui.h" />
     <ClInclude Include="rawlog.h" />
     <ClInclude Include="search.h" />
+    <ClInclude Include="servlistgui.h" />
+    <ClInclude Include="setup.h" />
     <ClInclude Include="sexy-iso-codes.h" />
     <ClInclude Include="sexy-marshal.h" />
     <ClInclude Include="sexy-spell-entry.h" />

src/fe-gtk/fe-gtk.vcxproj.filters

@@ -102,6 +102,12 @@
     <ClInclude Include="xtext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="servlistgui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="setup.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="about.c">

src/fe-gtk/fkeys.c

@@ -24,12 +24,15 @@
 #include <fcntl.h>
 #include <ctype.h>
 
-#ifndef WIN32
+#ifdef WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 
 #include "fe-gtk.h"
 
+#include <glib.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkeditable.h>
 #include <gtk/gtkmenu.h>

src/fe-gtk/gtkutil.c

@@ -53,6 +53,7 @@
 #include "pixmaps.h"
 
 #ifdef WIN32
+#include <io.h>
 #if 0	/* native file dialogs */
 #include "../common/fe.h"
 #include "../common/thread.h"

src/fe-gtk/maingui.c

@@ -54,6 +54,7 @@
 #include "../common/modes.h"
 #include "../common/url.h"
 #include "../common/util.h"
+#include "../common/text.h"
 
 #include "fe-gtk.h"
 #include "banlist.h"
@@ -2801,7 +2802,10 @@ mg_inputbox_rightclick (GtkEntry *entry, GtkWidget *menu)
 static void
 mg_create_entry (session *sess, GtkWidget *box)
 {
-	GtkWidget *sw, *hbox, *but, *entry;
+	GtkWidget *hbox, *but, *entry;
+#ifdef USE_GTKSPELL
+	GtkWidget *sw;
+#endif
 	session_gui *gui = sess->gui;
 
 	hbox = gtk_hbox_new (FALSE, 0);
@@ -3695,7 +3699,9 @@ mg_drag_motion_cb (GtkWidget *widget, GdkDragContext *context, int x, int y, gui
 	GdkGCValues val;
 	int half, width, height;
 	int ox, oy;
+#if 0
 	GtkPaned *paned;
+#endif
 	GdkDrawable *draw;
 
 	/* ignore file drops */

src/fe-gtk/menu.c

@@ -23,6 +23,7 @@
 
 #ifdef WIN32
 #include <windows.h>
+#include <io.h>
 #else
 #include <unistd.h>
 #endif
@@ -72,6 +73,7 @@
 #include "urlgrab.h"
 #include "userlistgui.h"
 #include "menu.h"
+#include "servlistgui.h"
 
 static GSList *submenu_list;
 

src/fe-gtk/notifygui.c

@@ -45,6 +45,7 @@
 #include "../common/server.h"
 #include "../common/util.h"
 #include "../common/userlist.h"
+#include "../common/outbound.h"
 #include "gtkutil.h"
 #include "maingui.h"
 #include "palette.h"

src/fe-gtk/palette.c

@@ -22,7 +22,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#ifndef WIN32
+#ifdef WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 

src/fe-gtk/plugin-tray.c

@@ -8,6 +8,7 @@
 #include "../common/server.h"
 #include "../common/fe.h"
 #include "../common/util.h"
+#include "../common/outbound.h"
 #include "fe-gtk.h"
 #include "pixmaps.h"
 #include "maingui.h"
@@ -497,9 +498,11 @@ static void
 tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
 {
 	GtkWidget *menu;
+#ifndef WIN32
 	GtkWidget *submenu;
 	GtkWidget *item;
 	int away_status;
+#endif
 
 	/* ph may have an invalid context now */
 	xchat_set_context (ph, xchat_find_context (ph, NULL, NULL));

src/fe-gtk/rawlog.c

@@ -21,7 +21,9 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-#ifndef WIN32
+#ifdef WIN32
+#include <io.h>
+#else
 #include <unistd.h>
 #endif
 

src/fe-gtk/servlistgui.c

@@ -37,6 +37,7 @@
 #include "../common/servlist.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
+#include "../common/util.h"
 
 #include "fe-gtk.h"
 #include "gtkutil.h"

src/fe-gtk/servlistgui.h

@@ -0,0 +1 @@
+void servlist_autojoinedit (ircnet *net, char *channel, gboolean add);

src/fe-gtk/setup.c

@@ -21,6 +21,7 @@
 #include "palette.h"
 #include "pixmaps.h"
 #include "menu.h"
+#include "plugin-tray.h"
 
 #include <gtk/gtkcolorseldialog.h>
 #include <gtk/gtktable.h>

src/fe-gtk/setup.h

@@ -0,0 +1 @@
+void setup_apply_real (int new_pix, int do_ulist, int do_layout);

src/fe-gtk/sexy-spell-entry.c

@@ -35,6 +35,7 @@
 
 #ifdef WIN32
 #include "typedef.h"
+#include <io.h>
 #endif
 
 #include "../common/cfgfiles.h"

src/fe-gtk/userlistgui.c

@@ -40,6 +40,7 @@
 #include "../common/modes.h"
 #include "../common/notify.h"
 #include "../common/xchatc.h"
+#include "../common/fe.h"
 #include "gtkutil.h"
 #include "palette.h"
 #include "maingui.h"

src/fe-gtk/xtext.c

@@ -76,6 +76,8 @@
 
 #ifdef WIN32
 #include <windows.h>
+#include <io.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkwin32.h>
 #else
 #include <unistd.h>