From 011d86ed668cbbff5c7bfc5f7e88086acb849921 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 15 Apr 2012 00:50:13 +0200 Subject: Pulled changes from test mingw branch * include fixes * syntax fixes for MinGW * fixed encoding of restext.cpp * temporary fix for MinGW in joystick.cpp Successfully compiles under MinGW :) --- src/CBot/TestCBot/CBotConsoleDlg.cpp | 6 ++++-- src/CBot/TestCBot/CBotConsoleDlg.h | 4 +++- src/CBot/TestCBot/ChildFrm.cpp | 4 +++- src/CBot/TestCBot/ChildFrm.h | 4 +++- src/CBot/TestCBot/MainFrm.cpp | 4 +++- src/CBot/TestCBot/MainFrm.h | 4 +++- src/CBot/TestCBot/PerformDlg.cpp | 4 +++- src/CBot/TestCBot/PerformDlg.h | 4 +++- src/CBot/TestCBot/TestCBotDoc.cpp | 2 +- src/CBot/TestCBot/TestCBotView.cpp | 4 +++- 10 files changed, 29 insertions(+), 11 deletions(-) (limited to 'src/CBot/TestCBot') diff --git a/src/CBot/TestCBot/CBotConsoleDlg.cpp b/src/CBot/TestCBot/CBotConsoleDlg.cpp index 2305bf3..55a271a 100644 --- a/src/CBot/TestCBot/CBotConsoleDlg.cpp +++ b/src/CBot/TestCBot/CBotConsoleDlg.cpp @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// CBotConsoleDlg.cpp : implementation file +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// CBotConsoleDlg.cpp : implementation file // #include "stdafx.h" @@ -208,7 +210,7 @@ BOOL CBotConsoleDlg::OnInitDialog() m_Edit1.ReplaceSel("Les fonctions suivantes sont disponibles:\r\n"); for ( int i = 0; i < m_pListe->GivSize(); i++ ) { - CBotString x = (*m_pListe)[i] + "\r\n"; + CBotString x = (*m_pListe)[i] + CBotString("\r\n"); m_Edit1.ReplaceSel(x); } m_Edit1.ReplaceSel("Entrez une commande ci-dessous.\r\n\r\n"); diff --git a/src/CBot/TestCBot/CBotConsoleDlg.h b/src/CBot/TestCBot/CBotConsoleDlg.h index 52a6e16..f289a4d 100644 --- a/src/CBot/TestCBot/CBotConsoleDlg.h +++ b/src/CBot/TestCBot/CBotConsoleDlg.h @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.#if !defined(AFX_BOTCONSOLEDLG_H__A11450A2_8E09_11D4_A439_00D059085115__INCLUDED_) +// * along with this program. If not, see http://www.gnu.org/licenses/. + +#if !defined(AFX_BOTCONSOLEDLG_H__A11450A2_8E09_11D4_A439_00D059085115__INCLUDED_) #define AFX_BOTCONSOLEDLG_H__A11450A2_8E09_11D4_A439_00D059085115__INCLUDED_ #if _MSC_VER >= 1000 diff --git a/src/CBot/TestCBot/ChildFrm.cpp b/src/CBot/TestCBot/ChildFrm.cpp index eb7f2b7..4c40f90 100644 --- a/src/CBot/TestCBot/ChildFrm.cpp +++ b/src/CBot/TestCBot/ChildFrm.cpp @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// ChildFrm.cpp : implementation of the CChildFrame class +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// ChildFrm.cpp : implementation of the CChildFrame class // #include "stdafx.h" diff --git a/src/CBot/TestCBot/ChildFrm.h b/src/CBot/TestCBot/ChildFrm.h index d8918d4..2ad57b6 100644 --- a/src/CBot/TestCBot/ChildFrm.h +++ b/src/CBot/TestCBot/ChildFrm.h @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// ChildFrm.h : interface of the CChildFrame class +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// ChildFrm.h : interface of the CChildFrame class // ///////////////////////////////////////////////////////////////////////////// diff --git a/src/CBot/TestCBot/MainFrm.cpp b/src/CBot/TestCBot/MainFrm.cpp index c3f6b9f..6669350 100644 --- a/src/CBot/TestCBot/MainFrm.cpp +++ b/src/CBot/TestCBot/MainFrm.cpp @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// MainFrm.cpp : implementation of the CMainFrame class +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// MainFrm.cpp : implementation of the CMainFrame class // #include "stdafx.h" diff --git a/src/CBot/TestCBot/MainFrm.h b/src/CBot/TestCBot/MainFrm.h index 0c4e737..a1d34f4 100644 --- a/src/CBot/TestCBot/MainFrm.h +++ b/src/CBot/TestCBot/MainFrm.h @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// MainFrm.h : interface of the CMainFrame class +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// diff --git a/src/CBot/TestCBot/PerformDlg.cpp b/src/CBot/TestCBot/PerformDlg.cpp index f5ccd7b..8abbb4b 100644 --- a/src/CBot/TestCBot/PerformDlg.cpp +++ b/src/CBot/TestCBot/PerformDlg.cpp @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// PerformDlg.cpp : implementation file +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// PerformDlg.cpp : implementation file // #include "stdafx.h" diff --git a/src/CBot/TestCBot/PerformDlg.h b/src/CBot/TestCBot/PerformDlg.h index 6a9a845..29d567f 100644 --- a/src/CBot/TestCBot/PerformDlg.h +++ b/src/CBot/TestCBot/PerformDlg.h @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.#if !defined(AFX_PERFORMDLG_H__EAF2D560_97D8_11D4_A439_00D059085115__INCLUDED_) +// * along with this program. If not, see http://www.gnu.org/licenses/. + +#if !defined(AFX_PERFORMDLG_H__EAF2D560_97D8_11D4_A439_00D059085115__INCLUDED_) #define AFX_PERFORMDLG_H__EAF2D560_97D8_11D4_A439_00D059085115__INCLUDED_ #if _MSC_VER >= 1000 diff --git a/src/CBot/TestCBot/TestCBotDoc.cpp b/src/CBot/TestCBot/TestCBotDoc.cpp index fdb8604..8880c57 100644 --- a/src/CBot/TestCBot/TestCBotDoc.cpp +++ b/src/CBot/TestCBot/TestCBotDoc.cpp @@ -643,7 +643,7 @@ if ( mode == 2 ) if (!m_pProg->Compile(m_DocText, m_Liste, (void*) 44)) while ( pVar != NULL ) { info += sep; - info += pVar->GivName() + " = " + pVar->GivValString(); + info += pVar->GivName() + CBotString(" = ") + pVar->GivValString(); sep = ", "; pVar = pVar->GivNext(); } diff --git a/src/CBot/TestCBot/TestCBotView.cpp b/src/CBot/TestCBot/TestCBotView.cpp index e4710cb..bca3c56 100644 --- a/src/CBot/TestCBot/TestCBotView.cpp +++ b/src/CBot/TestCBot/TestCBotView.cpp @@ -12,7 +12,9 @@ // * GNU General Public License for more details. // * // * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/.// TestCBotView.cpp : implementation of the CTestCBotView class +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// TestCBotView.cpp : implementation of the CTestCBotView class // #include "stdafx.h" -- cgit v1.2.3-1-g7c22