[RsWitch-cvs] CVS: rswitch AddEditDlg.cpp,1.1.1.1,1.2

[Brad P. C. <bcr...@us...>]

Update of /cvsroot/rswitch/rswitch
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6591

Modified Files:
	AddEditDlg.cpp 
Log Message:
Too many to list.

Index: AddEditDlg.cpp
===================================================================
RCS file: /cvsroot/rswitch/rswitch/AddEditDlg.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AddEditDlg.cpp	2000/11/01 15:10:16	1.1.1.1
--- AddEditDlg.cpp	2000/12/05 05:45:12	1.2
***************
*** 19,22 ****
--- 19,25 ----
  
  // $Log$
+ // Revision 1.2  2000/12/05 05:45:12  bcrochet
+ // Too many to list.
+ //
  // Revision 1.1.1.1  2000/11/01 15:10:16  bcrochet
  // Initial revision and import
***************
*** 41,73 ****
  
  CAddEditDlg::CAddEditDlg(CString title, CWnd* pParent /*=NULL*/)
! 	: CDialog(CAddEditDlg::IDD, pParent)
  {
! 	//{{AFX_DATA_INIT(CAddEditDlg)
! 	m_sChannel = _T("");
! 	m_sFunction = _T("");
! 	//}}AFX_DATA_INIT
     m_sTitle = title;
  }
  
  
  void CAddEditDlg::DoDataExchange(CDataExchange* pDX)
  {
! 	CDialog::DoDataExchange(pDX);
! 	//{{AFX_DATA_MAP(CAddEditDlg)
! 	DDX_Control(pDX, IDC_FUNCTION, m_ctrlFunction);
! 	DDX_Control(pDX, IDC_CHANNEL, m_ctrlChannel);
! 	DDX_Control(pDX, IDC_SERVERIP, m_ctrlServerIP);
! 	DDX_Control(pDX, IDC_HOTKEY, m_ctrlHotkey);
! 	DDX_Text(pDX, IDC_CHANNEL, m_sChannel);
! 	DDV_MaxChars(pDX, m_sChannel, 5);
! 	DDX_CBString(pDX, IDC_FUNCTION, m_sFunction);
! 	//}}AFX_DATA_MAP
  }
  
  
  BEGIN_MESSAGE_MAP(CAddEditDlg, CDialog)
! 	//{{AFX_MSG_MAP(CAddEditDlg)
! 	ON_CBN_SELCHANGE(IDC_FUNCTION, OnSelchangeFunction)
! 	//}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
--- 44,88 ----
  
  CAddEditDlg::CAddEditDlg(CString title, CWnd* pParent /*=NULL*/)
!    : CDialog(CAddEditDlg::IDD, pParent)
  {
!    //{{AFX_DATA_INIT(CAddEditDlg)
!    m_sChannel = _T("");
!    m_sFunction = _T("");
!    m_sServerName = _T("");
!    //}}AFX_DATA_INIT
     m_sTitle = title;
  }
  
+ CAddEditDlg::CAddEditDlg(CString title, CHotKeyEntry hotKeyEntry, CWnd* pParent /*=NULL*/)
+    : CDialog(CAddEditDlg::IDD, pParent)
+ {
+    //{{AFX_DATA_INIT(CAddEditDlg)
+    m_sChannel = hotKeyEntry.GetChannelName();
+    m_sFunction = _T("");
+    m_sServerName = hotKeyEntry.GetServerName();
+    //}}AFX_DATA_INIT
+    m_sTitle = title;
+ }
  
  void CAddEditDlg::DoDataExchange(CDataExchange* pDX)
  {
!    CDialog::DoDataExchange(pDX);
!    //{{AFX_DATA_MAP(CAddEditDlg)
!    DDX_Control(pDX, IDC_SERVERNAME, m_ctrlServerName);
!    DDX_Control(pDX, IDC_FUNCTION, m_ctrlFunction);
!    DDX_Control(pDX, IDC_CHANNEL, m_ctrlChannel);
!    DDX_Control(pDX, IDC_HOTKEY, m_ctrlHotkey);
!    DDX_Text(pDX, IDC_CHANNEL, m_sChannel);
!    DDV_MaxChars(pDX, m_sChannel, 5);
!    DDX_CBString(pDX, IDC_FUNCTION, m_sFunction);
!    DDX_Text(pDX, IDC_SERVERNAME, m_sServerName);
!    //}}AFX_DATA_MAP
  }
  
  
  BEGIN_MESSAGE_MAP(CAddEditDlg, CDialog)
!    //{{AFX_MSG_MAP(CAddEditDlg)
!    ON_CBN_SELCHANGE(IDC_FUNCTION, OnSelchangeFunction)
!    //}}AFX_MSG_MAP
  END_MESSAGE_MAP()
  
***************
*** 79,88 ****
     if ( m_ctrlFunction.GetCurSel() == 0 )
     {
!       m_ctrlServerIP.EnableWindow();
        m_ctrlChannel.EnableWindow();
     }
     else
     {
!       m_ctrlServerIP.EnableWindow(false);
        m_ctrlChannel.EnableWindow(false);
     }
--- 94,103 ----
     if ( m_ctrlFunction.GetCurSel() == 0 )
     {
!       m_ctrlServerName.EnableWindow();
        m_ctrlChannel.EnableWindow();
     }
     else
     {
!       m_ctrlServerName.EnableWindow(false);
        m_ctrlChannel.EnableWindow(false);
     }
***************
*** 91,95 ****
  BOOL CAddEditDlg::OnInitDialog() 
  {
! 	CDialog::OnInitDialog();
  
     GetMainFrame()->EnableAllHotkeys(false);
--- 106,110 ----
  BOOL CAddEditDlg::OnInitDialog() 
  {
!    CDialog::OnInitDialog();
  
     GetMainFrame()->EnableAllHotkeys(false);
***************
*** 98,111 ****
     m_ctrlFunction.SetCurSel(0);
  
! 	return TRUE;  // return TRUE unless you set the focus to a control
! 	              // EXCEPTION: OCX Property Pages should return FALSE
  }
  
  void CAddEditDlg::OnOK() 
  {
-    m_ctrlServerIP.GetAddress( m_dwIpAddr );
     m_ctrlHotkey.GetHotKey( m_wVirtualKeyCode, m_wModifiers );
! 	GetMainFrame()->EnableAllHotkeys(true);
     
! 	CDialog::OnOK();
  }
--- 113,125 ----
     m_ctrlFunction.SetCurSel(0);
  
!    return TRUE;  // return TRUE unless you set the focus to a control
!                  // EXCEPTION: OCX Property Pages should return FALSE
  }
  
  void CAddEditDlg::OnOK() 
  {
     m_ctrlHotkey.GetHotKey( m_wVirtualKeyCode, m_wModifiers );
!    GetMainFrame()->EnableAllHotkeys(true);
     
!    CDialog::OnOK();
  }