X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67e3d9d399e1f713a606b30d49f437f85a684dde..5c2e93769956ec4a3ff1c6f02f8c2b492a13febd:/include/wx/mac/uma.h

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 9ddcec5636..2587f1b2c1 100644
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -6,7 +6,7 @@
 // Created:     03/02/99
 // RCS-ID:      $Id: 
 // Copyright:   (c) Stefan Csomor
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef H_UMA
@@ -31,55 +31,62 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
 
 // menu manager
 
-void 			UMASetMenuTitle( MenuRef menu , StringPtr 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 ) ;
+MenuRef         UMANewMenu( SInt16 id , const wxString& title ) ;
+void             UMASetMenuTitle( MenuRef menu , const wxString& title ) ;
+UInt32             UMAMenuEvent( EventRecord *inEvent ) ;
+void             UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ;
+
+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 ) ;
+
+void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title ) ;
 
 // quickdraw
 
-void			UMAShowWatchCursor() ;
-void			UMAShowArrowCursor() ;
+void            UMAShowWatchCursor() ;
+void            UMAShowArrowCursor() ;
 
-OSStatus		UMAPrOpen(void *macPrintSession) ;
-OSStatus		UMAPrClose(void *macPrintSession) ;
+#if !TARGET_CARBON
+OSStatus        UMAPrOpen() ;
+OSStatus        UMAPrClose() ;
+#endif
 
 // window manager
 
-GrafPtr		UMAGetWindowPort( WindowRef inWindowRef ) ;
-void		 	UMADisposeWindow( WindowRef inWindowRef ) ;
-void 			UMASetWTitleC( WindowRef inWindowRef , const char *title ) ;
-void 			UMAGetWTitleC( WindowRef inWindowRef , char *title ) ;
+GrafPtr        UMAGetWindowPort( WindowRef inWindowRef ) ;
+void             UMADisposeWindow( WindowRef inWindowRef ) ;
+void             UMASetWTitle( WindowRef inWindowRef , const wxString& title ) ;
+void             UMAGetWTitleC( WindowRef inWindowRef , char *title ) ;
 
-void 			UMADrawGrowIcon( WindowRef inWindowRef ) ;
-void			UMAShowHide( WindowRef inWindowRef , Boolean show) ;
+void             UMADrawGrowIcon( WindowRef inWindowRef ) ;
+void            UMAShowHide( WindowRef inWindowRef , Boolean show) ;
 
 // appearance manager
 
-void 			UMADrawControl( ControlHandle inControl ) ;
+void             UMADrawControl( ControlHandle inControl ) ;
 
-void 			UMAEnableControl( ControlHandle inControl ) ;
-void			UMADisableControl( ControlHandle inControl ) ;
-void 			UMAActivateControl( ControlHandle inControl ) ;
-void			UMADeactivateControl( ControlHandle inControl ) ;
-//								 ControlPartCode 		hiliteState)	;
-void UMAShowControl						(ControlHandle 			theControl)	;
-void UMAHideControl						(ControlHandle 			theControl);
-void UMAActivateControl					(ControlHandle 			inControl);
-void UMADeactivateControl				(ControlHandle 			inControl);
+void             UMAEnableControl( ControlHandle inControl ) ;
+void            UMADisableControl( ControlHandle inControl ) ;
+void             UMAActivateControl( ControlHandle inControl ) ;
+void            UMADeactivateControl( ControlHandle inControl ) ;
+//                                 ControlPartCode         hiliteState)    ;
+void UMAShowControl                        (ControlHandle             theControl)    ;
+void UMAHideControl                        (ControlHandle             theControl);
+void UMAActivateControl                    (ControlHandle             inControl);
+void UMADeactivateControl                (ControlHandle             inControl);
+void UMASetControlTitle( ControlHandle inControl , const wxString& title ) ;
 
 void UMAMoveControl( ControlHandle inControl , short x , short y ) ;
 void UMASizeControl( ControlHandle inControl , short x , short y ) ;
 // control hierarchy
 
 // keyboard focus
-OSErr UMASetKeyboardFocus				(WindowPtr 				inWindow,
-								 ControlHandle 			inControl,
-								 ControlFocusPart 		inPart)	;
+OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
+                                 ControlHandle             inControl,
+                                 ControlFocusPart         inPart)    ;
 
 // events
 
@@ -87,8 +94,8 @@ void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) ;
 OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) ;
 
 // handling control data
-bool			UMAIsWindowFloating( WindowRef inWindow ) ;
-bool			UMAIsWindowModal( WindowRef inWindow ) ;
+bool            UMAIsWindowFloating( WindowRef inWindow ) ;
+bool            UMAIsWindowModal( WindowRef inWindow ) ;
 
 void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
 
@@ -100,6 +107,10 @@ OSStatus UMAGetHelpMenu(
 
 OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
 
+// Clipboard support
+
+OSStatus UMAPutScrap( Size size , OSType type , void *data ) ;
+
 // accessor helpers
 
 #if !TARGET_CARBON