applied_patches/0074-padmin-nofontconfig.diff

   1 --- padmin/source/makefile.mk.old       2009-04-02 11:01:37.000000000 +0000
   2 +++ padmin/source/makefile.mk   2009-04-06 16:41:45.000000000 +0000
   3 @@ -47,6 +47,10 @@ LIBTARGET=NO
   4
   5  .INCLUDE: settings.mk
   6
   7 +.IF "$(FONTCONFIG_FONTS)" != ""
   8 +CFLAGS+=-DFONTCONFIG_FONTS
   9 +.ENDIF
  10 +
  11  # --- Files --------------------------------------------------------
  12
  13  SRS1NAME=$(TARGET)
  14 @@ -69,11 +73,13 @@ SLOFILES=\
  15         $(SLO)$/progress.obj            \
  16         $(SLO)$/newppdlg.obj            \
  17         $(SLO)$/prtsetup.obj            \
  18 -       $(SLO)$/fontentry.obj           \
  19         $(SLO)$/helper.obj                      \
  20         $(SLO)$/adddlg.obj                      \
  21         $(SLO)$/titlectrl.obj
  22
  23 +.IF "$(FONTCONFIG_FONTS)" == ""
  24 +SLOFILES+= $(SLO)$/fontentry.obj
  25 +.ENDIF
  26
  27  OBJFILES=\
  28         $(OBJ)/pamain.obj
  29 --- padmin/source/padialog.cxx.old      2009-04-02 11:01:37.000000000 +0000
  30 +++ padmin/source/padialog.cxx  2009-04-06 16:41:45.000000000 +0000
  31 @@ -42,14 +42,13 @@
  32  #include <vcl/event.hxx>
  33  #include <tools/stream.hxx>
  34  #include <tools/color.hxx>
  35 -#ifndef _PAD_PADIALOG_HRC_
  36 +#include <tools/urlobj.hxx>
  37 +#ifndef FONTCONFIG_FONTS
  38  #include <padialog.hrc>
  39  #endif
  40  #include <fontentry.hxx>
  41  #include <helper.hxx>
  42 -#ifndef _PSP_PRINTERINFOMANAGER_HXX_
  43  #include <psprint/printerinfomanager.hxx>
  44 -#endif
  45  #include <padialog.hxx>
  46  #include <adddlg.hxx>
  47  #include <prtsetup.hxx>
  48 @@ -93,7 +92,9 @@ PADialog::PADialog( Window* pParent, BOO
  49          m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
  50          m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
  51                 m_aAddPB( this, PaResId( RID_PA_BTN_ADD ) ),
  52 +       #ifndef FONTCONFIG_FONTS
  53                 m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
  54 +       #endif
  55                 m_aCancelButton( this, PaResId( RID_PA_BTN_CANCEL ) ),
  56                 m_aDefPrt( PaResId( RID_PA_STR_DEFPRT ) ),
  57                 m_aRenameStr( PaResId( RID_PA_STR_RENAME ) ),
  58 @@ -139,14 +140,16 @@ void PADialog::Init()
  59         m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  60         m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  61         m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  62 -       m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  63         m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  64         m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
  65      m_aCUPSCB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  66
  67 +     #ifndef FONTCONFIG_FONTS
  68 +        m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  69         ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
  70         if( ! rFontManager.checkImportPossible() )
  71                 m_aFontsPB.Enable( FALSE );
  72 +     #endif
  73  }
  74
  75  PADialog::~PADialog()
  76 @@ -212,11 +215,13 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushBu
  77                 PrintTestPage();
  78         else if( pButton == &m_aAddPB )
  79                 AddDevice();
  80 +     #ifndef FONTCONFIG_FONTS
  81         else if( pButton == &m_aFontsPB )
  82         {
  83                 FontNameDlg aDialog( this );
  84                 aDialog.Execute();
  85         }
  86 +     #endif
  87      else if( static_cast<Button*>(pButton) == &m_aCUPSCB )
  88      {
  89          m_rPIManager.setCUPSDisabled( m_aCUPSCB.IsChecked() );
  90 --- padmin/source/padialog.hxx.old      2009-04-02 11:01:37.000000000 +0000
  91 +++ padmin/source/padialog.hxx  2009-04-06 16:41:45.000000000 +0000
  92 @@ -77,7 +77,9 @@ namespace padmin {
  93
  94          FixedLine                                                      m_aSepButtonFL;
  95                 PushButton                                                      m_aAddPB;
  96 +#ifndef FONTCONFIG_FONTS
  97                 PushButton                                                      m_aFontsPB;
  98 +#endif
  99                 CancelButton                                            m_aCancelButton;
 100
 101                 String                                                          m_aDefPrt;