Solaris /usr/bin/tr requires [] around character ranges

[wxWidgets.git] / include / wx / mac / carbon / uma.h

diff --git a/include/wx/mac/carbon/uma.h b/include/wx/mac/carbon/uma.h
index 3d12a552cd8871e1d415ca8e1c05782efbea954e..0248af2b52aa18c3dbbf30428408a436287b276e 100644 (file)
--- a/include/wx/mac/carbon/uma.h
+++ b/include/wx/mac/carbon/uma.h
@@ -15,12 +15,8 @@
 #include "wx/mac/private.h"
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
 #include "wx/mac/private.h"
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;

-void UMACleanupToolbox() ;

 long UMAGetSystemVersion() ;
 
 long UMAGetSystemVersion() ;
 

-bool UMASystemIsInitialized() ;
-void UMASetSystemIsInitialized(bool val);
-

 // process manager
 
 long UMAGetProcessMode() ;
 // process manager
 
 long UMAGetProcessMode() ;


@@ -32,7 +28,6 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
 
 MenuRef         UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding) ;
 void             UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding) ;
 
 MenuRef         UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding) ;
 void             UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding) ;

-UInt32             UMAMenuEvent( EventRecord *inEvent ) ;

 void             UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ;
 
 void            UMAAppendSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , SInt16 submenuid ) ;
 void             UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ;
 
 void            UMAAppendSubMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , SInt16 submenuid ) ;


@@ -46,52 +41,16 @@ void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wx
 // quickdraw
 
 void            UMAShowWatchCursor() ;
 // quickdraw
 
 void            UMAShowWatchCursor() ;

-void            UMAShowArrowCursor() ;
-
-// window manager
-
-GrafPtr        UMAGetWindowPort( WindowRef inWindowRef ) ;
-void             UMADisposeWindow( WindowRef inWindowRef ) ;
-void             UMASetWTitle( WindowRef inWindowRef , const wxString& title , wxFontEncoding encoding) ;
-
-void             UMADrawGrowIcon( WindowRef inWindowRef ) ;
-void            UMAShowHide( WindowRef inWindowRef , Boolean show) ;
-
-// appearance manager
-
-void             UMADrawControl( ControlRef inControl ) ;

 
 

-void             UMAEnableControl( ControlRef inControl ) ;
-void            UMADisableControl( ControlRef inControl ) ;
-void             UMAActivateControl( ControlRef inControl ) ;
-void            UMADeactivateControl( ControlRef inControl ) ;
-//                                 ControlPartCode         hiliteState)    ;
-void UMAShowControl                        (ControlRef             theControl)    ;
-void UMAHideControl                        (ControlRef             theControl);
-void UMAActivateControl                    (ControlRef             inControl);
-void UMADeactivateControl                (ControlRef             inControl);
-void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding) ;
-
-void UMAMoveControl( ControlRef inControl , short x , short y ) ;
-void UMASizeControl( ControlRef inControl , short x , short y ) ;

 // control hierarchy
 
 Rect * UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds) ;
 
 // control hierarchy
 
 Rect * UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds) ;
 

-// keyboard focus
-OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
-                                 ControlRef             inControl,
-                                 ControlFocusPart         inPart)    ;
-

 // events
 
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) ;
 OSErr UMAGetRootControl( WindowPtr inWindow , ControlRef *outControl ) ;
 
 // events
 
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) ;
 OSErr UMAGetRootControl( WindowPtr inWindow , ControlRef *outControl ) ;
 

-// handling control data
-bool            UMAIsWindowFloating( WindowRef inWindow ) ;
-bool            UMAIsWindowModal( WindowRef inWindow ) ;
-

 void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 
 // Retrieves the Help menu handle. Warning: As a side-effect this functions also
 void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 
 // Retrieves the Help menu handle. Warning: As a side-effect this functions also


@@ -107,13 +66,12 @@ OSStatus UMAGetHelpMenuDontCreate(
 
 // Appearance Drawing
 
 
 // Appearance Drawing
 

-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
-
-// Clipboard support
+#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )

 
 

-OSStatus UMAPutScrap( Size size , OSType type , void *data ) ;
+// Quartz 

 
 

-#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
+CGDataProviderRef UMACGDataProviderCreateWithCFData( CFDataRef data );
+CGDataConsumerRef UMACGDataConsumerCreateWithCFData( CFMutableDataRef data );

 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI