X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..e2ca829e7dc84e32a0949cbd852adf9b59cacd0b:/include/wx/mac/uma.h diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h index 7709e2a12a..188853e6c5 100644 --- a/include/wx/mac/uma.h +++ b/include/wx/mac/uma.h @@ -31,24 +31,18 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() ; // menu manager -void UMASetMenuTitle( MenuRef menu , StringPtr title ) ; +MenuRef UMANewMenu( SInt16 id , const wxString& title ) ; +void UMASetMenuTitle( MenuRef menu , const wxString& title ) ; UInt32 UMAMenuEvent( EventRecord *inEvent ) ; -void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item ) ; -void UMADisableMenuItem( MenuRef inMenu , MenuItemIndex item ) ; -void UMAAppendSubMenuItem( MenuRef menu , StringPtr label , SInt16 submenuid ) ; -void UMAInsertSubMenuItem( MenuRef menu , StringPtr label , MenuItemIndex item , SInt16 submenuid ) ; -void UMAAppendMenuItem( MenuRef menu , StringPtr label , SInt16 key= 0, UInt8 modifiers = 0 ) ; -void UMAInsertMenuItem( MenuRef menu , StringPtr label , MenuItemIndex item , SInt16 key = 0 , UInt8 modifiers = 0 ) ; -// void UMASetMenuItemText( MenuRef menu , MenuItemIndex item , StringPtr label ) ; +void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ; -// MenuRef ::NewMenu( SInt16 menuid , StringPtr label ) ; -// void UMADisposeMenu( MenuRef menu ) ; +void UMAAppendSubMenuItem( MenuRef menu , const wxString& title , SInt16 submenuid ) ; +void UMAInsertSubMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , SInt16 submenuid ) ; +void UMAAppendMenuItem( MenuRef menu , const wxString& title , wxAcceleratorEntry *entry = NULL ) ; +void UMAInsertMenuItem( MenuRef menu , const wxString& title , MenuItemIndex item , wxAcceleratorEntry *entry = NULL ) ; +void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) ; -// handling the menubar - -// void UMADeleteMenu( SInt16 menuId ) ; -// void UMAInsertMenu( MenuRef insertMenu , SInt16 afterId ) ; -// void UMADrawMenuBar() ; +void UMASetMenuItemText( MenuRef menu, MenuItemIndex item, const wxString& title ) ; // quickdraw @@ -66,13 +60,7 @@ void UMASetWTitleC( WindowRef inWindowRef , const char *title ) ; void UMAGetWTitleC( WindowRef inWindowRef , char *title ) ; void UMADrawGrowIcon( WindowRef inWindowRef ) ; -//void UMAShowWindow( WindowRef inWindowRef ) ; -//void UMAHideWindow( WindowRef inWindowRef ) ; void UMAShowHide( WindowRef inWindowRef , Boolean show) ; -//void UMASelectWindow( WindowRef inWindowRef ) ; -//void UMABringToFront( WindowRef inWindowRef ) ; -//void UMASendBehind( WindowRef inWindowRef , WindowRef behindWindow ) ; -// void UMACloseWindow(WindowRef inWindowRef) ; // appearance manager @@ -82,128 +70,30 @@ void UMAEnableControl( ControlHandle inControl ) ; void UMADisableControl( ControlHandle inControl ) ; void UMAActivateControl( ControlHandle inControl ) ; void UMADeactivateControl( ControlHandle inControl ) ; -//void UMAApplyThemeBackground (ThemeBackgroundKind inKind, -// const Rect * bounds, -// ThemeDrawState inState, -// SInt16 inDepth, -// Boolean inColorDev); -//void UMASetThemeWindowBackground (WindowRef inWindow, -// ThemeBrush inBrush, -// Boolean inUpdate) ; -/* -ControlHandle ::NewControl(WindowPtr owningWindow, - const Rect * boundsRect, - ConstStr255Param controlTitle, - Boolean initiallyVisible, - SInt16 initialValue, - SInt16 minimumValue, - SInt16 maximumValue, - SInt16 procID, - SInt32 controlReference) ; -*/ -//void UMADisposeControl (ControlHandle theControl) ; -//void UMAHiliteControl (ControlHandle theControl, // ControlPartCode hiliteState) ; void UMAShowControl (ControlHandle theControl) ; void UMAHideControl (ControlHandle theControl); -//void UMASetControlVisibility (ControlHandle inControl, -// Boolean inIsVisible, -// Boolean inDoDraw); - -//bool UMAIsControlActive (ControlHandle inControl); -//bool UMAIsControlVisible (ControlHandle inControl); void UMAActivateControl (ControlHandle inControl); void UMADeactivateControl (ControlHandle inControl); -//OSErr UMAGetBestControlRect (ControlHandle inControl, -// Rect * outRect, -// SInt16 * outBaseLineOffset); -//OSErr UMASetControlFontStyle (ControlHandle inControl, -// const ControlFontStyleRec * inStyle) ; - - void UMAMoveControl( ControlHandle inControl , short x , short y ) ; void UMASizeControl( ControlHandle inControl , short x , short y ) ; // control hierarchy -//OSErr UMACreateRootControl (WindowPtr inWindow, -// ControlHandle * outControl) ; - -//OSErr UMAEmbedControl (ControlHandle inControl, -// ControlHandle inContainer); - // keyboard focus OSErr UMASetKeyboardFocus (WindowPtr inWindow, ControlHandle inControl, ControlFocusPart inPart) ; - // events -//ControlPartCode UMAHandleControlClick (ControlHandle inControl, -// Point inWhere, -// SInt16 inModifiers, -// ControlActionUPP inAction) ; -//SInt16 UMAHandleControlKey (ControlHandle inControl, -// SInt16 inKeyCode, -// SInt16 inCharCode, -// SInt16 inModifiers); - -//void UMAIdleControls (WindowPtr inWindow) ; - void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) ; OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) ; // handling control data -/* -OSErr ::SetControlData (ControlHandle inControl, - ControlPartCode inPart, - ResType inTagName, - Size inSize, - Ptr inData) ; - -OSErr ::GetControlData (ControlHandle inControl, - ControlPartCode inPart, - ResType inTagName, - Size inBufferSize, - Ptr outBuffer, - Size * outActualSize) ; -OSErr ::GetControlDataSize (ControlHandle inControl, - ControlPartCode inPart, - ResType inTagName, - Size * outMaxSize); - - -// system 8.0 - -short UMAFindWindow( Point inPoint , WindowRef *outWindow ) ; -OSStatus UMAGetWindowFeatures( WindowRef inWindowRef , UInt32 *outFeatures ) ; -OSStatus UMAGetWindowRegion( WindowRef inWindowRef , WindowRegionCode inRegionCode , RgnHandle ioWinRgn ) ; -OSStatus UMACollapseWindow( WindowRef inWindowRef , Boolean inCollapseIt ) ; -OSStatus UMACollapseAllWindows( Boolean inCollapseEm ) ; -Boolean UMAIsWindowCollapsed( WindowRef inWindowRef ) ; -Boolean UMAIsWindowCollapsable( WindowRef inWindowRef ) ; - -// system 8.5 - -OSStatus UMACreateNewWindow( WindowClass windowClass , WindowAttributes attributes , const Rect *bounds, WindowRef *outWindow ) ; -OSStatus UMAGetWindowClass( WindowRef inWindowRef , WindowClass *outWindowClass ) ; -OSStatus UMAGetWindowAttributes( WindowRef inWindowRef , WindowAttributes *outAttributes ) ; - -void UMAShowFloatingWindows() ; -void UMAHideFloatingWindows() ; -Boolean UMAAreFloatingWindowsVisible() ; -WindowRef UMAFrontWindow() ; -WindowRef UMAFrontNonFloatingWindow() ; - -// floaters support -*/ bool UMAIsWindowFloating( WindowRef inWindow ) ; bool UMAIsWindowModal( WindowRef inWindow ) ; -/* -WindowRef UMAGetActiveWindow() ; -WindowRef UMAGetActiveNonFloatingWindow() ; -*/ + void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ; OSStatus UMAGetHelpMenu( @@ -218,40 +108,11 @@ OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ; #if !TARGET_CARBON #define ClearCurrentScrap() ZeroScrap() ; -/* -#define GetPortTextFont( p) ((p)->txFont ) -#define GetPortTextSize( p) ((p)->txSize ) -#define GetPortTextFace( p) ((p)->txFace ) -#define GetPortTextMode( p) ((p)->txMode ) -#define GetRegionBounds( r , b) ((*b) = (**r).rgnBBox) -#define GetPortBounds( p , b) ((*b) = p->portRect ) -#define GetWindowPortBounds( p , b) ((*b) = p->portRect ) -#define GetPortVisibleRegion( p, r ) CopyRgn( p->visRgn , r ) -#define GetQDGlobalsWhite( a ) (&((*a) = qd.white)) -#define GetQDGlobalsBlack( a ) (&((*a) = qd.black)) -#define GetQDGlobalsScreenBits( a ) ((*a) = qd.screenBits) -#define GetQDGlobalsArrow( a ) (&((*a) = qd.arrow)) -#define GetControlBounds( c , b ) &((*b) = (**c).contrlRect ) -#define GetPortBitMapForCopyBits( p ) ((BitMap*) &(((CGrafPtr)p)->portPixMap )) -#define GetControlOwner( control ) ((**control).contrlOwner) - -#define GetPortPenMode( p ) (p->pnMode) -#define SetPortPenMode( p , mode ) (p->pnMode = mode ) -// control manager - -#define GetControlReference( control ) ((**control).contrlRfCon) - -// list manager - -#define SetListSelectionFlags( list , options ) (**list).selFlags = options -#define GetListRefCon( list ) (**list).refCon -*/ #define GetApplicationScript() smSystemScript #else // calls not in carbon - #endif #define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )