1 diff -urN padmin-old/source/makefile.mk padmin/source/makefile.mk
2 --- padmin-old/source/makefile.mk 2003-10-13 02:02:59.000000000 +0200
3 +++ padmin/source/makefile.mk 2003-10-13 02:25:38.000000000 +0200
8 +.IF "$(FONTCONFIG_FONTS)" != ""
9 +CFLAGS+=-DFONTCONFIG_FONTS
12 # --- Files --------------------------------------------------------
14 SRCFILES=padialog.src rtsetup.src
16 $(SLO)$/newppdlg.obj \
17 $(SLO)$/prtsetup.obj \
19 - $(SLO)$/fontentry.obj \
24 +.IF "$(FONTCONFIG_FONTS)" == ""
25 +SLOFILES+= $(SLO)$/fontentry.obj
30 diff -urN padmin-old/source/padialog.cxx padmin/source/padialog.cxx
31 --- padmin-old/source/padialog.cxx 2003-10-13 02:02:59.000000000 +0200
32 +++ padmin/source/padialog.cxx 2003-10-13 02:08:07.000000000 +0200
34 #ifndef _TOOLS_COLOR_HXX
35 #include <tools/color.hxx>
38 +#include <tools/urlobj.hxx>
40 #ifndef _PAD_PADIALOG_HRC_
41 #include <padialog.hrc>
44 +#ifndef FONTCONFIG_FONTS
45 #ifndef _PAD_FONTENTRY_HXX_
46 #include <fontentry.hxx>
50 #ifndef _PAD_HELPER_HXX_
54 m_aStdPB( this, PaResId( RID_PA_BTN_STD ) ),
55 m_aRemPB( this, PaResId( RID_PA_BTN_DEL ) ),
56 m_aPrintersFL( this, PaResId( RID_PA_FL_PRINTERS ) ),
57 +#ifndef FONTCONFIG_FONTS
58 m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
60 m_aConfPB( this, PaResId( RID_PA_BTN_CONF ) ),
61 m_aRenamePB( this, PaResId( RID_PA_BTN_RENAME ) ),
62 m_aTestPagePB( this, PaResId( RID_PA_TESTPAGE ) ),
64 m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
65 m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
66 m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
67 - m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
68 m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
69 m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
71 +#ifndef FONTCONFIG_FONTS
72 + m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
73 ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
74 if( ! rFontManager.checkImportPossible() )
75 m_aFontsPB.Enable( FALSE );
82 else if( pButton == &m_aAddPB )
84 +#ifndef FONTCONFIG_FONTS
85 else if( pButton == &m_aFontsPB )
87 FontNameDlg aDialog( this );
94 diff -urN padmin-old/source/padialog.hxx padmin/source/padialog.hxx
95 --- padmin-old/source/padialog.hxx 2003-10-13 02:02:59.000000000 +0200
96 +++ padmin/source/padialog.hxx 2003-10-13 02:08:07.000000000 +0200
99 FixedLine m_aSepButtonFL;
101 +#ifndef FONTCONFIG_FONTS
102 PushButton m_aFontsPB;
104 CancelButton m_aCancelButton;