mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-06-02 18:58:16 +02:00
remove USE_PANGO define since pango now apears to work properly.
git-svn-id: trunk@4650 -
This commit is contained in:
ajgenius
parent
11880858a9
commit
d743352fb0
@ -315,7 +315,7 @@ begin
|
||||
|
||||
// the gtk always toggles the check flag
|
||||
// -> restore 'checked' flag if needed
|
||||
if MenuItemChecked(AMenuItem) = LCLMenuItem.Checked then Exit;
|
||||
if gtk_check_menu_item_get_active(AMenuItem) = LCLMenuItem.Checked then Exit;
|
||||
if LCLMenuItem.AutoCheck then Exit;
|
||||
|
||||
// restore it
|
||||
@ -2854,6 +2854,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.192 2003/09/19 00:41:51 ajgenius
|
||||
remove USE_PANGO define since pango now apears to work properly.
|
||||
|
||||
Revision 1.191 2003/09/17 15:26:41 mattias
|
||||
fixed removing TPage
|
||||
|
||||
|
||||
@ -29,10 +29,6 @@ unit GTKDef;
|
||||
{$mode objfpc}
|
||||
{$LONGSTRINGS ON}
|
||||
|
||||
{$IFDEF gtk2}
|
||||
{$DEFINE USE_PANGO}
|
||||
{$EndIf}
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
@ -95,7 +91,7 @@ type
|
||||
GDIBrushPixMap: PGdkPixmap;
|
||||
);
|
||||
gdiFont: (
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
GDIFontObject: PPangoFontDescription;
|
||||
StrikeOut : gboolean;//Description can't set these so we use these
|
||||
Underline : gboolean;//instead of an additional AttributeList
|
||||
@ -465,6 +461,9 @@ end.
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.48 2003/09/19 00:41:51 ajgenius
|
||||
remove USE_PANGO define since pango now apears to work properly.
|
||||
|
||||
Revision 1.47 2003/09/18 09:21:03 mattias
|
||||
renamed LCLLinux to LCLIntf
|
||||
|
||||
|
||||
@ -46,10 +46,6 @@ interface
|
||||
|
||||
{off $Define Disable_GC_SysColors}
|
||||
|
||||
{$IFDEF gtk2}
|
||||
{$DEFINE USE_PANGO}
|
||||
{$EndIf}
|
||||
|
||||
uses
|
||||
InterfaceBase,
|
||||
{$IFDEF gtk2}
|
||||
@ -91,7 +87,7 @@ type
|
||||
FStockBlackPen: HPEN;
|
||||
FStockWhitePen: HPEN;
|
||||
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
FDefaultFontDesc : PPangoFontDescription;
|
||||
{$Else}
|
||||
FDefaultFont : PGdkFont;
|
||||
@ -148,7 +144,7 @@ type
|
||||
function CreateDefaultFont: PGdiObject;virtual;
|
||||
function CreateDefaultPen: PGdiObject;virtual;
|
||||
procedure UpdateDCTextMetric(DC: TDeviceContext); virtual;
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
function GetDefaultFontDesc(IncreaseReferenceCount: boolean): PPangoFontDescription;
|
||||
{$Else}
|
||||
function GetDefaultFont(IncreaseReferenceCount: boolean): PGDKFont;
|
||||
@ -372,6 +368,9 @@ end.
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.149 2003/09/19 00:41:51 ajgenius
|
||||
remove USE_PANGO define since pango now apears to work properly.
|
||||
|
||||
Revision 1.148 2003/09/18 17:23:04 ajgenius
|
||||
start using GtkTextView for Gtk2 Memo
|
||||
|
||||
|
||||
@ -144,7 +144,7 @@ begin
|
||||
FDeviceContexts.Options:=FDeviceContexts.Options+[dhaoCacheContains];
|
||||
FGDIObjects := TDynHashArray.Create(-1);
|
||||
FGDIObjects.Options:=FGDIObjects.Options+[dhaoCacheContains];
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
FDefaultFontDesc:= nil;
|
||||
{$Else}
|
||||
FDefaultFont:= nil;
|
||||
@ -4718,7 +4718,7 @@ begin
|
||||
g_signal_connect(GTK_OBJECT(MenuItemWidget), 'activate',
|
||||
gtk_signal_func(@GTKDialogMenuActivateCB),
|
||||
OpenDialog);
|
||||
gtk_menu_append({$IfNdef GTK2}PGTKMenu{$EndIf}(MenuWidget), MenuItemWidget);
|
||||
gtk_menu_append(MenuWidget, MenuItemWidget);
|
||||
gtk_widget_show(MenuItemWidget);
|
||||
end;
|
||||
gtk_widget_show(MenuWidget);
|
||||
@ -4915,7 +4915,7 @@ begin
|
||||
g_signal_connect(GTK_OBJECT(MenuItemWidget), 'activate',
|
||||
gtk_signal_func(@GTKDialogMenuActivateCB),
|
||||
OpenDialog);
|
||||
gtk_menu_append({$IfNdef GTK2}PGTKMenu{$EndIf}(MenuWidget), MenuItemWidget);
|
||||
gtk_menu_append(MenuWidget, MenuItemWidget);
|
||||
gtk_widget_show(MenuItemWidget);
|
||||
end;
|
||||
gtk_widget_show(MenuWidget);
|
||||
@ -7172,8 +7172,7 @@ begin
|
||||
if GtkWidgetIsA(ParentMenuWidget,GTK_TYPE_MENU_BAR) then begin
|
||||
// mainmenu (= a menu bar)
|
||||
ContainerMenu:=ParentMenuWidget;
|
||||
gtk_menu_bar_insert({$IFNDef GTK2}PGtkMenuBar{$EndIf}(ParentMenuWidget),MenuItem,
|
||||
LCLMenuItem.MenuIndex);
|
||||
gtk_menu_bar_insert(ParentMenuWidget,MenuItem, LCLMenuItem.MenuIndex);
|
||||
end
|
||||
else begin
|
||||
// menu item
|
||||
@ -7194,7 +7193,7 @@ begin
|
||||
gtk_menu_item_set_submenu(PGTKMenuItem(ParentMenuWidget),ContainerMenu);
|
||||
end;
|
||||
end;
|
||||
gtk_menu_insert({$IFNDef GTK2}PGtkMenu{$EndIf}(ContainerMenu), MenuItem, LCLMenuItem.MenuIndex);
|
||||
gtk_menu_insert(ContainerMenu, MenuItem, LCLMenuItem.MenuIndex);
|
||||
end;
|
||||
|
||||
SetContainerMenuToggleSize;
|
||||
@ -7461,7 +7460,7 @@ begin
|
||||
|
||||
gdk_gc_get_values(aDC.GC, @Values);
|
||||
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
if (gtk_widget_get_style(ClientWidget)<>nil) and
|
||||
(gtk_widget_get_style(ClientWidget)^.font_desc <> nil)
|
||||
then begin
|
||||
@ -7475,7 +7474,7 @@ begin
|
||||
|
||||
if aDC <> nil
|
||||
then begin
|
||||
{$IfNdef USE_PANGO}
|
||||
{$Ifdef GTK1}
|
||||
if Values.Font <> nil
|
||||
then begin
|
||||
GdiObject:=NewGDIObject(gdiFont);
|
||||
@ -7557,7 +7556,7 @@ end;
|
||||
function TgtkObject.CreateDefaultFont: PGdiObject;
|
||||
begin
|
||||
Result := NewGDIObject(gdiFont);
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
Result^.GDIFontObject:= GetDefaultFontDesc(true);
|
||||
{$Else}
|
||||
Result^.GDIFontObject:= GetDefaultFont(true);
|
||||
@ -7588,7 +7587,7 @@ end;
|
||||
Sets the gtk resource file and parses it.
|
||||
------------------------------------------------------------------------------}
|
||||
procedure TgtkObject.UpdateDCTextMetric(DC: TDeviceContext);
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
begin
|
||||
end;
|
||||
{$Else}
|
||||
@ -7656,7 +7655,7 @@ end;
|
||||
{------------------------------------------------------------------------------
|
||||
function TgtkObject.GetDefaultFont(IncreaseReferenceCount: boolean): PGDKFont;
|
||||
------------------------------------------------------------------------------}
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
function TgtkObject.GetDefaultFontDesc(IncreaseReferenceCount: boolean): PPangoFontDescription;
|
||||
begin
|
||||
if FDefaultFontDesc = nil then begin
|
||||
@ -7959,7 +7958,7 @@ end;
|
||||
procedure TGtkObject.WordWrap(DC: HDC; AText: PChar; MaxWidthInPixel: integer;
|
||||
var Lines: PPChar; var LineCount: integer);
|
||||
var
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
UseFontDesc : PPangoFontDescription;
|
||||
{$Else}
|
||||
UseFont : PGDKFont;
|
||||
@ -7970,7 +7969,7 @@ var
|
||||
var
|
||||
lbearing, rbearing, width, ascent, descent: LongInt;
|
||||
begin
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
GetTextExtentIgnoringAmpersands(UseFontDesc, @AText[LineStart], LineLen,
|
||||
@lbearing, @rBearing, @width, @ascent, @descent);
|
||||
{$Else}
|
||||
@ -8041,7 +8040,7 @@ var
|
||||
with TDeviceContext(DC) do begin
|
||||
if (CurrentFont = nil) or (CurrentFont^.GDIFontObject = nil)
|
||||
then begin
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
UseFontDesc := GetDefaultFontDesc(true);
|
||||
{$Else}
|
||||
UseFont := GetDefaultFont(true);
|
||||
@ -8049,7 +8048,7 @@ var
|
||||
UnRef := True;
|
||||
end
|
||||
else begin
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
UseFontDesc := CurrentFont^.GDIFontObject;
|
||||
{$Else}
|
||||
UseFont := CurrentFont^.GDIFontObject;
|
||||
@ -8062,7 +8061,7 @@ var
|
||||
procedure CleanUpFont;
|
||||
begin
|
||||
If UnRef then
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
pango_font_description_free(UseFontDesc);
|
||||
{$Else}
|
||||
GDK_Font_UnRef(UseFont);
|
||||
@ -8193,6 +8192,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.420 2003/09/19 00:41:51 ajgenius
|
||||
remove USE_PANGO define since pango now apears to work properly.
|
||||
|
||||
Revision 1.419 2003/09/18 21:36:00 ajgenius
|
||||
add csEdit to GTK2 interface to start removing use of GtkOldEditable
|
||||
|
||||
|
||||
@ -105,6 +105,26 @@ begin
|
||||
menu_item^.flag0:=menu_item^.flag0 and (not bm_right_justify);
|
||||
end;
|
||||
|
||||
Function gtk_check_menu_item_get_active(menu_item : PGtkCheckMenuItem) : gboolean;
|
||||
begin
|
||||
Result:=(menu_item^.flag0 and bm_checkmenuitem_active <> 0);
|
||||
end;
|
||||
|
||||
Procedure gtk_menu_append(menu : PGTKWidget; Item : PGtkWidget);
|
||||
begin
|
||||
gtk.gtk_menu_append(PGTKMenu(menu), Item);
|
||||
end;
|
||||
|
||||
Procedure gtk_menu_insert(menu : PGtkWidget; Item : PGTKWidget; Index : gint);
|
||||
begin
|
||||
gtk.gtk_menu_insert(PGTKMenu(menu), Item, Index);
|
||||
end;
|
||||
|
||||
Procedure gtk_menu_bar_insert(menubar : PGtkWidget; Item : PGTKWidget; Index : gint);
|
||||
begin
|
||||
gtk.gtk_menu_bar_insert(PGtkMenuBar(menubar), Item, Index);
|
||||
end;
|
||||
|
||||
Function gtk_image_new :PGTKWidget;
|
||||
begin
|
||||
result := gtk.gtk_image_new(nil,nil);
|
||||
@ -2936,15 +2956,6 @@ begin
|
||||
Result:=GTK_CHECK_MENU_ITEM_CLASS(gtk_object_get_class(widget));
|
||||
end;
|
||||
|
||||
function MenuItemChecked(MenuWidget: PGtkCheckMenuItem): boolean;
|
||||
begin
|
||||
{$IFDEF Gtk2}
|
||||
Result:=gtk_check_menu_item_get_active(MenuWidget);
|
||||
{$ELSE}
|
||||
Result:=(MenuWidget^.flag0 and bm_checkmenuitem_active <> 0)
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
{------------------------------------------------------------------------------
|
||||
function GetRadioMenuItemGroup(LCLMenuItem: TMenuItem): PGSList;
|
||||
|
||||
@ -3029,7 +3040,7 @@ begin
|
||||
then begin
|
||||
LCLMenuItem := TMenuItem(GetLCLObject(MenuItem));
|
||||
if (LCLMenuItem <> nil)
|
||||
and (MenuItemChecked(MenuItem) <> LCLMenuItem.Checked)
|
||||
and (gtk_check_menu_item_get_active(MenuItem) <> LCLMenuItem.Checked)
|
||||
then gtk_check_menu_item_set_active(MenuItem, LCLMenuItem.Checked);
|
||||
end;
|
||||
CurListItem := CurListItem^.Next;
|
||||
@ -3299,6 +3310,7 @@ begin
|
||||
gtk_check_menu_item_set_active(PGtkCheckMenuItem(MenuItemWidget),
|
||||
LCLMenuItem.Checked);
|
||||
{$ifdef GTK2}
|
||||
writeln('TODO: CreateMenuItem, get old toggle size');
|
||||
{$else}
|
||||
if (OldCheckMenuItemToggleSize=0) then
|
||||
OldCheckMenuItemToggleSize:=MENU_ITEM_CLASS(MenuItemWidget)^.toggle_size;
|
||||
@ -4098,7 +4110,7 @@ end;
|
||||
a generic fixed font, if THAT fails, it gets whatever font is available.
|
||||
If the result is not nil it MUST be GDK_FONT_UNREF'd when done.
|
||||
------------------------------------------------------------------------------}
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
function LoadDefaultFontDesc: PPangoFontDescription;
|
||||
var
|
||||
Style : PGTKStyle;
|
||||
@ -4129,11 +4141,6 @@ begin
|
||||
Style := GetStyle('gtk_default');
|
||||
|
||||
If Style <> nil then begin
|
||||
{$IFDEF Gtk2}
|
||||
// Gtk2ToDo
|
||||
if Style^.font_desc<>nil then
|
||||
Result:=gdk_font_from_description(Style^.font_desc);
|
||||
{$ELSE}
|
||||
Result := Style^.Font;
|
||||
If Result = nil then
|
||||
{$IFNDEF NoStyle}
|
||||
@ -4142,7 +4149,6 @@ begin
|
||||
Result := gdk_font_load(Style^.RC_Style^.font_name);
|
||||
end;
|
||||
{$ENDIF}
|
||||
{$ENDIF}
|
||||
end;
|
||||
|
||||
If Result = nil then
|
||||
@ -4573,7 +4579,7 @@ end;
|
||||
|
||||
Gets text extent of a string, ignoring escaped Ampersands.
|
||||
-------------------------------------------------------------------------------}
|
||||
{$Ifdef USE_PANGO}
|
||||
{$Ifdef GTK2}
|
||||
Procedure GetTextExtentIgnoringAmpersands(FontDesc : PPangoFontDescription; Str : PChar;
|
||||
LineLength : Longint; lbearing, rbearing, width, ascent, descent : Pgint);
|
||||
{$Else}
|
||||
@ -4594,7 +4600,7 @@ begin
|
||||
LineLength:=StrLen(NewStr);
|
||||
end;
|
||||
end;
|
||||
{$Ifdef USE_PANGO}
|
||||
{$Ifdef GTK2}
|
||||
gdk_text_extents(FontDesc, NewStr, LineLength,
|
||||
lbearing, rBearing, width, ascent, descent);
|
||||
{$Else}
|
||||
@ -4610,7 +4616,7 @@ end;
|
||||
|
||||
This is only a heuristic
|
||||
------------------------------------------------------------------------------}
|
||||
{$IfNdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK1}
|
||||
function FontIsDoubleByteCharsFont(TheFont: PGdkFont): boolean;
|
||||
var
|
||||
SingleCharLen, DoubleCharLen: integer;
|
||||
@ -4745,7 +4751,7 @@ end;
|
||||
|
||||
Procedure FillScreenFonts(ScreenFonts : TStrings);
|
||||
var
|
||||
{$IFNDEF USE_PANGO}
|
||||
{$IFDEF GTK1}
|
||||
theFonts : PPChar;
|
||||
{$Else}
|
||||
Widget : PGTKWidget;
|
||||
@ -4756,7 +4762,7 @@ var
|
||||
I, N: Integer;
|
||||
begin
|
||||
ScreenFonts.Clear;
|
||||
{$IFNDEF USE_PANGO}
|
||||
{$IFDEF GTK1}
|
||||
{$IfNdef Win32}
|
||||
If X11Display = nil then
|
||||
X11Display := XOpenDisplay(GDK_GET_DISPLAY);
|
||||
@ -4791,7 +4797,7 @@ begin
|
||||
end;
|
||||
if (families <> nil) then
|
||||
g_free(families);
|
||||
{$EndIf USE_PANGO}
|
||||
{$EndIf GTK2}
|
||||
end;
|
||||
|
||||
{$IFDEF ASSERT_IS_ON}
|
||||
@ -4804,6 +4810,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.209 2003/09/19 00:41:52 ajgenius
|
||||
remove USE_PANGO define since pango now apears to work properly.
|
||||
|
||||
Revision 1.208 2003/09/18 14:06:30 ajgenius
|
||||
fixed Tgtkobject.drawtext for Pango till the native pango one works better
|
||||
|
||||
|
||||
@ -24,19 +24,12 @@ interface
|
||||
{off $DEFINE NoGdkPixbufLib}
|
||||
{$ENDIF}
|
||||
|
||||
{$IFDEF gtk2}
|
||||
{$DEFINE USE_PANGO}
|
||||
{$EndIf}
|
||||
uses
|
||||
SysUtils, Classes,
|
||||
{$IFNDEF USE_PANGO}
|
||||
{$IFDEF GTK1}
|
||||
{$Ifndef Win32}
|
||||
X, XLib,//Font retrieval
|
||||
{$EndIf}
|
||||
//hopefully we can grab a pango context off of an Invisible widget and call
|
||||
//pango_context_list_families, then extract info from that list for pango,
|
||||
//thus keeping us from having to expose xft, fontconfig, X, or Win32 Pango
|
||||
//interfaces, or from having to call actual interfaces directly in GTK2
|
||||
{$EndIf}
|
||||
InterfaceBase,
|
||||
{$IFDEF gtk2}
|
||||
@ -401,7 +394,7 @@ const
|
||||
var
|
||||
DesignSignalMasks: array[TDesignSignalType] of TDesignSignalMask;
|
||||
|
||||
{$IFNDEF USE_PANGO}
|
||||
{$IFDEF GTK1}
|
||||
var
|
||||
X11Display : Pointer;//only needed to get X fonts
|
||||
{$EndIf}
|
||||
@ -434,7 +427,7 @@ Function DeleteAmpersands(var Str : String) : Longint;
|
||||
function Ampersands2Underscore(Src: PChar) : PChar;
|
||||
function RemoveAmpersands(Src: PChar; LineLength : Longint) : PChar;
|
||||
|
||||
{$Ifdef USE_PANGO}
|
||||
{$Ifdef GTK2}
|
||||
Procedure GetTextExtentIgnoringAmpersands(FontDesc : PPangoFontDescription; Str : PChar;
|
||||
LineLength : Longint; lbearing, rbearing, width, ascent, descent : Pgint);
|
||||
{$Else}
|
||||
@ -462,7 +455,6 @@ procedure GetGdkPixmapFromGraphic(LCLGraphic: TGraphic;
|
||||
// menus
|
||||
function MENU_ITEM_CLASS(widget: PGtkWidget): PGtkMenuItemClass;
|
||||
function CHECK_MENU_ITEM_CLASS(widget: PGtkWidget): PGtkCheckMenuItemClass;
|
||||
function MenuItemChecked(MenuWidget: PGtkCheckMenuItem): boolean;
|
||||
function GetRadioMenuItemGroup(LCLMenuItem: TMenuItem): PGSList;
|
||||
function GetRadioMenuItemGroup(MenuItem: PGtkRadioMenuItem): PGSList;
|
||||
procedure LockRadioGroupOnChange(RadioGroup: PGSList; const ADelta: Integer);
|
||||
@ -492,7 +484,7 @@ Procedure ReleaseStyle(const WName : String);
|
||||
function GetStyle(const WName : String) : PGTKStyle;
|
||||
Function GetStyleWidget(const WName : String) : PGTKWidget;
|
||||
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
function LoadDefaultFontDesc: PPangoFontDescription;
|
||||
{$Else}
|
||||
function LoadDefaultFont: PGDKFont;
|
||||
@ -500,7 +492,7 @@ function LoadDefaultFont: PGDKFont;
|
||||
|
||||
Function GetSysGCValues(Color : TColorRef) : TGDKGCValues;
|
||||
|
||||
{$IfNdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK1}
|
||||
function FontIsDoubleByteCharsFont(TheFont: PGdkFont): boolean;
|
||||
{$EndIf}
|
||||
|
||||
@ -543,6 +535,10 @@ function gtk_widget_get_ythickness(Style : PGTKWidget) : gint; overload;
|
||||
Function gtk_window_get_modal(window:PGtkWindow):gboolean;
|
||||
Function gtk_bin_get_child(bin : PGTKBin) : PGTKWidget;
|
||||
Procedure gtk_menu_item_set_right_justified(menu_item : PGtkMenuItem; right_justified : gboolean);
|
||||
Function gtk_check_menu_item_get_active(menu_item : PGtkCheckMenuItem) : gboolean;
|
||||
Procedure gtk_menu_append(menu : PGTKWidget; Item : PGtkWidget);
|
||||
Procedure gtk_menu_insert(menu : PGtkWidget; Item : PGTKWidget; Index : gint);
|
||||
Procedure gtk_menu_bar_insert(menubar : PGtkWidget; Item : PGTKWidget; Index : gint);
|
||||
Function gtk_image_new : PGTKWidget;
|
||||
Function gtk_toolbar_new : PGTKWidget;
|
||||
Procedure gtk_color_selection_get_current_color(colorsel : PGTKColorSelection; Color : PGDKColor);
|
||||
@ -634,7 +630,7 @@ end;
|
||||
{$I gtkproc.inc}
|
||||
{$I gtkcallback.inc}
|
||||
|
||||
{$IFNDEF USE_PANGO} //only needed to get X fonts
|
||||
{$IFDEF GTK1} //only needed to get X fonts
|
||||
initialization
|
||||
X11Display := nil;
|
||||
|
||||
|
||||
@ -1305,7 +1305,7 @@ end;
|
||||
------------------------------------------------------------------------------}
|
||||
function TgtkObject.CreateFontIndirectEx(const LogFont: TLogFont;
|
||||
const LongFontName: string): HFONT;
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
begin
|
||||
writeln('ToDo: TgtkObject.CreateFontIndirectEx');
|
||||
Result:=0;
|
||||
@ -2128,7 +2128,7 @@ begin
|
||||
gdiFont:
|
||||
begin
|
||||
if GDIFontObject<>nil then
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{$Ifdef GTK2}
|
||||
pango_font_description_free(GDIFontObject);
|
||||
{$Else}
|
||||
gdk_font_unref(GDIFontObject);
|
||||
@ -2960,7 +2960,7 @@ end;
|
||||
------------------------------------------------------------------------------}
|
||||
function TgtkObject.ExtTextOut(DC: HDC; X, Y: Integer; Options: Longint;
|
||||
Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean;
|
||||
{$Ifdef USE_PANGO}
|
||||
{$Ifdef GTK2}
|
||||
begin
|
||||
writeln('ToDo: TgtkObject.ExtTextOut');
|
||||
Result:=false;
|
||||
@ -4227,7 +4227,7 @@ begin
|
||||
end;
|
||||
gdiFont:
|
||||
begin
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
Assert(False, 'Trace:TODO: [TgtkObject.GetObject] gdiFont(PANGO)');
|
||||
{$Else}
|
||||
if Buf = nil then
|
||||
@ -4561,7 +4561,7 @@ var
|
||||
GDIObj : PGDIObject;
|
||||
begin
|
||||
GDIObj := NewGDIObject(gdiFont);
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
GDIObj^.GDIFontObject:= GetDefaultFontDesc(true);
|
||||
{$Else}
|
||||
GDIObj^.GDIFontObject:= GetDefaultFont(true);
|
||||
@ -4991,7 +4991,7 @@ end;
|
||||
------------------------------------------------------------------------------}
|
||||
function TgtkObject.GetTextExtentPoint(DC: HDC; Str: PChar; Count: Integer;
|
||||
var Size: TSize): Boolean;
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
begin
|
||||
writeln('TGTKObject.GetTextExtentPoint ToDo');
|
||||
Result:=false;
|
||||
@ -6951,7 +6951,7 @@ begin
|
||||
Assert(False, Format('trace: [TgtkObject.SelectObject] DC: 0x%x, Type: Font', [DC]));
|
||||
Result := HFONT(CurrentFont);
|
||||
CurrentFont := PGDIObject(GDIObj);
|
||||
{$IfNDef USE_PANGO}
|
||||
{$IfDef GTK1}
|
||||
if GC <> nil
|
||||
then begin
|
||||
gdk_gc_set_font(GC, PGdiObject(GDIObj)^.GDIFontObject);
|
||||
@ -8516,7 +8516,7 @@ end;
|
||||
------------------------------------------------------------------------------}
|
||||
Function TGTKObject.TextOut(DC: HDC; X,Y : Integer; Str : Pchar;
|
||||
Count: Integer) : Boolean;
|
||||
{$IfDef USE_PANGO}
|
||||
{$IfDef GTK2}
|
||||
begin
|
||||
writeln('TGTKObject.TextOut ToDo');
|
||||
Result:=false;
|
||||
@ -8795,6 +8795,9 @@ end;
|
||||
{ =============================================================================
|
||||
|
||||
$Log$
|
||||
Revision 1.287 2003/09/19 00:41:52 ajgenius
|
||||
remove USE_PANGO define since pango now apears to work properly.
|
||||
|
||||
Revision 1.286 2003/09/18 14:06:30 ajgenius
|
||||
fixed Tgtkobject.drawtext for Pango till the native pango one works better
|
||||
|
||||
|
||||
@ -30,8 +30,6 @@ interface
|
||||
{$ASSERTIONS ON}
|
||||
{$endif}
|
||||
|
||||
{$DEFINE USE_PANGO}
|
||||
|
||||
uses
|
||||
Classes, SysUtils,
|
||||
{$IfNDef GTK2_2}
|
||||
@ -53,14 +51,12 @@ uses
|
||||
type
|
||||
TGtk2Object = class(TGtkObject)
|
||||
public
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
function DrawText(DC: HDC; Str: PChar; Count: Integer; var Rect: TRect; Flags: Cardinal): Integer; override;
|
||||
function ExtTextOut(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean; override;
|
||||
function TextOut(DC: HDC; X,Y : Integer; Str : Pchar; Count: Integer) : Boolean; override;
|
||||
function CreateFontIndirectEx(const LogFont: TLogFont; const LongFontName: string): HFONT; override;
|
||||
function GetTextExtentPoint(DC: HDC; Str: PChar; Count: Integer; var Size: TSize): Boolean; override;
|
||||
procedure UpdateDCTextMetric(DC: TDeviceContext); override;
|
||||
{$EndIf}
|
||||
|
||||
function BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc; override;
|
||||
Function EndPaint(Handle : hwnd; var PS : TPaintStruct): Integer; override;
|
||||
@ -93,7 +89,6 @@ procedure gdk_draw_pixbuf(drawable : PGdkDrawable; gc : PGdkGC; pixbuf : PGdkPix
|
||||
|
||||
implementation
|
||||
|
||||
{$Ifdef USE_PANGO} // we should implement pango for gtk2 soon
|
||||
{------------------------------------------------------------------------------
|
||||
Method: DrawText
|
||||
Params: DC, Str, Count, Rect, Flags
|
||||
@ -916,8 +911,6 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
{$EndIf}
|
||||
|
||||
function Tgtk2Object.BeginPaint(Handle: hWnd; Var PS : TPaintStruct) : hdc;
|
||||
var
|
||||
paintrect : TGDKRectangle;
|
||||
@ -1541,6 +1534,9 @@ end.
|
||||
|
||||
{
|
||||
$Log$
|
||||
Revision 1.19 2003/09/19 00:41:52 ajgenius
|
||||
remove USE_PANGO define since pango now apears to work properly.
|
||||
|
||||
Revision 1.18 2003/09/18 21:36:00 ajgenius
|
||||
add csEdit to GTK2 interface to start removing use of GtkOldEditable
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user