xinerama hack is now only enabled when compiled with -dUseXinerama

git-svn-id: trunk@6814 -
This commit is contained in:
mattias 2005-02-19 20:36:56 +00:00
parent 6161468c16
commit 027b1428e1
4 changed files with 15 additions and 9 deletions

View File

@ -8007,7 +8007,7 @@ end;
var
FirstScreenCalled: Boolean = False;
FirstScreenResult: Boolean = False;
{$IFNDEF Ver1_0}
{$IFDEF UseXinerama}
function GetFirstScreen: Boolean;
var
nMonitors: cint;
@ -8046,7 +8046,7 @@ begin
end;
Result := FirstScreenResult;
end;
{$ENDIF VER1_0}
{$ENDIF UseXinerama}
{$ENDIF Gtk1}
{$IFDEF ASSERT_IS_ON}
@ -8059,6 +8059,9 @@ end;
{ =============================================================================
$Log$
Revision 1.339 2005/02/19 20:36:55 mattias
xinerama hack is now only enabled when compiled with -dUseXinerama
Revision 1.338 2005/02/19 20:33:09 mattias
fixed gtk2 key handle result

View File

@ -44,9 +44,9 @@ uses
// MWE:
// TODO: check if the new keyboard routines require X on GTK2
X, XLib, XUtil, //Font retrieval and Keyboard handling
{$IFNDEF VER1_0}
{$IFDEF UseXinerama}
Xinerama,
{$ENDIF not VER1_0}
{$ENDIF}
{$ENDIF not Gtk1}
{$ENDIF}
InterfaceBase,
@ -830,7 +830,7 @@ procedure EndGDKErrorTrap;
x, y, width, height: gint): PGdkImage;
Function gdk_drawable_get_colormap(Drawable: PGDKDrawable): PGdkColormap;
{$IFNDEF VER1_0}
{$IFDEF UseXinerama}
// Xinerama
function GetFirstScreen: Boolean;
{$ENDIF}

View File

@ -5270,7 +5270,7 @@ begin
SM_CXSCREEN:
begin
{$IFDEF GTK1} { Partial fix for multi monitor systems - force use of first one }
{$IFNDEF VER1_0}
{$IFDEF UseXinerama}
if GetFirstScreen then
result := FirstScreen.x
else
@ -5281,7 +5281,7 @@ begin
SM_CYSCREEN:
begin
{$IFDEF GTK1}
{$IFNDEF VER1_0}
{$IFDEF UseXinerama}
if GetFirstScreen then
result := FirstScreen.y
else
@ -8910,6 +8910,9 @@ end;
{ =============================================================================
$Log$
Revision 1.399 2005/02/19 20:36:56 mattias
xinerama hack is now only enabled when compiled with -dUseXinerama
Revision 1.398 2005/02/19 16:30:47 mattias
fixed 1.0.10 compilation

View File

@ -136,7 +136,7 @@ procedure TGtkWSCommonDialog.ShowModal(const ACommonDialog: TCommonDialog);
var
GtkWindow: PGtkWindow;
{$IFDEF Gtk1}
{$IFNDEF VER1_0}
{$IFDEF UseXinerama}
Requisition: TGtkRequisition;
{$ENDIF}
{$ENDIF}
@ -148,7 +148,7 @@ begin
SetColorDialogColor(PGtkColorSelection(GtkWindow),
TColorDialog(ACommonDialog).Color);
{$IFDEF Gtk1}
{$IFNDEF VER1_0}
{$IFDEF UseXinerama}
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);