paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 21:02:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@19874 -
This commit is contained in:
marco 2011-12-18 22:48:47 +00:00
parent aea30f9bb2
commit 19a7e17361
22 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/gtk2/src/atk/atk.pas
View File

@ -30,7 +30,7 @@ interface
uses glib2; uses glib2;
const const
{$ifdef win32} {$ifdef windows}
{$define atkwin} {$define atkwin}
atklib = 'libatk-1.0-0.dll'; atklib = 'libatk-1.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}

2
packages/gtk2/src/glib/gincludes.inc
View File

@ -66,7 +66,7 @@
{$include gmarshal.inc} {$include gmarshal.inc}
{$IFDEF win32} {$IFDEF winDOWS}
{$include gwin32.inc} {$include gwin32.inc}
{$ENDIF} {$ENDIF}

2
packages/gtk2/src/glib/giochannel.inc
View File

@ -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 } { Hook for GClosure / GSource integration. Don't touch }
//GLIB_VAR GSourceFuncs g_io_watch_funcs; //GLIB_VAR GSourceFuncs g_io_watch_funcs;
{$ifdef WIN32} {$ifdef WINDOWS}
const const
G_WIN32_MSG_HANDLE = 19981206; G_WIN32_MSG_HANDLE = 19981206;

2
packages/gtk2/src/glib/glib2.pas
View File

@ -38,7 +38,7 @@ uses
ctypes,SysUtils; ctypes,SysUtils;
const const
{$ifdef win32} {$ifdef windows}
{$define gtkwin} {$define gtkwin}
gliblib = 'libglib-2.0-0.dll'; gliblib = 'libglib-2.0-0.dll';
gthreadlib = 'libgthread-2.0-0.dll'; gthreadlib = 'libgthread-2.0-0.dll';

2
packages/gtk2/src/glib/glibconfig.inc
View File

@ -102,7 +102,7 @@ const
GLIB_SYSDEF_POLLHUP = 16; GLIB_SYSDEF_POLLHUP = 16;
GLIB_SYSDEF_POLLNVAL = 32; GLIB_SYSDEF_POLLNVAL = 32;
{$ifdef win32} {$ifdef windows}
G_MODULE_SUFFIX = 'dll'; G_MODULE_SUFFIX = 'dll';
{$else} {$else}
G_MODULE_SUFFIX = 'so'; G_MODULE_SUFFIX = 'so';

2
packages/gtk2/src/glib/gmain.inc
View File

@ -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_timeout_funcs;
// GLIB_VAR GSourceFuncs g_idle_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'; procedure g_main_poll_win32_msg_add(priority:gint; fd:PGPollFD; hwnd:guint);cdecl;external gliblib name 'g_main_poll_win32_msg_add';
{$endif} {$endif}

2
packages/gtk2/src/glib/gmem.inc
View File

@ -52,7 +52,7 @@ function g_mem_is_system_malloc:gboolean; cdecl; external gliblib;
{$IFNDEF KYLIX} {$IFNDEF KYLIX}
{ Memory profiler and checker, has to be enabled via g_mem_set_vtable() } { Memory profiler and checker, has to be enabled via g_mem_set_vtable() }
var var
{$IFDEF WIN32} {$IFDEF WINDOWS}
glib_mem_profiler_table : PGMemVTable; external gliblib name 'glib_mem_profiler_table'; glib_mem_profiler_table : PGMemVTable; external gliblib name 'glib_mem_profiler_table';
{$ELSE} {$ELSE}
glib_mem_profiler_table : PGMemVTable;cvar;external; glib_mem_profiler_table : PGMemVTable;cvar;external;

2
packages/gtk2/src/glib/gthread.inc
View File

@ -92,7 +92,7 @@ function G_THREAD_ERROR: TGQuark;
{$IFNDEF KYLIX} {$IFNDEF KYLIX}
var var
{$IFDEF WIN32} {$IFDEF WINDOWS}
g_thread_functions_for_glib_use : TGThreadFunctions; external gliblib name 'g_thread_functions_for_glib_use'; 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_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'; g_threads_got_initialized : gboolean; external gliblib name 'g_threads_got_initialized';

2
packages/gtk2/src/glib/gutils.inc
View File

@ -11,7 +11,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
{$IFDEF read_interface_rest} {$IFDEF read_interface_rest}
{$ifdef WIN32} {$ifdef WINDOWS}
{ On native Win32, directory separator is the backslash, and search path { On native Win32, directory separator is the backslash, and search path
separator is the semicolon. separator is the semicolon.

4
packages/gtk2/src/gtk+/gdk-pixbuf/gdk2pixbuf.pas
View File

@ -36,7 +36,7 @@ interface
uses glib2; uses glib2;
const const
{$ifdef win32} {$ifdef windows}
{$define gdkpixbufwin} {$define gdkpixbufwin}
gdkpixbuflib = 'libgdk_pixbuf-2.0-0.dll'; gdkpixbuflib = 'libgdk_pixbuf-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
@ -77,7 +77,7 @@ const
{$IFNDEF Kylix} {$IFNDEF Kylix}
var var
{$IFDEF WIN32 } {$IFDEF WINDOWS }
gdk_pixbuf_major_version: guint; external gdkpixbuflib name 'gdk_pixbuf_major_version'; 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_minor_version: guint; external gdkpixbuflib name 'gdk_pixbuf_minor_version';
gdk_pixbuf_micro_version: guint; external gdkpixbuflib name 'gdk_pixbuf_micro_version'; gdk_pixbuf_micro_version: guint; external gdkpixbuflib name 'gdk_pixbuf_micro_version';

4
packages/gtk2/src/gtk+/gdk/gdk2.pas
View File

@ -33,7 +33,7 @@ uses glib2, gdk2pixbuf, pango, cairo;
const const
// OS dependent defines // OS dependent defines
{$ifdef win32} {$ifdef windows}
{$DEFINE GDK_WINDOWING_WIN32} {$DEFINE GDK_WINDOWING_WIN32}
gdklib = 'libgdk-win32-2.0-0.dll'; gdklib = 'libgdk-win32-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
@ -179,7 +179,7 @@ procedure gdk_event_send_clientmessage_toall(event:PGdkEvent); cdecl; external g
{$IFNDEF KYLIX} {$IFNDEF KYLIX}
{ Threading } { Threading }
var var
{$IFDEF WIN32} {$IFDEF WINDOWS}
gdk_threads_mutex : PGMutex; external gdklib name 'gdk_threads_mutex'; gdk_threads_mutex : PGMutex; external gdklib name 'gdk_threads_mutex';
{$ELSE} {$ELSE}
gdk_threads_mutex : PGMutex; cvar; external; gdk_threads_mutex : PGMutex; cvar; external;

2
packages/gtk2/src/gtk+/gtk/gtk2.pas
View File

@ -72,7 +72,7 @@ uses
const const
// OS dependent defines // OS dependent defines
{$ifdef win32} {$ifdef windows}
{$DEFINE GTK_WINDOWING_WIN32} {$DEFINE GTK_WINDOWING_WIN32}
gtklib = 'libgtk-win32-2.0-0.dll'; gtklib = 'libgtk-win32-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}

2
packages/gtk2/src/gtk+/gtk/gtkbox.inc
View File

@ -11,7 +11,7 @@
container : TGtkContainer; container : TGtkContainer;
children : PGList; children : PGList;
spacing : gint16; spacing : gint16;
flag0 : {$ifdef win32}longint{$else}word{$endif}; flag0 : {$ifdef windows}longint{$else}word{$endif};
end; end;
PGtkBoxClass = ^TGtkBoxClass; PGtkBoxClass = ^TGtkBoxClass;

2
packages/gtk2/src/gtk+/gtk/gtkmain.inc
View File

@ -37,7 +37,7 @@ const
{$IFNDEF KYLIX} {$IFNDEF KYLIX}
{ Gtk version. } { Gtk version. }
var var
{$IFDEF WIN32} {$IFDEF WINDOWS}
gtk_major_version : guint;external gtklib name 'gtk_major_version'; gtk_major_version : guint;external gtklib name 'gtk_major_version';
gtk_minor_version : guint;external gtklib name 'gtk_minor_version'; gtk_minor_version : guint;external gtklib name 'gtk_minor_version';
gtk_micro_version : guint;external gtklib name 'gtk_micro_version'; gtk_micro_version : guint;external gtklib name 'gtk_micro_version';

2
packages/gtk2/src/gtk+/gtk/gtkscrolledwindow.inc
View File

@ -12,7 +12,7 @@
container : TGtkBin; container : TGtkBin;
hscrollbar : PGtkWidget; hscrollbar : PGtkWidget;
vscrollbar : PGtkWidget; vscrollbar : PGtkWidget;
flag0 : {$ifdef win32}longint{$else}word{$endif}; flag0 : {$ifdef windows}longint{$else}word{$endif};
shadow_type : guint16; shadow_type : guint16;
end; end;

2
packages/gtk2/src/gtk+/gtk/gtktextlayout.inc
View File

@ -132,7 +132,7 @@
{$IFDEF read_interface_rest} {$IFDEF read_interface_rest}
{$IFNDEF KYLIX} {$IFNDEF KYLIX}
var var
{$IFDEF WIN32} {$IFDEF WINDOWS}
gtk_text_attr_appearance_type : TPangoAttrType; external gtklib name 'gtk_text_attr_appearance_type'; gtk_text_attr_appearance_type : TPangoAttrType; external gtklib name 'gtk_text_attr_appearance_type';
{$ELSE} {$ELSE}
gtk_text_attr_appearance_type : TPangoAttrType;cvar; external; gtk_text_attr_appearance_type : TPangoAttrType;cvar; external;

2
packages/gtk2/src/gtkglext/gdkglext.pas
View File

@ -31,7 +31,7 @@ uses Glib2, Gdk2;
const const
GdkGLExtLib = GdkGLExtLib =
{$ifdef WIN32} 'libgdkglext-win32-1.0-0.dll' {$ifdef WINDOWS} 'libgdkglext-win32-1.0-0.dll'
{$else} {$else}
{$ifdef DARWIN} {$ifdef DARWIN}
'gdkglext-x11-1.0' 'gdkglext-x11-1.0'

2
packages/gtk2/src/gtkglext/gtkglext.pas
View File

@ -31,7 +31,7 @@ uses Glib2, Gdk2, Gtk2, GdkGLExt;
const const
GtkGLExtLib = GtkGLExtLib =
{$ifdef WIN32} 'libgtkglext-win32-1.0-0.dll' {$ifdef WINDOWS} 'libgtkglext-win32-1.0-0.dll'
{$else} {$else}
{$ifdef DARWIN} {$ifdef DARWIN}
'gtkglext-x11-1.0' 'gtkglext-x11-1.0'

2
packages/gtk2/src/gtkhtml/gtkhtml.pas
View File

@ -39,7 +39,7 @@ uses
const const
// OS dependent defines // OS dependent defines
// !!!!! Maybe wrong for platforms other than linux !!!!! // !!!!! Maybe wrong for platforms other than linux !!!!!
{$ifdef win32} {$ifdef windows}
{$DEFINE GTK_WINDOWING_WIN32} {$DEFINE GTK_WINDOWING_WIN32}
gtkhtmllib = 'libgtkhtml-win32-2.0-0.dll'; gtkhtmllib = 'libgtkhtml-win32-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}

2
packages/gtk2/src/libglade/libglade2.pas
View File

@ -34,7 +34,7 @@ uses
glib2, gtk2; glib2, gtk2;
const const
{$ifdef win32} {$ifdef windows}
{$define gtkwin} {$define gtkwin}
LibGladeLib = 'libglade-2.0-0.dll'; LibGladeLib = 'libglade-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}

2
packages/gtk2/src/pango/pango.pas
View File

@ -36,7 +36,7 @@ uses glib2;
{$DEFINE PANGO_ENABLE_BACKEND} {$DEFINE PANGO_ENABLE_BACKEND}
const const
{$ifdef win32} {$ifdef windows}
{$define pangowin} {$define pangowin}
pangolib = 'libpango-1.0-0.dll'; pangolib = 'libpango-1.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}

2
packages/gtk2/src/pangocairo/pangocairo.pas
View File

@ -33,7 +33,7 @@ interface
uses glib2, pango, cairo; uses glib2, pango, cairo;
const const
{$ifdef win32} {$ifdef windows}
{$define pangowin} {$define pangowin}
pangocairolib = 'libpangocairo-1.0-0.dll'; pangocairolib = 'libpangocairo-1.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}