paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 22:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* resolved gtkprivate name conflict

Browse Source 
git-svn-id: trunk@10697 -
This commit is contained in:
marc 2007-02-27 23:17:33 +00:00
parent 72db634567
commit 61b16d06a0
15 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@ -2476,7 +2476,7 @@ lcl/interfaces/gtk/gtk1extra.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1extrah.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1memostrings.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1memostringsh.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtk1private.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtk1wsprivate.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkcallback.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkcomboboxcallback.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkdef.pp svneol=native#text/pascal
@ -2498,7 +2498,6 @@ lcl/interfaces/gtk/gtklistviewcallback.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkmsgqueue.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkobject.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkpagecallback.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkprivate.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkprivatewidget.inc svneol=native#text/plain
lcl/interfaces/gtk/gtkproc.inc svneol=native#text/pascal
lcl/interfaces/gtk/gtkproc.pp svneol=native#text/pascal
@ -2528,6 +2527,7 @@ lcl/interfaces/gtk/gtkwsimglist.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkwsmaskedit.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkwsmenus.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkwspairsplitter.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkwsprivate.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkwsspin.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkwsstdctrls.pp svneol=native#text/pascal
lcl/interfaces/gtk/gtkwstoolwin.pp svneol=native#text/pascal
@ -2551,7 +2551,6 @@ lcl/interfaces/gtk2/gtk2lclintf.inc svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2lclintfh.inc svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2memostrings.inc svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2object.inc svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2private.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2privatewidget.inc svneol=native#text/plain
lcl/interfaces/gtk2/gtk2winapi.inc svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2winapih.inc svneol=native#text/pascal
@ -2579,6 +2578,7 @@ lcl/interfaces/gtk2/gtk2wsimglist.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2wsmaskedit.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2wsmenus.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2wspairsplitter.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2wsprivate.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2wsspin.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2wsstdctrls.pp svneol=native#text/pascal
lcl/interfaces/gtk2/gtk2wstoolwin.pp svneol=native#text/pascal

4
lcl/interfaces/gtk/gtk1private.pp → lcl/interfaces/gtk/gtk1wsprivate.pp
View File

@ -25,7 +25,7 @@
*****************************************************************************
}
unit Gtk1Private;
unit Gtk1WSPrivate;
{$mode objfpc}{$H+}
interface
@ -38,7 +38,7 @@ uses
// widgetset
WSControls, WSLCLClasses, WSProc,
// interface
GtkDef, GtkProc, GtkPrivate;
GtkDef, GtkProc, GtkWSPrivate;
type

2
lcl/interfaces/gtk/gtkint.pp
View File

@ -73,7 +73,7 @@ uses
LCLProc, LCLIntf, LCLType, DynHashArray, GraphType, GraphMath,
Graphics, Menus, Maps,
// widgetset
GtkFontCache, gtkDef, GtkProc, gtkMsgQueue, GtkExtra, gtkPrivate, WSLCLClasses;
GtkFontCache, gtkDef, GtkProc, gtkMsgQueue, GtkExtra, gtkWSPrivate, WSLCLClasses;
type

2
lcl/interfaces/gtk/gtkprivatewidget.inc
View File

@ -1,4 +1,4 @@
{%mainunit gtkprivate.pp}
{%mainunit gtkwsprivate.pp}
{
*****************************************************************************

2
lcl/interfaces/gtk/gtkproc.pp
View File

@ -792,7 +792,7 @@ implementation
uses
{$IFDEF StaticXinerama} Xinerama, {$ENDIF}
dynlibs, GtkPrivate;
dynlibs, GtkWSPrivate;
const
KCINFO_FLAG_SHIFT = $01;

4
lcl/interfaces/gtk/gtkwsbuttons.pp
View File

@ -29,9 +29,9 @@ interface
uses
// libs
{$IFDEF GTK2}
GLib2, Gtk2, Gtk2Private,
GLib2, Gtk2, Gtk2WSPrivate,
{$ELSE}
GLib, Gtk, Gtk1Private,
GLib, Gtk, Gtk1WSPrivate,
{$ENDIF}
// LCL
Classes, LCLProc, LCLType, LMessages, Controls, Graphics, Buttons,

2
lcl/interfaces/gtk/gtkwscomctrls.pp
View File

@ -39,7 +39,7 @@ uses
// widgetset
WSComCtrls, WSLCLClasses, WSProc, WSControls,
// interface
GtkDef, GtkExtra, GtkPrivate;
GtkDef, GtkExtra, GtkWSPrivate;
type

4
lcl/interfaces/gtk/gtkwscontrols.pp
View File

@ -37,9 +37,9 @@ uses
SysUtils, Classes, Controls, LMessages, InterfaceBase,
WSControls, WSLCLClasses, WSProc,
Graphics, ComCtrls, LCLType,
GTKPrivate,
GTKWSPrivate,
{$ifdef gtk1}
GTK1Private,
GTK1WSPrivate,
{$endif}
GtkDef, GTKExtra;

2
lcl/interfaces/gtk/gtkwsextctrls.pp
View File

@ -31,7 +31,7 @@ uses
{$IFDEF GTK2}
gtk2, gdk2, gdk2PixBuf, glib2,
{$ELSE GTK2}
gtk, gdk, glib, gtk1private,
gtk, gdk, glib, gtk1WSPrivate,
{$ENDIF GTK2}
GtkGlobals, GtkProc, GtkDef, ExtCtrls, Classes,
WSExtCtrls, WSLCLClasses, gtkint, interfacebase;

2
lcl/interfaces/gtk/gtkwsforms.pp
View File

@ -35,7 +35,7 @@ uses
SysUtils, Classes, LCLProc, LCLType, Controls, LMessages, InterfaceBase,
Graphics, Dialogs,Forms, Math,
WSDialogs, WSLCLClasses, WSControls, WSForms, WSProc,
gtkInt, gtkProc, gtkWSControls, gtkDef, gtkExtra, GtkPrivate;
gtkInt, gtkProc, gtkWSControls, gtkDef, gtkExtra, GtkWSPrivate;
type

4
lcl/interfaces/gtk/gtkprivate.pp → lcl/interfaces/gtk/gtkwsprivate.pp
View File

@ -1,7 +1,7 @@
{ $Id$ }
{
----------------------------------------
Gtkprivate.pp - Gtk internal classes
GtkWSprivate.pp - Gtk internal classes
----------------------------------------
@created(Thu Feb 1st WET 2007)
@ -25,7 +25,7 @@
*****************************************************************************
}
unit GtkPrivate;
unit GtkWSPrivate;
{$mode objfpc}{$H+}
interface

2
lcl/interfaces/gtk/gtkwsstdctrls.pp
View File

@ -34,7 +34,7 @@ uses
glib, gdk, gtk, {$Ifndef NoGdkPixbufLib}gdkpixbuf,{$EndIf} GtkFontCache,
{$ENDIF}
WSStdCtrls, WSLCLClasses, WSProc, WSControls, GtkInt, LCLType, GtkDef, LCLProc,
GTKWinApiWindow, gtkglobals, gtkproc, gtkExtra, GtkPrivate, InterfaceBase;
GTKWinApiWindow, gtkglobals, gtkproc, gtkExtra, GtkWSPrivate, InterfaceBase;
type

2
lcl/interfaces/gtk2/gtk2privatewidget.inc
View File

@ -1,4 +1,4 @@
{%mainunit gtk2private.pp}
{%mainunit gtk2wsprivate.pp}
{
*****************************************************************************

2
lcl/interfaces/gtk2/gtk2wsextctrls.pp
View File

@ -33,7 +33,7 @@ uses
ExtCtrls, Classes, Controls, LCLType,
// widgetset
WSExtCtrls, WSLCLClasses, WSProc,
GtkWSExtCtrls, gtk2private;
GtkWSExtCtrls, gtk2WSPrivate;
type

10
lcl/interfaces/gtk2/gtk2private.pp → lcl/interfaces/gtk2/gtk2wsprivate.pp
View File

@ -1,8 +1,8 @@
{ $Id$ }
{
----------------------------------------
gtk2private.pp - Gtk2 internal classes
----------------------------------------
------------------------------------------
gtk2wsprivate.pp - Gtk2 internal classes
------------------------------------------
@created(Thu Feb 1st WET 2007)
@lastmod($Date$)
@ -25,7 +25,7 @@
*****************************************************************************
}
unit Gtk2Private;
unit Gtk2WSPrivate;
{$mode objfpc}{$H+}
interface
@ -38,7 +38,7 @@ uses
// widgetset
WSControls, WSLCLClasses, WSProc,
// interface
GtkDef, GtkProc, GtkPrivate;
GtkDef, GtkProc, GtkWSPrivate;
type