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

fixed 1.0.10 compilation

Browse Source 
git-svn-id: trunk@6809 -
This commit is contained in:
mattias 2005-02-19 16:30:47 +00:00
parent 32ed3ffefa
commit e9a11c2116
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lcl/interfaces/gtk/gtkobject.inc
View File

@ -334,7 +334,7 @@ begin
then begin
DebugLn(ProcName,Format(rsWarningUnreleasedGDIObjectsDump,
[FGDIObjects.Count]));
for GDIType := Low(GDIType) to High(GDIType) do
for GDIType := Low(TGDIType) to High(TGDIType) do
GDITypeCount[GDIType] := 0;
n:=0;
@ -7010,6 +7010,9 @@ end;
{ =============================================================================
$Log$
Revision 1.629 2005/02/19 16:30:46 mattias
fixed 1.0.10 compilation
Revision 1.628 2005/02/17 02:10:52 mattias
fixed gtk2 intf checking if signal already connected

15
lcl/interfaces/gtk/gtkproc.inc
View File

@ -8002,11 +8002,10 @@ begin
end;
{$IFDEF GTK1}
{$IFNDEF Ver1_0}
var
FirstScreenCalled: Boolean = False;
FirstScreenResult: Boolean = False;
{$IFNDEF Ver1_0}
function GetFirstScreen: Boolean;
var
nMonitors: cint;
@ -8017,7 +8016,7 @@ var
pXineramaQueryScreens: function (dpy: PDisplay;
number: Pcint): PXineramaScreenInfo;cdecl;
begin
if not FirstScreenCalled then
if not FirstScreenCalled then begin
if XQueryExtension(X11Display, 'XINERAMA', @opcode, @firstevent,
@firsterror)
then begin
@ -8041,11 +8040,12 @@ begin
FreeLibrary(XineramaLib);
end;
end;
FirstScreenCalled := True;
FirstScreenCalled := True;
end;
Result := FirstScreenResult;
end;
{$ENDIF}
{$ENDIF}
{$ENDIF VER1_0}
{$ENDIF Gtk1}
{$IFDEF ASSERT_IS_ON}
{$UNDEF ASSERT_IS_ON}
@ -8057,6 +8057,9 @@ end;
{ =============================================================================
$Log$
Revision 1.337 2005/02/19 16:30:47 mattias
fixed 1.0.10 compilation
Revision 1.336 2005/02/19 16:19:19 mattias
added xinerama recognition fro gtk1/fpc1_9+ from C Western

8
lcl/interfaces/gtk/gtkwinapi.inc
View File

@ -4566,6 +4566,7 @@ begin
if Buf = nil then
Result := SizeOf(TDIBSECTION)
else begin
FillChar(BitmapSection,SizeOf(TDIBSECTION),0);
With PGDIObject(GDIObj)^, BitmapSection,
BitmapSection.dsBm, BitmapSection.dsBmih
do begin
@ -5269,18 +5270,22 @@ begin
SM_CXSCREEN:
begin
{$IFDEF GTK1} { Partial fix for multi monitor systems - force use of first one }
{$IFNDEF VER1_0}
if GetFirstScreen then
result := FirstScreen.x
else
{$ENDIF}
{$ENDIF}
result := gdk_Screen_Width;
end;
SM_CYSCREEN:
begin
{$IFDEF GTK1}
{$IFNDEF VER1_0}
if GetFirstScreen then
result := FirstScreen.y
else
{$ENDIF}
{$ENDIF}
result := gdk_Screen_Height;
end;
@ -8905,6 +8910,9 @@ end;
{ =============================================================================
$Log$
Revision 1.398 2005/02/19 16:30:47 mattias
fixed 1.0.10 compilation
Revision 1.397 2005/02/19 16:19:19 mattias
added xinerama recognition fro gtk1/fpc1_9+ from C Western

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

@ -144,6 +144,7 @@ begin
SetColorDialogColor(PGtkColorSelection(GtkWindow),
TColorDialog(ACommonDialog).Color);
{$IFDEF Gtk1}
{$IFNDEF VER1_0}
if GetFirstScreen then begin
{ Fix multi screen problems, at least partially by forcing dialog to centre of first screen }
gtk_widget_size_request(PGtkWidget(GtkWindow), @Requisition);
@ -151,6 +152,7 @@ begin
(FirstScreen.y - Requisition.height) div 2);
end else
{$ENDIF}
{$ENDIF}
gtk_window_set_position(GtkWindow, GTK_WIN_POS_CENTER);
GtkWindowShowModal(GtkWindow);
end;