Make the tone of the error messages a bit less formal, by using

[obnox/wireshark/wip.git] / gtk / font_utils.c

diff --git a/gtk/font_utils.c b/gtk/font_utils.c
index 1b263f8aae6bd1f5f5dcaefe1e02885768c48123..52d317c4655f264d88326aaa709b143f0d05964d 100644 (file)
--- a/gtk/font_utils.c
+++ b/gtk/font_utils.c
@@ -33,12 +33,12 @@
 
 #include <epan/packet.h>
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
 #include "recent.h"
-#include "prefs.h"
+#include <epan/prefs.h>
 
 #include "gtkglobals.h"
 
@@ -300,7 +300,7 @@ user_font_test(gchar *font_name)
                   Tell the user, but don't tear down the font selection
                   dialog, so that they can try again. */
                simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
-                  "The font you selected cannot be loaded.");
+                  "The font you selected can't be loaded.");
 
 #if GTK_MAJOR_VERSION < 2
                g_free(bold_font_name);
@@ -572,7 +572,7 @@ user_font_apply(void) {
 }
 
 
-#ifdef WIN32
+#ifdef _WIN32
 
 #define NAME_BUFFER_LEN 32
 
@@ -712,7 +712,7 @@ static void try_to_get_windows_font_gtk2(void)
 }
 #endif /* GTK_MAJOR_VERSION */
 
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 
 void font_init(void)
@@ -721,7 +721,7 @@ void font_init(void)
   gchar *bold_font_name;
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 #if GTK_MAJOR_VERSION >= 2
   /* try to load the application font for GTK2 */
   try_to_get_windows_font_gtk2();