[M-CVS] CVS: M/src/modules BareBonesEditor.cpp, 1.40, 1.41 Migrate.cpp, 1.28, 1.29
Status: Beta
Brought to you by:
vadz
From: Nerijus B. <ne...@us...> - 2006-09-04 23:15:43
|
Update of /cvsroot/mahogany/M/src/modules In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3563/src/modules Modified Files: BareBonesEditor.cpp Migrate.cpp Log Message: compilation with wxWine Index: BareBonesEditor.cpp =================================================================== RCS file: /cvsroot/mahogany/M/src/modules/BareBonesEditor.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -b -u -2 -r1.40 -r1.41 --- BareBonesEditor.cpp 6 Feb 2006 15:50:56 -0000 1.40 +++ BareBonesEditor.cpp 4 Sep 2006 23:15:37 -0000 1.41 @@ -886,5 +886,5 @@ -#if wxUSE_WCHAR_T && defined(OS_WIN) +#if wxUSE_WCHAR_T && defined(OS_WIN) && !defined(__WINE__) wxWCharBuffer wxBareBonesTextControl::GetUnicodeText() const @@ -1222,5 +1222,5 @@ m_getNextAttachement = 0; -#if wxUSE_WCHAR_T && defined(OS_WIN) +#if wxUSE_WCHAR_T && defined(OS_WIN) && !defined(__WINE__) wxFontEncoding encPart = wxFONTENCODING_SYSTEM; wxWCharBuffer wbuf = m_textControl->GetUnicodeText(); Index: Migrate.cpp =================================================================== RCS file: /cvsroot/mahogany/M/src/modules/Migrate.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -b -u -2 -r1.28 -r1.29 --- Migrate.cpp 16 Jan 2006 20:32:28 -0000 1.28 +++ Migrate.cpp 4 Sep 2006 23:15:37 -0000 1.29 @@ -31,5 +31,5 @@ #include <wx/app.h> // for wxPostEvent() // it includes windows.h which defines SendMessage under Windows -#if defined(__CYGWIN__) || defined(__MINGW32__) +#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WINE__) #undef SendMessage #endif |