[ffdshow-cvs] ffdshow/src/dialog Cfont.cpp,1.52,1.53 ChideShow.cpp,1.5,1.6 Cout.cpp,1.14,1.15 Cpresets.cpp,1.61,1.62 CresizeAspect.cpp,1.55,1.56 TffdshowPageBase.cpp,1.21,1.22 TffdshowPageBase.h,1.15,1.16

[Milan C. <mil...@us...>]

Update of /cvsroot/ffdshow/ffdshow/src/dialog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19343/src/dialog

Modified Files:
	Cfont.cpp ChideShow.cpp Cout.cpp Cpresets.cpp 
	CresizeAspect.cpp TffdshowPageBase.cpp TffdshowPageBase.h 
Log Message:
use webdings font for arrows symbols (patch by Sergej Salnikov)

Index: TffdshowPageBase.cpp
===================================================================
RCS file: /cvsroot/ffdshow/ffdshow/src/dialog/TffdshowPageBase.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** TffdshowPageBase.cpp	27 Mar 2004 18:52:03 -0000	1.21
--- TffdshowPageBase.cpp	30 Aug 2004 08:55:06 -0000	1.22
***************
*** 46,50 ****
   isShift=false;
   red=NULL;
!  iconLeft=iconRight=iconUp=iconDown=NULL;
  }
  
--- 46,50 ----
   isShift=false;
   red=NULL;
!  arrowsFont=NULL;
  }
  
***************
*** 199,206 ****
   
   red=CreateSolidBrush(RGB(255,0,0));
!  iconLeft=LoadIcon(hi,MAKEINTRESOURCE(IDI_LEFT));
!  iconRight=LoadIcon(hi,MAKEINTRESOURCE(IDI_RIGHT));
!  iconUp=LoadIcon(hi,MAKEINTRESOURCE(IDI_UP));
!  iconDown=LoadIcon(hi,MAKEINTRESOURCE(IDI_DOWN));
  
   dlg=findParentDlg();
--- 199,205 ----
   
   red=CreateSolidBrush(RGB(255,0,0));
!  //LOGFONT lf={-13L,-13L,0L,0L,FW_NORMAL,0,0,0,SYMBOL_CHARSET,OUT_STROKE_PRECIS,CLIP_STROKE_PRECIS,DRAFT_QUALITY,FF_ROMAN+VARIABLE_PITCH,"Webdings"};
!  LOGFONT lf={18L,0L,0L,0L,FW_NORMAL,0,0,0,SYMBOL_CHARSET,OUT_DEFAULT_PRECIS,CLIP_DEFAULT_PRECIS,DEFAULT_QUALITY,FF_DONTCARE+DEFAULT_PITCH,"Webdings"};
!  arrowsFont=CreateFontIndirect(&lf);
  
   dlg=findParentDlg();
***************
*** 320,327 ****
       pages.clear();page=NULL;
       if (red) DeleteObject(red);red=NULL;
!      if (iconLeft) DeleteObject(iconLeft);iconLeft=NULL;
!      if (iconRight) DeleteObject(iconRight);iconRight=NULL;
!      if (iconUp) DeleteObject(iconUp);iconUp=NULL;
!      if (iconDown) DeleteObject(iconDown);iconDown=NULL;
       if (hil) ImageList_Destroy(hil);hil=NULL;
       return FALSE;
--- 319,323 ----
       pages.clear();page=NULL;
       if (red) DeleteObject(red);red=NULL;
!      if (arrowsFont) DeleteObject(arrowsFont);arrowsFont=NULL;
       if (hil) ImageList_Destroy(hil);hil=NULL;
       return FALSE;

Index: Cpresets.cpp
===================================================================
RCS file: /cvsroot/ffdshow/ffdshow/src/dialog/Cpresets.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** Cpresets.cpp	16 Aug 2004 04:19:48 -0000	1.61
--- Cpresets.cpp	30 Aug 2004 08:55:06 -0000	1.62
***************
*** 83,88 ****
   lvSelectPreset(oldActivePresetName);
  
!  SendDlgItemMessage(m_hwnd,IDC_BT_PRESET_NEW_MENU   ,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconDown));
!  SendDlgItemMessage(m_hwnd,IDC_BT_PRESET_RENAME_MENU,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconDown));
  
   cfg2dlg();
--- 83,88 ----
   lvSelectPreset(oldActivePresetName);
  
!  SendDlgItemMessage(m_hwnd,IDC_BT_PRESET_NEW_MENU   ,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_PRESET_RENAME_MENU,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
  
   cfg2dlg();

Index: ChideShow.cpp
===================================================================
RCS file: /cvsroot/ffdshow/ffdshow/src/dialog/ChideShow.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChideShow.cpp	30 Aug 2004 07:25:40 -0000	1.5
--- ChideShow.cpp	30 Aug 2004 08:55:06 -0000	1.6
***************
*** 22,27 ****
  void ThideShowPage::init(void)
  {
!  SendDlgItemMessage(m_hwnd,IDC_BT_HIDESHOW_HIDE,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconLeft));
!  SendDlgItemMessage(m_hwnd,IDC_BT_HIDESHOW_SHOW,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconRight));
  // cfg2dlg();
  }
--- 22,29 ----
  void ThideShowPage::init(void)
  {
!  SendDlgItemMessage(m_hwnd,IDC_BT_HIDESHOW_HIDE,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_HIDESHOW_SHOW,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_HIDESHOW_HIDE_ALL,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_HIDESHOW_SHOW_ALL,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
  // cfg2dlg();
  }

Index: Cfont.cpp
===================================================================
RCS file: /cvsroot/ffdshow/ffdshow/src/dialog/Cfont.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Cfont.cpp	24 Aug 2004 10:55:55 -0000	1.52
--- Cfont.cpp	30 Aug 2004 08:55:06 -0000	1.53
***************
*** 319,325 ****
  void TfontPageOSD::init(void)
  {
!  SendDlgItemMessage(m_hwnd,IDC_BT_OSD_PRESETS  ,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconRight));
!  SendDlgItemMessage(m_hwnd,IDC_BT_OSD_LINE_UP  ,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconUp   ));
!  SendDlgItemMessage(m_hwnd,IDC_BT_OSD_LINE_DOWN,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconDown ));
   
   hlv=GetDlgItem(m_hwnd,IDC_LV_OSD_LINES);
--- 319,325 ----
  void TfontPageOSD::init(void)
  {
!  SendDlgItemMessage(m_hwnd,IDC_BT_OSD_PRESETS  ,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_OSD_LINE_UP  ,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_OSD_LINE_DOWN,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
   
   hlv=GetDlgItem(m_hwnd,IDC_LV_OSD_LINES);

Index: Cout.cpp
===================================================================
RCS file: /cvsroot/ffdshow/ffdshow/src/dialog/Cout.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Cout.cpp	18 Aug 2004 19:01:34 -0000	1.14
--- Cout.cpp	30 Aug 2004 08:55:06 -0000	1.15
***************
*** 56,60 ****
    hed=NULL;
  
!  SendDlgItemMessage(m_hwnd,IDC_BT_ASPECT,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconDown));
  
   cfg2dlg();
--- 56,60 ----
    hed=NULL;
  
!  SendDlgItemMessage(m_hwnd,IDC_BT_ASPECT,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
  
   cfg2dlg();

Index: TffdshowPageBase.h
===================================================================
RCS file: /cvsroot/ffdshow/ffdshow/src/dialog/TffdshowPageBase.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TffdshowPageBase.h	27 Mar 2004 18:52:03 -0000	1.15
--- TffdshowPageBase.h	30 Aug 2004 08:55:06 -0000	1.16
***************
*** 72,76 ****
   HWND m_hwnd;
   HBRUSH red;
!  HICON iconLeft,iconRight,iconUp,iconDown;
   TconfPageBase* hti2page(HTREEITEM hti);
   virtual void translate(void);
--- 72,76 ----
   HWND m_hwnd;
   HBRUSH red;
!  HFONT arrowsFont;
   TconfPageBase* hti2page(HTREEITEM hti);
   virtual void translate(void);

Index: CresizeAspect.cpp
===================================================================
RCS file: /cvsroot/ffdshow/ffdshow/src/dialog/CresizeAspect.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** CresizeAspect.cpp	16 Jun 2004 06:53:41 -0000	1.55
--- CresizeAspect.cpp	30 Aug 2004 08:55:06 -0000	1.56
***************
*** 74,80 ****
   h=GetDlgItem(m_hwnd,IDC_BT_RESIZE_XYCOND );SetWindowLong(h,GWL_USERDATA,LONG(this));oldProcs[h]=(WNDPROC)SetWindowLong(h,GWL_WNDPROC,LONG(btWndProc));
   
!  SendDlgItemMessage(m_hwnd,IDC_BT_RESIZE_SIZE_MENU  ,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconDown));
!  SendDlgItemMessage(m_hwnd,IDC_BT_RESIZE_ASPECT_MENU,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconDown));
!  SendDlgItemMessage(m_hwnd,IDC_BT_RESIZE_PIX_MENU   ,BM_SETIMAGE,IMAGE_ICON,LPARAM(parent->iconDown));
  
   tbrSetRange(IDC_TBR_BORDERSX,0,100,10);
--- 74,80 ----
   h=GetDlgItem(m_hwnd,IDC_BT_RESIZE_XYCOND );SetWindowLong(h,GWL_USERDATA,LONG(this));oldProcs[h]=(WNDPROC)SetWindowLong(h,GWL_WNDPROC,LONG(btWndProc));
   
!  SendDlgItemMessage(m_hwnd,IDC_BT_RESIZE_SIZE_MENU  ,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_RESIZE_ASPECT_MENU,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
!  SendDlgItemMessage(m_hwnd,IDC_BT_RESIZE_PIX_MENU   ,WM_SETFONT,WPARAM(parent->arrowsFont),LPARAM(false));
  
   tbrSetRange(IDC_TBR_BORDERSX,0,100,10);