[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] installer/hlxserver/common/platform/win instdlg.cpp,
From:       dcollins () helixcommunity ! org
Date:       2007-04-27 23:40:11
Message-ID: 200704272340.l3RNeM3x031871 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/installer/hlxserver/common/platform/win
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv25279/hlxserver/common/platform/win

Modified Files:
      Tag: SERVER_BORABORA
	instdlg.cpp instdlg.h 
Log Message:
moving from server_rn/installer

Index: instdlg.h
===================================================================
RCS file: /cvsroot/server/installer/hlxserver/common/platform/win/instdlg.h,v
retrieving revision 1.2
retrieving revision 1.2.142.1
diff -u -d -r1.2 -r1.2.142.1
--- instdlg.h	23 Jan 2003 23:43:01 -0000	1.2
+++ instdlg.h	27 Apr 2007 23:40:09 -0000	1.2.142.1
@@ -62,7 +62,6 @@
 class CWelcomeDlg;
 class CFolderDlg;
 class CUserPassDlg;
-class CPNAPortDlg;
 class CRTSPPortDlg;
 class CHTTPPortDlg;
 class CAdminPortDlg;
@@ -202,21 +201,6 @@
     char        m_szPort[32];
 };
 
-class CPNAPortDlg : public CPortDlg
-{
-public:
-    CPNAPortDlg(HINSTANCE hInstance);
-    ~CPNAPortDlg() {}
-
-    static CInstDlg* GetDlgInst(HINSTANCE hInst);
-
-protected:
-    static CInstDlg*    g_pDlg;
-
-    inline CInstDlg*    PrevDialog() const;
-    inline CInstDlg*    NextDialog() const;        
-};
-
 class CRTSPPortDlg : public CPortDlg
 {
 public:
@@ -398,25 +382,13 @@
 inline CInstDlg*
 CUserPassDlg::NextDialog() const
 {
-    return CPNAPortDlg::GetDlgInst(m_hInstance);
-}
-
-inline CInstDlg*
-CPNAPortDlg::PrevDialog() const
-{
-    return CUserPassDlg::GetDlgInst(m_hInstance);
-}
-
-inline CInstDlg*
-CPNAPortDlg::NextDialog() const
-{
     return CRTSPPortDlg::GetDlgInst(m_hInstance);
 }
 
 inline CInstDlg*
 CRTSPPortDlg::PrevDialog() const
 {
-    return CPNAPortDlg::GetDlgInst(m_hInstance);
+    return CUserPassDlg::GetDlgInst(m_hInstance);
 }
 
 inline CInstDlg*

Index: instdlg.cpp
===================================================================
RCS file: /cvsroot/server/installer/hlxserver/common/platform/win/instdlg.cpp,v
retrieving revision 1.3
retrieving revision 1.3.140.1
diff -u -d -r1.3 -r1.3.140.1
--- instdlg.cpp	13 Feb 2003 02:25:20 -0000	1.3
+++ instdlg.cpp	27 Apr 2007 23:40:09 -0000	1.3.140.1
@@ -66,7 +66,6 @@
 CInstDlg* CWelcomeDlg::g_pDlg = NULL;
 CInstDlg* CFolderDlg::g_pDlg = NULL;
 CInstDlg* CUserPassDlg::g_pDlg = NULL;
-CInstDlg* CPNAPortDlg::g_pDlg = NULL;
 CInstDlg* CRTSPPortDlg::g_pDlg = NULL;
 CInstDlg* CHTTPPortDlg::g_pDlg = NULL;
 CInstDlg* CAdminPortDlg::g_pDlg = NULL;
@@ -682,13 +681,6 @@
     return TRUE;
 }
 
-CPNAPortDlg::CPNAPortDlg(HINSTANCE hInstance) : CPortDlg(hInstance)
-{
-    m_szPrompt = STR_PNA_PROMPT;
-    m_nPortID = ServerInstaller::PNA_PORT;
-    Init();
-}
-
 CRTSPPortDlg::CRTSPPortDlg(HINSTANCE hInstance) : CPortDlg(hInstance)
 {
     m_szPrompt = STR_RTSP_PROMPT;
@@ -743,8 +735,6 @@
         (UINT)g_pServInst->GetInstPort(ServerInstaller::RTSP_PORT), FALSE);
     SetDlgItemInt(m_hwndDlg, IDC_HTTPPORT, 
         (UINT)g_pServInst->GetInstPort(ServerInstaller::HTTP_PORT), FALSE);
-    SetDlgItemInt(m_hwndDlg, IDC_PNAPORT, 
-        (UINT)g_pServInst->GetInstPort(ServerInstaller::PNA_PORT), FALSE);
     SetDlgItemInt(m_hwndDlg, IDC_ADMINPORT, 
         (UINT)g_pServInst->GetInstPort(ServerInstaller::ADMIN_PORT), FALSE);
     SetDlgItemText(m_hwndDlg, IDC_DESTINATION, g_pServInst->m_szDestDir);    
@@ -791,16 +781,6 @@
 }
 
 CInstDlg*
-CPNAPortDlg::GetDlgInst(HINSTANCE hInst)
-{
-    if(!g_pDlg)
-    {
-        g_pDlg = g_pDlg = new CPNAPortDlg(hInst);
-    }
-    return g_pDlg;
-}
-
-CInstDlg*
 CRTSPPortDlg::GetDlgInst(HINSTANCE hInst)
 {
     if(!g_pDlg)


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]