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,7 +42,11 @@
  32  #include <string.h>
  33  #include <math.h>
  34
  35 +#include "tools/urlobj.hxx"
  36 +
  37 +#ifndef FONTCONFIG_FONTS
  38  #include "padialog.hrc"
  39 +#endif
  40  #include "fontentry.hxx"
  41  #include "helper.hxx"
  42  #include "padialog.hxx"
  43 @@ -93,7 +92,9 @@ PADialog::PADialog( Window* pParent, BOO
  44          m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
  45          m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
  46                 m_aAddPB( this, PaResId( RID_PA_BTN_ADD ) ),
  47 +       #ifndef FONTCONFIG_FONTS
  48                 m_aFontsPB( this, PaResId( RID_PA_BTN_FONTS ) ),
  49 +       #endif
  50                 m_aCancelButton( this, PaResId( RID_PA_BTN_CANCEL ) ),
  51                 m_aDefPrt( PaResId( RID_PA_STR_DEFPRT ) ),
  52                 m_aRenameStr( PaResId( RID_PA_STR_RENAME ) ),
  53 @@ -139,14 +140,16 @@ void PADialog::Init()
  54         m_aConfPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  55         m_aRenamePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  56         m_aTestPagePB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  57 -       m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  58         m_aAddPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  59         m_aDevicesLB.setDelPressedLink( LINK( this, PADialog, DelPressedHdl ) );
  60      m_aCUPSCB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  61
  62 +     #ifndef FONTCONFIG_FONTS
  63 +        m_aFontsPB.SetClickHdl( LINK( this, PADialog, ClickBtnHdl ) );
  64         ::psp::PrintFontManager& rFontManager( ::psp::PrintFontManager::get() );
  65         if( ! rFontManager.checkImportPossible() )
  66                 m_aFontsPB.Enable( FALSE );
  67 +     #endif
  68  }
  69
  70  PADialog::~PADialog()
  71 @@ -212,11 +215,13 @@ IMPL_LINK( PADialog, ClickBtnHdl, PushBu
  72                 PrintTestPage();
  73         else if( pButton == &m_aAddPB )
  74                 AddDevice();
  75 +     #ifndef FONTCONFIG_FONTS
  76         else if( pButton == &m_aFontsPB )
  77         {
  78                 FontNameDlg aDialog( this );
  79                 aDialog.Execute();
  80         }
  81 +     #endif
  82      else if( static_cast<Button*>(pButton) == &m_aCUPSCB )
  83      {
  84          m_rPIManager.setCUPSDisabled( m_aCUPSCB.IsChecked() );
  85 --- padmin/source/padialog.hxx.old      2009-04-02 11:01:37.000000000 +0000
  86 +++ padmin/source/padialog.hxx  2009-04-06 16:41:45.000000000 +0000
  87 @@ -77,7 +77,9 @@ namespace padmin {
  88
  89          FixedLine                                                      m_aSepButtonFL;
  90                 PushButton                                                      m_aAddPB;
  91 +#ifndef FONTCONFIG_FONTS
  92                 PushButton                                                      m_aFontsPB;
  93 +#endif
  94                 CancelButton                                            m_aCancelButton;
  95
  96                 String                                                          m_aDefPrt;