Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CFM Build fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-04-23 09:14:50 +00:00
parent 7eb8d1ebd6
commit d9d14984ff
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mac/carbon/menu.cpp
View File

@@ -504,7 +504,7 @@ void wxMenuBar::MacInstallMenuBar()
wxStAppResource resload ; wxStAppResource resload ;
MenuBarHandle menubar = NewHandleClear( sizeof( MenuBarHeader ) ) ; MenuBarHandle menubar = NewHandleClear( 6 /* sizeof( MenuBarHeader ) */ ) ;
::SetMenuBar( menubar ) ; ::SetMenuBar( menubar ) ;
DisposeMenuBar( menubar ) ; DisposeMenuBar( menubar ) ;
MenuHandle appleMenu = NULL ; MenuHandle appleMenu = NULL ;

22
src/mac/carbon/mpthread.cpp
View File

@@ -35,17 +35,16 @@
#include "wx/thread.h" #include "wx/thread.h"
#ifdef __WXMAC__ #ifdef __WXMAC__
#if TARGET_API_MAC_OSX
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#else
#include <DriverServices.h>
#include <Multiprocessing.h>
#include <math.h>
#endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#endif #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 // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1149,16 +1148,9 @@ wxThreadError wxThread::Resume()
switch ( state ) switch ( state )
{ {
case STATE_PAUSED: case STATE_PAUSED:
wxLogTrace(TRACE_THREADS, _T("Thread %ld suspended, resuming."),
GetId());
m_internal->Resume(); m_internal->Resume();
return wxTHREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
case STATE_EXITED: case STATE_EXITED:
wxLogTrace(TRACE_THREADS, _T("Thread %ld exited, won't resume."),
GetId());
return wxTHREAD_NO_ERROR; return wxTHREAD_NO_ERROR;
default: default:
@@ -1428,7 +1420,7 @@ bool wxThreadModule::OnInit()
if ( !hasThreadManager ) 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 ; return FALSE ;
} }