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

modifications for compilation under Mac OS X

Browse Source 
applied patches extracted from submission by Marc Newsam (tested under Mac OS 9)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-02-15 21:51:14 +00:00
parent f0c5ebdc0d
commit 03e11df547
149 changed files with 1693 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mac/uma.cpp
View File

@@ -1,8 +1,12 @@
#include <wx/mac/uma.h>
#include <wx/mac/aga.h>
#include "wx/defs.h"
#include "wx/mac/uma.h"
#include "wx/mac/aga.h"
#include "Navigation.h"
#ifdef __UNIX__
#include <NavigationServices/Navigation.h>
#else
#include <Navigation.h>
#endif
// init
@@ -75,10 +79,12 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
#endif // UMA_USE_WINDOWMGR
#endif
#ifndef __UNIX__
if ( sUMAHasWindowManager )
InitFloatingWindows() ;
else
InitWindows();
#endif
if ( NavServicesAvailable() )
{
@@ -387,13 +393,22 @@ void UMASetWTitleC( WindowRef inWindowRef , const char *title )
Str255 ptitle ;
strncpy( (char*)ptitle , title , 96 ) ;
ptitle[96] = 0 ;
#if TARGET_CARBON
c2pstrcpy( ptitle, (char *)ptitle ) ;
#else
c2pstr( (char*)ptitle ) ;
#endif
SetWTitle( inWindowRef , ptitle ) ;
}
void UMAGetWTitleC( WindowRef inWindowRef , char *title )
{
GetWTitle( inWindowRef , (unsigned char*)title ) ;
#if TARGET_CARBON
p2cstrcpy( title, (unsigned char *)title ) ;
#else
p2cstr( (unsigned char*)title ) ;
#endif
}
void UMAShowWindow( WindowRef inWindowRef )
@@ -1354,18 +1369,18 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState )
{
#if UMA_USE_APPEARANCE
if ( UMAHasAppearance() )
{
::DrawThemePlacard( inRect , inState ) ;
}
else
if ( UMAHasAppearance() )
{
::DrawThemePlacard( inRect , inState ) ;
}
else
#endif
#if !TARGET_CARBON
{
}
{
}
#else
{
}
{
}
#endif
}