Browse Source

fixed vc7 errors: (wparam, lparam) parameter order fixed

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@136 595ec19a-5cb4-439b-94a8-42fb3063c22c
ingenuus 21 years ago
parent
commit
78602d9fa7
5 changed files with 8 additions and 8 deletions
  1. 1 1
      Client.cpp
  2. 2 2
      MoveToGroupDlg.cpp
  3. 1 1
      MoveToGroupDlg.h
  4. 3 3
      QPasteWnd.cpp
  5. 1 1
      QPasteWnd.h

+ 1 - 1
Client.cpp

@@ -230,7 +230,7 @@ BOOL CClient::OpenConnection(const char* servername)
 
 	server.sin_addr.s_addr=*((unsigned long*)hp->h_addr);
 	server.sin_family=AF_INET;
-	server.sin_port=htons(g_Opt.m_lPort);
+	server.sin_port=htons( (u_short) g_Opt.m_lPort );
 	if(connect(m_Connection,(struct sockaddr*)&server,sizeof(server)))
 	{
 		LogSendRecieveInfo("ERROR if(connect(m_Connection,(struct sockaddr*)&server,sizeof(server)))");

+ 2 - 2
MoveToGroupDlg.cpp

@@ -56,9 +56,9 @@ BOOL CMoveToGroupDlg::OnInitDialog()
 	              // EXCEPTION: OCX Property Pages should return FALSE
 }
 
-LRESULT CMoveToGroupDlg::OnTreeSelect(LPARAM lParam, WPARAM wParam)
+LRESULT CMoveToGroupDlg::OnTreeSelect(WPARAM wParam, LPARAM lParam)
 {
-	int nID = (int)lParam;
+	int nID = (int)wParam;
 	if(nID >= 0)
 	{
 		m_nSelectedGroup = nID;

+ 1 - 1
MoveToGroupDlg.h

@@ -43,7 +43,7 @@ protected:
 	virtual void OnOK();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
 	//}}AFX_MSG
-	LRESULT OnTreeSelect(LPARAM lParam, WPARAM wParam);
+	LRESULT OnTreeSelect(WPARAM wParam, LPARAM lParam);
 	DECLARE_MESSAGE_MAP()
 };
 

+ 3 - 3
QPasteWnd.cpp

@@ -2049,11 +2049,11 @@ void CQPasteWnd::OnBackButton()
 	theApp.EnterGroupID(theApp.m_GroupParentID);
 }
 
-LRESULT CQPasteWnd::OnGetClipData(LPARAM lParam, WPARAM wParam)
+LRESULT CQPasteWnd::OnGetClipData(WPARAM wParam, LPARAM lParam)
 {
 	BOOL bRet = FALSE;
-	CClipFormat *pClip = (CClipFormat *)wParam;
-	int nItem = (int)lParam;
+	CClipFormat *pClip = (CClipFormat *)lParam;
+	int nItem = (int)wParam;
 	try
 	{
 		m_Recset.SetAbsolutePosition(nItem);

+ 1 - 1
QPasteWnd.h

@@ -197,7 +197,7 @@ public:
 	afx_msg void OnMenuNewGroup();
 	afx_msg void OnMenuNewGroupSelection();
 	afx_msg void OnBackButton();
-	afx_msg LRESULT OnGetClipData(LPARAM lParam, WPARAM wParam);
+	afx_msg LRESULT OnGetClipData(WPARAM wParam, LPARAM lParam);
 };