Update from Hartwig for OS X implementation

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

diff --git a/include/wx/mac/uma.h b/include/wx/mac/uma.h
index 676c3736d129a5186d3cb68d9eb4ce1ba011fdc1..16995b9c475fbc79c52cfef68ff865ab2ad71c7f 100644 (file)
--- a/include/wx/mac/uma.h
+++ b/include/wx/mac/uma.h
@@ -1,123 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        uma.h
-// Purpose:     Universal MacOS API
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     03/02/99
-// RCS-ID:      $Id: 
-// Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef H_UMA
-#define H_UMA
-
-#include "wx/mac/private.h"
-
-void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
-void UMACleanupToolbox() ;
-long UMAGetSystemVersion() ;
-bool UMAHasAppearance() ;
-long UMAGetAppearanceVersion() ;
-bool UMAHasWindowManager() ;
-long UMAGetWindowManagerAttr() ;
-bool UMAHasAquaLayout() ;
-bool UMASystemIsInitialized() ;
-
-// process manager
-
-long UMAGetProcessMode() ;
-bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
-
-// menu manager
-
-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() ;
-
-OSStatus               UMAPrOpen(void *macPrintSession) ;
-OSStatus               UMAPrClose(void *macPrintSession) ;
-
-// window manager
-
-GrafPtr                UMAGetWindowPort( WindowRef inWindowRef ) ;
-void                   UMADisposeWindow( WindowRef inWindowRef ) ;
-void                   UMASetWTitleC( WindowRef inWindowRef , const char *title ) ;
-void                   UMAGetWTitleC( WindowRef inWindowRef , char *title ) ;
-
-void                   UMADrawGrowIcon( WindowRef inWindowRef ) ;
-void                   UMAShowHide( WindowRef inWindowRef , Boolean show) ;
-
-// appearance manager
-
-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 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) ;
-
-// events
-
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) ;
-OSErr UMAGetRootControl( WindowPtr inWindow , ControlHandle *outControl ) ;
-
-// handling control data
-bool                   UMAIsWindowFloating( WindowRef inWindow ) ;
-bool                   UMAIsWindowModal( WindowRef inWindow ) ;
-
-void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
-
-OSStatus UMAGetHelpMenu(
-  MenuRef *        outHelpMenu,
-  MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */
-
-// Appearance Drawing
-
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
-
-// Clipboard support
-
-OSStatus UMAPutScrap( Size size , OSType type , void *data ) ;
-
-// accessor helpers
-
-#if !TARGET_CARBON
-#define ClearCurrentScrap() ZeroScrap() ;
-#define GetApplicationScript() smSystemScript
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/uma.h"
 #else
-
-// calls not in carbon
-
-#endif
-#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn ) 
-
+#include "wx/mac/carbon/uma.h"
 #endif