From: Stefan Csomor Date: Fri, 23 Apr 2004 09:14:50 +0000 (+0000) Subject: CFM Build fixes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d9d14984ff9f41ab86d01f0db28b50e4ae9774d6 CFM Build fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/mac/carbon/menu.cpp b/src/mac/carbon/menu.cpp index a98f3c3b87..b58d8e5d83 100644 --- a/src/mac/carbon/menu.cpp +++ b/src/mac/carbon/menu.cpp @@ -504,7 +504,7 @@ void wxMenuBar::MacInstallMenuBar() wxStAppResource resload ; - MenuBarHandle menubar = NewHandleClear( sizeof( MenuBarHeader ) ) ; + MenuBarHandle menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ; ::SetMenuBar( menubar ) ; DisposeMenuBar( menubar ) ; MenuHandle appleMenu = NULL ; diff --git a/src/mac/carbon/mpthread.cpp b/src/mac/carbon/mpthread.cpp index 52976e92a5..b0d67a020c 100755 --- a/src/mac/carbon/mpthread.cpp +++ b/src/mac/carbon/mpthread.cpp @@ -35,17 +35,16 @@ #include "wx/thread.h" #ifdef __WXMAC__ +#if TARGET_API_MAC_OSX #include +#else +#include +#include +#include +#endif #include "wx/mac/uma.h" #endif -// trace mask for wxThread operations -#define TRACE_THREADS _T("thread") - -// you can get additional debugging messages for the semaphore operations -#define TRACE_SEMA _T("semaphore") - - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -1149,16 +1148,9 @@ wxThreadError wxThread::Resume() switch ( state ) { case STATE_PAUSED: - wxLogTrace(TRACE_THREADS, _T("Thread %ld suspended, resuming."), - GetId()); - m_internal->Resume(); - return wxTHREAD_NO_ERROR; - case STATE_EXITED: - wxLogTrace(TRACE_THREADS, _T("Thread %ld exited, won't resume."), - GetId()); return wxTHREAD_NO_ERROR; default: @@ -1428,7 +1420,7 @@ bool wxThreadModule::OnInit() if ( !hasThreadManager ) { - wxMessageBox( "Error" , "MP Thread Support is not available on this System" , wxOK ) ; + wxMessageBox( wxT("Error") , wxT("MP Thread Support is not available on this System" ), wxOK ) ; return FALSE ; }