* Improve win64 support gtk2, step 1: updating ifdefs. Patch by Julian Schutsch, Mantis #20578

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@19874 3ad0048d-3df7-0310-abae-a5850022a9f2

22 files changed, 24 insertions, 24 deletions

diff --git a/packages/gtk2/src/atk/atk.pas b/packages/gtk2/src/atk/atk.pas
index 2af1927fc6..ee84db5af8 100644
--- a/packages/gtk2/src/atk/atk.pas
+++ b/packages/gtk2/src/atk/atk.pas
@@ -30,7 +30,7 @@ interface
 uses glib2;
 
 const
-{$ifdef win32}
+{$ifdef windows}
   {$define atkwin}
   atklib = 'libatk-1.0-0.dll';
   {$IFDEF FPC}
diff --git a/packages/gtk2/src/glib/gincludes.inc b/packages/gtk2/src/glib/gincludes.inc
index 5db929ffca..9314b84af8 100644
--- a/packages/gtk2/src/glib/gincludes.inc
+++ b/packages/gtk2/src/glib/gincludes.inc
@@ -66,7 +66,7 @@
 
 {$include gmarshal.inc}
 
-{$IFDEF win32}
+{$IFDEF winDOWS}
 {$include gwin32.inc}
 {$ENDIF}
 
diff --git a/packages/gtk2/src/glib/giochannel.inc b/packages/gtk2/src/glib/giochannel.inc
index db088f848d..b112bebf3f 100644
--- a/packages/gtk2/src/glib/giochannel.inc
+++ b/packages/gtk2/src/glib/giochannel.inc
@@ -194,7 +194,7 @@ function g_io_channel_unix_get_fd(channel:PGIOChannel):gint;cdecl;external glibl
 { Hook for GClosure / GSource integration. Don't touch  }
 //GLIB_VAR GSourceFuncs g_io_watch_funcs;
 
-{$ifdef WIN32}
+{$ifdef WINDOWS}
 
 const
   G_WIN32_MSG_HANDLE = 19981206;
diff --git a/packages/gtk2/src/glib/glib2.pas b/packages/gtk2/src/glib/glib2.pas
index d458f78bfa..bef2c9cdc3 100644
--- a/packages/gtk2/src/glib/glib2.pas
+++ b/packages/gtk2/src/glib/glib2.pas
@@ -38,7 +38,7 @@ uses
   ctypes,SysUtils;
 
 const
-{$ifdef win32}
+{$ifdef windows}
   {$define gtkwin}
   gliblib    = 'libglib-2.0-0.dll';
   gthreadlib = 'libgthread-2.0-0.dll';
diff --git a/packages/gtk2/src/glib/glibconfig.inc b/packages/gtk2/src/glib/glibconfig.inc
index d263d5c3f3..b41d4abc43 100644
--- a/packages/gtk2/src/glib/glibconfig.inc
+++ b/packages/gtk2/src/glib/glibconfig.inc
@@ -102,7 +102,7 @@ const
    GLIB_SYSDEF_POLLHUP   = 16;
    GLIB_SYSDEF_POLLNVAL  = 32;
 
-{$ifdef win32}
+{$ifdef windows}
    G_MODULE_SUFFIX  = 'dll';
 {$else}
    G_MODULE_SUFFIX  = 'so';
diff --git a/packages/gtk2/src/glib/gmain.inc b/packages/gtk2/src/glib/gmain.inc
index 1c331265d5..38f7827a0e 100644
--- a/packages/gtk2/src/glib/gmain.inc
+++ b/packages/gtk2/src/glib/gmain.inc
@@ -182,7 +182,7 @@ function g_idle_remove_by_data(data:gpointer):gboolean;cdecl;external gliblib na
 // GLIB_VAR GSourceFuncs g_timeout_funcs;
 // GLIB_VAR GSourceFuncs g_idle_funcs;
 
-{$ifdef win32}
+{$ifdef windows}
 procedure g_main_poll_win32_msg_add(priority:gint; fd:PGPollFD; hwnd:guint);cdecl;external gliblib name 'g_main_poll_win32_msg_add';
 {$endif}
 
diff --git a/packages/gtk2/src/glib/gmem.inc b/packages/gtk2/src/glib/gmem.inc
index 89d813fb6f..ec6b2370d9 100644
--- a/packages/gtk2/src/glib/gmem.inc
+++ b/packages/gtk2/src/glib/gmem.inc
@@ -52,7 +52,7 @@ function g_mem_is_system_malloc:gboolean; cdecl; external gliblib;
 {$IFNDEF KYLIX}
 { Memory profiler and checker, has to be enabled via g_mem_set_vtable() }
 var
-  {$IFDEF WIN32}
+  {$IFDEF WINDOWS}
   glib_mem_profiler_table : PGMemVTable; external gliblib name 'glib_mem_profiler_table';
   {$ELSE}
   glib_mem_profiler_table : PGMemVTable;cvar;external;
diff --git a/packages/gtk2/src/glib/gthread.inc b/packages/gtk2/src/glib/gthread.inc
index d8d57c39e9..85c6e3c906 100644
--- a/packages/gtk2/src/glib/gthread.inc
+++ b/packages/gtk2/src/glib/gthread.inc
@@ -92,7 +92,7 @@ function G_THREAD_ERROR: TGQuark;
 
 {$IFNDEF KYLIX}
   var
-    {$IFDEF WIN32}
+    {$IFDEF WINDOWS}
     g_thread_functions_for_glib_use : TGThreadFunctions; external gliblib name 'g_thread_functions_for_glib_use';
     g_thread_use_default_impl       : gboolean; external gliblib name 'g_thread_use_default_impl';
     g_threads_got_initialized       : gboolean; external gliblib name 'g_threads_got_initialized';
diff --git a/packages/gtk2/src/glib/gutils.inc b/packages/gtk2/src/glib/gutils.inc
index fcd05a69fb..e2b24e9bd3 100644
--- a/packages/gtk2/src/glib/gutils.inc
+++ b/packages/gtk2/src/glib/gutils.inc
@@ -11,7 +11,7 @@
 //------------------------------------------------------------------------------
 
 {$IFDEF read_interface_rest}
-{$ifdef WIN32}
+{$ifdef WINDOWS}
 
   { On native Win32, directory separator is the backslash, and search path
      separator is the semicolon.
diff --git a/packages/gtk2/src/gtk+/gdk-pixbuf/gdk2pixbuf.pas b/packages/gtk2/src/gtk+/gdk-pixbuf/gdk2pixbuf.pas
index c17ee7bc7e..6680a43e3c 100644
--- a/packages/gtk2/src/gtk+/gdk-pixbuf/gdk2pixbuf.pas
+++ b/packages/gtk2/src/gtk+/gdk-pixbuf/gdk2pixbuf.pas
@@ -36,7 +36,7 @@ interface
 uses glib2;
 
 const
-{$ifdef win32}
+{$ifdef windows}
   {$define gdkpixbufwin}
   gdkpixbuflib = 'libgdk_pixbuf-2.0-0.dll';
   {$IFDEF FPC}
@@ -77,7 +77,7 @@ const
 
 {$IFNDEF Kylix}
 var
-  {$IFDEF WIN32 }
+  {$IFDEF WINDOWS }
   gdk_pixbuf_major_version: guint; external gdkpixbuflib name 'gdk_pixbuf_major_version';
   gdk_pixbuf_minor_version: guint; external gdkpixbuflib name 'gdk_pixbuf_minor_version';
   gdk_pixbuf_micro_version: guint; external gdkpixbuflib name 'gdk_pixbuf_micro_version';
diff --git a/packages/gtk2/src/gtk+/gdk/gdk2.pas b/packages/gtk2/src/gtk+/gdk/gdk2.pas
index 07c3f8ea6d..841c09bc0c 100644
--- a/packages/gtk2/src/gtk+/gdk/gdk2.pas
+++ b/packages/gtk2/src/gtk+/gdk/gdk2.pas
@@ -33,7 +33,7 @@ uses glib2, gdk2pixbuf, pango, cairo;
 
 const
 // OS dependent defines
-{$ifdef win32}
+{$ifdef windows}
   {$DEFINE GDK_WINDOWING_WIN32}
   gdklib = 'libgdk-win32-2.0-0.dll';
   {$IFDEF FPC}
@@ -179,7 +179,7 @@ procedure gdk_event_send_clientmessage_toall(event:PGdkEvent); cdecl; external g
 {$IFNDEF KYLIX}
 { Threading }
 var
-  {$IFDEF WIN32}
+  {$IFDEF WINDOWS}
   gdk_threads_mutex : PGMutex; external gdklib name 'gdk_threads_mutex';
   {$ELSE}
   gdk_threads_mutex : PGMutex; cvar; external;
diff --git a/packages/gtk2/src/gtk+/gtk/gtk2.pas b/packages/gtk2/src/gtk+/gtk/gtk2.pas
index 26e74aa524..000d329eab 100644
--- a/packages/gtk2/src/gtk+/gtk/gtk2.pas
+++ b/packages/gtk2/src/gtk+/gtk/gtk2.pas
@@ -72,7 +72,7 @@ uses
 
 const
 // OS dependent defines
-{$ifdef win32}
+{$ifdef windows}
   {$DEFINE GTK_WINDOWING_WIN32}
   gtklib = 'libgtk-win32-2.0-0.dll';
   {$IFDEF FPC}
diff --git a/packages/gtk2/src/gtk+/gtk/gtkbox.inc b/packages/gtk2/src/gtk+/gtk/gtkbox.inc
index 045aeff51e..38e5b1f0a3 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkbox.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkbox.inc
@@ -11,7 +11,7 @@
         container : TGtkContainer;
         children : PGList;
         spacing : gint16;
-        flag0 : {$ifdef win32}longint{$else}word{$endif};
+        flag0 : {$ifdef windows}longint{$else}word{$endif};
      end;
 
    PGtkBoxClass = ^TGtkBoxClass;
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmain.inc b/packages/gtk2/src/gtk+/gtk/gtkmain.inc
index 731ecd1465..1144ed2feb 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkmain.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkmain.inc
@@ -37,7 +37,7 @@ const
 {$IFNDEF KYLIX}
 { Gtk version.  }
 var
-  {$IFDEF WIN32}
+  {$IFDEF WINDOWS}
    gtk_major_version : guint;external gtklib name 'gtk_major_version';
    gtk_minor_version : guint;external gtklib name 'gtk_minor_version';
    gtk_micro_version : guint;external gtklib name 'gtk_micro_version';
diff --git a/packages/gtk2/src/gtk+/gtk/gtkscrolledwindow.inc b/packages/gtk2/src/gtk+/gtk/gtkscrolledwindow.inc
index 2eba92b532..02f42acc60 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkscrolledwindow.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkscrolledwindow.inc
@@ -12,7 +12,7 @@
         container : TGtkBin;
         hscrollbar : PGtkWidget;
         vscrollbar : PGtkWidget;
-        flag0 : {$ifdef win32}longint{$else}word{$endif};
+        flag0 : {$ifdef windows}longint{$else}word{$endif};
         shadow_type : guint16;
      end;
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtktextlayout.inc b/packages/gtk2/src/gtk+/gtk/gtktextlayout.inc
index fce51ef227..82f6c1ea5e 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktextlayout.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktextlayout.inc
@@ -132,7 +132,7 @@
 {$IFDEF read_interface_rest}
 {$IFNDEF KYLIX}
 var
-  {$IFDEF WIN32}
+  {$IFDEF WINDOWS}
    gtk_text_attr_appearance_type : TPangoAttrType; external gtklib name 'gtk_text_attr_appearance_type';
   {$ELSE}
    gtk_text_attr_appearance_type : TPangoAttrType;cvar; external;
diff --git a/packages/gtk2/src/gtkglext/gdkglext.pas b/packages/gtk2/src/gtkglext/gdkglext.pas
index 8b6a1532e5..6f0a2f1166 100644
--- a/packages/gtk2/src/gtkglext/gdkglext.pas
+++ b/packages/gtk2/src/gtkglext/gdkglext.pas
@@ -31,7 +31,7 @@ uses Glib2, Gdk2;
 
 const
   GdkGLExtLib = 
-    {$ifdef WIN32} 'libgdkglext-win32-1.0-0.dll'
+    {$ifdef WINDOWS} 'libgdkglext-win32-1.0-0.dll'
     {$else}        
       {$ifdef DARWIN}
         'gdkglext-x11-1.0'
diff --git a/packages/gtk2/src/gtkglext/gtkglext.pas b/packages/gtk2/src/gtkglext/gtkglext.pas
index f7b958edb6..c0ad9c58f2 100644
--- a/packages/gtk2/src/gtkglext/gtkglext.pas
+++ b/packages/gtk2/src/gtkglext/gtkglext.pas
@@ -31,7 +31,7 @@ uses Glib2, Gdk2, Gtk2, GdkGLExt;
 
 const
   GtkGLExtLib = 
-    {$ifdef WIN32} 'libgtkglext-win32-1.0-0.dll'
+    {$ifdef WINDOWS} 'libgtkglext-win32-1.0-0.dll'
     {$else}        
       {$ifdef DARWIN}
         'gtkglext-x11-1.0'
diff --git a/packages/gtk2/src/gtkhtml/gtkhtml.pas b/packages/gtk2/src/gtkhtml/gtkhtml.pas
index 42149befe6..af6df2d57f 100644
--- a/packages/gtk2/src/gtkhtml/gtkhtml.pas
+++ b/packages/gtk2/src/gtkhtml/gtkhtml.pas
@@ -39,7 +39,7 @@ uses
 const
 // OS dependent defines
 // !!!!! Maybe wrong for platforms other than linux !!!!!
-{$ifdef win32}
+{$ifdef windows}
   {$DEFINE GTK_WINDOWING_WIN32}
   gtkhtmllib = 'libgtkhtml-win32-2.0-0.dll';
   {$IFDEF FPC}
diff --git a/packages/gtk2/src/libglade/libglade2.pas b/packages/gtk2/src/libglade/libglade2.pas
index 3990c321ae..c4bb39c0f3 100644
--- a/packages/gtk2/src/libglade/libglade2.pas
+++ b/packages/gtk2/src/libglade/libglade2.pas
@@ -34,7 +34,7 @@ uses
   glib2, gtk2;
 
 const
-{$ifdef win32}
+{$ifdef windows}
   {$define gtkwin}
   LibGladeLib = 'libglade-2.0-0.dll';
   {$IFDEF FPC}
diff --git a/packages/gtk2/src/pango/pango.pas b/packages/gtk2/src/pango/pango.pas
index 8f4581a2cd..592f307bfb 100644
--- a/packages/gtk2/src/pango/pango.pas
+++ b/packages/gtk2/src/pango/pango.pas
@@ -36,7 +36,7 @@ uses glib2;
 {$DEFINE PANGO_ENABLE_BACKEND}
 
 const
-{$ifdef win32}
+{$ifdef windows}
   {$define pangowin}
   pangolib = 'libpango-1.0-0.dll';
   {$IFDEF FPC}
diff --git a/packages/gtk2/src/pangocairo/pangocairo.pas b/packages/gtk2/src/pangocairo/pangocairo.pas
index e097c93afa..e7a16e3d4c 100644
--- a/packages/gtk2/src/pangocairo/pangocairo.pas
+++ b/packages/gtk2/src/pangocairo/pangocairo.pas
@@ -33,7 +33,7 @@ interface
 uses glib2, pango, cairo;
 
 const
-{$ifdef win32}
+{$ifdef windows}
   {$define pangowin}
   pangocairolib = 'libpangocairo-1.0-0.dll';
   {$IFDEF FPC}