Clear columns on destruction

[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 c862427f62eced2c0f6d845c64b74317d12230d2..78a34d3fa318adb6d63feb02875f319d18f4a660 100644 (file)
--- a/include/wx/mac/carbon/uma.h
+++ b/include/wx/mac/carbon/uma.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        uma.h
+// Name:        wx/mac/carbon/uma.h

 // Purpose:     Universal MacOS API
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99
 // Purpose:     Universal MacOS API
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     03/02/99

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -15,21 +15,7 @@
 #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 UMAHasAppearance() ;
-long UMAGetAppearanceVersion() ;
-bool UMAHasWindowManager() ;
-long UMAGetWindowManagerAttr() ;
-bool UMAHasAquaLayout() ;
-
-bool UMASystemIsInitialized() ;
-void UMASetSystemIsInitialized(bool val);
-
-// process manager
-
-long UMAGetProcessMode() ;
-bool UMAGetProcessModeDoesActivateOnFGSwitch() ;

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 


@@ -37,7 +23,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 ) ;


@@ -48,83 +33,16 @@ void             UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxA
 
 void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title , wxFontEncoding encoding ) ;
 
 
 void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title , wxFontEncoding encoding ) ;
 

-// quickdraw
-
-void            UMAShowWatchCursor() ;
-void            UMAShowArrowCursor() ;
-
-#if !TARGET_CARBON
-OSStatus        UMAPrOpen() ;
-OSStatus        UMAPrClose() ;
-#endif
-
-// 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( 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 , wxFontEncoding encoding) ;
-
-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 ) ;
-
+// Retrieves the Help menu handle. Warning: As a side-effect this functions also
+// creates the Help menu if it didn't exist yet.

 OSStatus UMAGetHelpMenu(
   MenuRef *        outHelpMenu,
   MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */
 
 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
-#else
-
-// calls not in carbon
-
-#endif
-#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
+// Same as UMAGetHelpMenu, but doesn't create the Help menu if UMAGetHelpMenu hasn't been called yet.
+OSStatus UMAGetHelpMenuDontCreate(
+  MenuRef *        outHelpMenu,
+  MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */

 
 #endif // wxUSE_GUI
 
 
 #endif // wxUSE_GUI