paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 16:19:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed trayicon compilation under gtk2

Browse Source 
git-svn-id: trunk@9322 -
This commit is contained in:
mattias 2006-05-21 08:25:08 +00:00
parent 8d4b943024
commit 18b6c31b47
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/opengl/gtk2x11/gdk2x.pas
View File

@ -41,11 +41,11 @@ uses
{$DEFINE read_forward_definitions} {$DEFINE read_forward_definitions}
type type
{$I gdk2x11includes.inc} {$I include/gdk2x11includes.inc}
{$UNDEF read_forward_definitions} {$UNDEF read_forward_definitions}
{$DEFINE read_interface_rest} {$DEFINE read_interface_rest}
{$I gdk2x11includes.inc} {$I include/gdk2x11includes.inc}
{$UNDEF read_interface_rest} {$UNDEF read_interface_rest}
implementation implementation
@ -57,7 +57,7 @@ implementation
// call implementation parts of header files // call implementation parts of header files
{$DEFINE read_implementation} {$DEFINE read_implementation}
{$I gdk2x11includes.inc} {$I include/gdk2x11includes.inc}
{$UNDEF read_implementation} {$UNDEF read_implementation}
end. end.

11
components/trayicon/trayiconlaz.lpk
View File

@ -5,7 +5,8 @@
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="5"/>
<SearchPaths> <SearchPaths>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)/"/> <OtherUnitFiles Value="$(LazarusDir)/components/opengl/gtk2x11/"/>
<UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
</SearchPaths> </SearchPaths>
<CodeGeneration> <CodeGeneration>
<Generate Value="Faster"/> <Generate Value="Faster"/>
@ -19,7 +20,7 @@
<Item1> <Item1>
<Filename Value="wswin32trayicon.pas"/> <Filename Value="wswin32trayicon.pas"/>
<AddToUsesPkgSection Value="False"/> <AddToUsesPkgSection Value="False"/>
<UnitName Value="WSWin32TrayIcon"/> <UnitName Value="wswin32trayicon"/>
</Item1> </Item1>
<Item2> <Item2>
<Filename Value="trayicon.pas"/> <Filename Value="trayicon.pas"/>
@ -29,16 +30,16 @@
<Item3> <Item3>
<Filename Value="wsgtk2trayicon.pas"/> <Filename Value="wsgtk2trayicon.pas"/>
<AddToUsesPkgSection Value="False"/> <AddToUsesPkgSection Value="False"/>
<UnitName Value="WSGtk2TrayIcon"/> <UnitName Value="wsgtk2trayicon"/>
</Item3> </Item3>
<Item4> <Item4>
<Filename Value="wsgtktrayicon.pas"/> <Filename Value="wsgtktrayicon.pas"/>
<AddToUsesPkgSection Value="False"/> <AddToUsesPkgSection Value="False"/>
<UnitName Value="WSGtkTrayIcon"/> <UnitName Value="wsgtktrayicon"/>
</Item4> </Item4>
<Item5> <Item5>
<Filename Value="wstrayicon.pas"/> <Filename Value="wstrayicon.pas"/>
<UnitName Value="WSTrayIcon"/> <UnitName Value="wstrayicon"/>
</Item5> </Item5>
</Files> </Files>
<Type Value="RunAndDesignTime"/> <Type Value="RunAndDesignTime"/>

2
components/trayicon/wscommontrayicon.pas
View File

@ -16,7 +16,7 @@
Common code to all widgetsets. Common code to all widgetsets.
} }
unit wscommontrayicon; unit WSCommonTrayIcon;
{$ifdef FPC} {$ifdef FPC}
{$mode delphi}{$H+} {$mode delphi}{$H+}

4
components/trayicon/wsgtk2trayicon.pas
View File

@ -18,7 +18,7 @@
Gtk2 specific code. Gtk2 specific code.
} }
unit wsgtk2trayicon; unit WSGtk2TrayIcon;
{$ifdef FPC} {$ifdef FPC}
{$mode delphi}{$H+} {$mode delphi}{$H+}
@ -30,7 +30,7 @@ interface
uses uses
Graphics, Classes, ExtCtrls, SysUtils, Forms, Controls, Dialogs, Graphics, Classes, ExtCtrls, SysUtils, Forms, Controls, Dialogs,
Menus, wscommontrayicon, x, xlib, xutil, gtk2, gdk2, gdk2x, glib2, gtkdef; Menus, WSCommonTrayIcon, x, xlib, xutil, gtk2, gdk2, gdk2x, glib2, gtkdef;
type type

4
components/trayicon/wswin32trayicon.pas
View File

@ -18,7 +18,7 @@
Win32 specific code. Win32 specific code.
} }
unit wswin32trayicon; unit WSWin32TrayIcon;
{$ifdef FPC} {$ifdef FPC}
{$mode delphi}{$H+} {$mode delphi}{$H+}
@ -28,7 +28,7 @@ interface
uses uses
Windows, Classes, SysUtils, Graphics, Menus, Forms, Controls, Windows, Classes, SysUtils, Graphics, Menus, Forms, Controls,
wscommontrayicon; WSCommonTrayIcon;
type type