#include "wx/wxprec.h"
+#include "wx/mac/uma.h"
+
#if wxUSE_GUI
#include "wx/toplevel.h"
#include "wx/dc.h"
-#ifndef __DARWIN__
-# include <MacTextEditor.h>
-# include <Navigation.h>
-# if defined(TARGET_CARBON)
-# if PM_USE_SESSION_APIS
-# include <PMCore.h>
-# endif
-# include <PMApplication.h>
-# else
-# include <Printing.h>
-# endif
-#endif
-
-#ifndef __DARWIN__
-# include <Scrap.h>
-#endif
-
#include "wx/mac/uma.h"
// since we have decided that we only support 8.6 upwards we are
{
}
-void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded )
+void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
+ bool WXUNUSED(isEmbedded) )
{
::InitCursor();
wxString str = wxStripMenuCodes( title ) ;
MenuRef menu ;
-#if TARGET_CARBON
CreateNewMenu( id , 0 , &menu ) ;
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
-#else
- Str255 ptitle ;
- wxMacStringToPascal( str , ptitle ) ;
- menu = ::NewMenu( id , ptitle ) ;
-#endif
return menu ;
}
{
wxString str = wxStripMenuCodes( title ) ;
-#if TARGET_CARBON
SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
-
-#else
- Str255 ptitle ;
- wxMacStringToPascal( str , ptitle ) ;
- SetMenuTitle( menu , ptitle ) ;
-#endif
}
void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title, wxFontEncoding encoding )
// we don't strip the accels here anymore, must be done before
wxString str = title ;
-#if TARGET_CARBON
SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
-
-#else
- Str255 ptitle ;
- wxMacStringToPascal( str , ptitle ) ;
- SetMenuItemText( menu , item , ptitle ) ;
-#endif
}
UInt32 UMAMenuEvent( EventRecord *inEvent )
void UMAAppendSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , SInt16 id )
{
AppendMenuItemTextWithCFString( menu,
- CFSTR("A"), 0, 0,NULL);
+ CFSTR("A"), 0, 0,NULL);
UMASetMenuItemText( menu, (SInt16) ::CountMenuItems(menu), title , encoding );
SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
}
void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , SInt16 id )
{
InsertMenuItemTextWithCFString( menu,
- CFSTR("A"), item, 0, 0);
-
+ CFSTR("A"), item, 0, 0);
+
UMASetMenuItemText( menu, item+1, title , encoding );
SetMenuItemHierarchicalID( menu , item+1 , id ) ;
}
macKey = 0 ;
glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
if ( key >= WXK_F13 )
- glyph += 13 ;
+ glyph += 12 ;
}
else
{
void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
{
AppendMenuItemTextWithCFString( menu,
- CFSTR("A"), 0, 0,NULL);
+ CFSTR("A"), 0, 0,NULL);
// don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ;
UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
{
InsertMenuItemTextWithCFString( menu,
- CFSTR("A"), item, 0, 0);
+ CFSTR("A"), item, 0, 0);
// don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise)
ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;
UMASetMenuItemShortcut( menu , item+1 , entry ) ;
}
-// quickdraw
-
-#if !TARGET_CARBON
-
-int gPrOpenCounter = 0 ;
-
-OSStatus UMAPrOpen()
-{
- OSErr err = noErr ;
-
- ++gPrOpenCounter ;
-
- if ( gPrOpenCounter == 1 )
- {
- PrOpen() ;
- err = PrError() ;
- wxASSERT( err == noErr ) ;
- }
-
- return err ;
-}
-
-OSStatus UMAPrClose()
-{
- OSErr err = noErr ;
-
- wxASSERT( gPrOpenCounter >= 1 ) ;
-
- if ( gPrOpenCounter == 1 )
- {
- PrClose() ;
- err = PrError() ;
- wxASSERT( err == noErr ) ;
- }
-
- --gPrOpenCounter ;
-
- return err ;
-}
-
-pascal QDGlobalsPtr GetQDGlobalsPtr() ;
-pascal QDGlobalsPtr GetQDGlobalsPtr()
-{
- return QDGlobalsPtr (* (Ptr*) LMGetCurrentA5 ( ) - 0xCA);
-}
-
-#endif
-
void UMAShowWatchCursor()
{
SetThemeCursor(kThemeWatchCursor);
{
wxASSERT( inWindowRef != NULL ) ;
-#if TARGET_CARBON
return (GrafPtr) GetWindowPort( inWindowRef ) ;
-#else
- return (GrafPtr) inWindowRef ;
-#endif
}
void UMADisposeWindow( WindowRef inWindowRef )
void UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding )
{
-#if TARGET_CARBON
SetWindowTitleWithCFString( inWindowRef , wxMacCFStringHolder(title , encoding) ) ;
-
-#else
- Str255 ptitle ;
- wxMacStringToPascal( title , ptitle ) ;
- SetWTitle( inWindowRef , ptitle ) ;
-#endif
}
// appearance additions
void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding )
{
-#if TARGET_CARBON
SetControlTitleWithCFString( inControl , wxMacCFStringHolder(title , encoding) ) ;
-
-#else
- Str255 ptitle ;
- wxMacStringToPascal( title , ptitle ) ;
- SetControlTitle( inControl , ptitle ) ;
-#endif
}
void UMAActivateControl( ControlRef inControl )
{
-#if TARGET_API_MAC_OSX
::ActivateControl( inControl ) ;
-
-#else
- // we have to add the control after again to the update rgn
- // otherwise updates get lost
- if ( !IsControlActive( inControl ) )
- {
- bool visible = IsControlVisible( inControl ) ;
- if ( visible )
- SetControlVisibility( inControl , false , false ) ;
-
- ::ActivateControl( inControl ) ;
-
- if ( visible )
- {
- SetControlVisibility( inControl , true , false ) ;
-
- Rect ctrlBounds ;
- InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
- }
- }
-#endif
}
void UMAMoveControl( ControlRef inControl , short x , short y )
{
-#if TARGET_API_MAC_OSX
::MoveControl( inControl , x , y ) ;
-
-#else
- bool visible = IsControlVisible( inControl ) ;
- if ( visible )
- {
- SetControlVisibility( inControl , false , false ) ;
- Rect ctrlBounds ;
- InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
- }
-
- ::MoveControl( inControl , x , y ) ;
-
- if ( visible )
- {
- SetControlVisibility( inControl , true , false ) ;
- Rect ctrlBounds ;
- InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
- }
-#endif
}
void UMASizeControl( ControlRef inControl , short x , short y )
{
-#if TARGET_API_MAC_OSX
::SizeControl( inControl , x , y ) ;
-
-#else
- bool visible = IsControlVisible( inControl ) ;
- if ( visible )
- {
- SetControlVisibility( inControl , false , false ) ;
- Rect ctrlBounds ;
- InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
- }
-
- ::SizeControl( inControl , x , y ) ;
-
- if ( visible )
- {
- SetControlVisibility( inControl , true , false ) ;
- Rect ctrlBounds ;
- InvalWindowRect( GetControlOwner(inControl), GetControlBounds(inControl, &ctrlBounds) ) ;
- }
-#endif
}
void UMADeactivateControl( ControlRef inControl )
{
-#if TARGET_API_MAC_OSX
- ::DeactivateControl( inControl ) ;
-
-#else
- // we have to add the control after again to the update rgn
- // otherwise updates get lost
- bool visible = IsControlVisible( inControl ) ;
- if ( visible )
- SetControlVisibility( inControl , false , false ) ;
-
::DeactivateControl( inControl ) ;
-
- if ( visible )
- {
- SetControlVisibility( inControl , true , false ) ;
- Rect ctrlBounds ;
- InvalWindowRect( GetControlOwner(inControl), UMAGetControlBoundsInWindowCoords(inControl, &ctrlBounds) ) ;
- }
-#endif
}
// shows the control and adds the region to the update region
#endif
}
-#if !TARGET_CARBON
-static OSStatus helpMenuStatus = noErr ;
-static MenuItemIndex firstCustomItemIndex = 0 ;
-#endif
-
static OSStatus UMAGetHelpMenu(
MenuRef * outHelpMenu,
MenuItemIndex * outFirstCustomItemIndex,
MenuItemIndex * outFirstCustomItemIndex,
bool allowHelpMenuCreation)
{
-#if TARGET_CARBON
static bool s_createdHelpMenu = false ;
if ( !s_createdHelpMenu && !allowHelpMenuCreation )
OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
s_createdHelpMenu = ( status == noErr ) ;
return status ;
-#else
- wxUnusedVar( allowHelpMenuCreation ) ;
- MenuRef helpMenuHandle ;
-
- helpMenuStatus = HMGetHelpMenuHandle( &helpMenuHandle ) ;
- if ( firstCustomItemIndex == 0 && helpMenuStatus == noErr )
- firstCustomItemIndex = CountMenuItems( helpMenuHandle ) + 1 ;
-
- if ( outFirstCustomItemIndex )
- *outFirstCustomItemIndex = firstCustomItemIndex ;
-
- *outHelpMenu = helpMenuHandle ;
-
- return helpMenuStatus ;
-#endif
}
OSStatus UMAGetHelpMenu(
#endif
-OSStatus UMAPutScrap( Size size , OSType type , void *data )
-{
- OSStatus err = noErr ;
-
-#if !TARGET_CARBON
- err = PutScrap( size , type , data ) ;
-#else
- ScrapRef scrap;
- err = GetCurrentScrap( &scrap );
- if ( err == noErr )
- err = PutScrapFlavor( scrap, type , 0, size, data );
-#endif
-
- return err ;
-}
-
Rect * UMAGetControlBoundsInWindowCoords( ControlRef theControl, Rect *bounds )
{
GetControlBounds( theControl , bounds ) ;
-#if TARGET_API_MAC_OSX
WindowRef tlwref = GetControlOwner( theControl ) ;
wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl ) ;
OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;
}
-#endif
return bounds ;
}
+size_t UMAPutBytesCFRefCallback( void *info, const void *bytes, size_t count )
+{
+ CFMutableDataRef data = (CFMutableDataRef) info;
+ if ( data )
+ {
+ CFDataAppendBytes( data, (const UInt8*) bytes, count );
+ }
+ return count;
+}
+
+void UMAReleaseCFDataProviderCallback(void *info,
+ const void *WXUNUSED(data),
+ size_t WXUNUSED(count))
+{
+ if ( info )
+ CFRelease( (CFDataRef) info );
+}
+
+void UMAReleaseCFDataConsumerCallback( void *info )
+{
+ if ( info )
+ CFRelease( (CFDataRef) info );
+}
+
+CGDataProviderRef UMACGDataProviderCreateWithCFData( CFDataRef data )
+{
+ if ( data == NULL )
+ return NULL;
+
+ return CGDataProviderCreateWithCFData( data );
+}
+
+CGDataConsumerRef UMACGDataConsumerCreateWithCFData( CFMutableDataRef data )
+{
+ if ( data == NULL )
+ return NULL;
+
+ return CGDataConsumerCreateWithCFData( data );
+}
#endif // wxUSE_GUI
#if wxUSE_BASE
projects / wxWidgets.git / blobdiff