projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent the parent window from losing activation when a popup is shown
[wxWidgets.git]
/
include
/
wx
/
mac
/
uma.h
diff --git
a/include/wx/mac/uma.h
b/include/wx/mac/uma.h
index c0260916c9a2df26b43d73139d30582df1bb8f1d..c9172b6c8a857ce36aba8604a23587ac1d34510e 100644
(file)
--- a/
include/wx/mac/uma.h
+++ b/
include/wx/mac/uma.h
@@
-12,16
+12,7
@@
#ifndef H_UMA
#define H_UMA
#ifndef H_UMA
#define H_UMA
-#if defined(__POWERPC__)
- #if defined(__DARWIN__)
- #include <Carbon/Carbon.h>
- #endif
-#endif
-
-#if !TARGET_CARBON
-// this is now defined in the latest headers
-// typedef short MenuItemIndex ;
-#endif
+#include "wx/mac/private.h"
void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
void UMACleanupToolbox() ;
void UMAInitToolbox( UInt16 inMoreMastersCalls) ;
void UMACleanupToolbox() ;
@@
-29,6
+20,8
@@
bool UMAHasAppearance() ;
long UMAGetAppearanceVersion() ;
bool UMAHasWindowManager() ;
long UMAGetWindowManagerAttr() ;
long UMAGetAppearanceVersion() ;
bool UMAHasWindowManager() ;
long UMAGetWindowManagerAttr() ;
+bool UMAHasAquaLayout() ;
+bool UMASystemIsInitialized() ;
// process manager
// process manager
@@
-61,13
+54,8
@@
void UMAInsertMenuItem( MenuRef menu , StringPtr label , MenuItemIndex item ,
void UMAShowWatchCursor() ;
void UMAShowArrowCursor() ;
void UMAShowWatchCursor() ;
void UMAShowArrowCursor() ;
-#if TARGET_CARBON && PM_USE_SESSION_APIS
-OSStatus UMAPrOpen(PMPrintSession *macPrintSession) ;
-OSStatus UMAPrClose(PMPrintSession *macPrintSession) ;
-#else
-OSStatus UMAPrOpen() ;
-OSStatus UMAPrClose() ;
-#endif
+OSStatus UMAPrOpen(void *macPrintSession) ;
+OSStatus UMAPrClose(void *macPrintSession) ;
// window manager
// window manager
@@
-116,7
+104,7
@@
ControlHandle ::NewControl(WindowPtr owningWindow,
//void UMAHiliteControl (ControlHandle theControl,
// ControlPartCode hiliteState) ;
void UMAShowControl (ControlHandle theControl) ;
//void UMAHiliteControl (ControlHandle theControl,
// ControlPartCode hiliteState) ;
void UMAShowControl (ControlHandle theControl) ;
-
//void UMAHideControl
(ControlHandle theControl);
+
void UMAHideControl
(ControlHandle theControl);
//void UMASetControlVisibility (ControlHandle inControl,
// Boolean inIsVisible,
// Boolean inDoDraw);
//void UMASetControlVisibility (ControlHandle inControl,
// Boolean inIsVisible,
// Boolean inDoDraw);
@@
-217,7
+205,19
@@
WindowRef UMAGetActiveNonFloatingWindow() ;
*/
void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
*/
void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
+OSStatus UMAGetHelpMenu(
+ MenuRef * outHelpMenu,
+ MenuItemIndex * outFirstCustomItemIndex); /* can be NULL */
+
+// Appearance Drawing
+
+OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
+
+// accessor helpers
+
#if !TARGET_CARBON
#if !TARGET_CARBON
+#define ClearCurrentScrap() ZeroScrap() ;
+/*
#define GetPortTextFont( p) ((p)->txFont )
#define GetPortTextSize( p) ((p)->txSize )
#define GetPortTextFace( p) ((p)->txFace )
#define GetPortTextFont( p) ((p)->txFont )
#define GetPortTextSize( p) ((p)->txSize )
#define GetPortTextFace( p) ((p)->txFace )
@@
-233,7
+233,7
@@
void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
#define GetControlBounds( c , b ) &((*b) = (**c).contrlRect )
#define GetPortBitMapForCopyBits( p ) ((BitMap*) &(((CGrafPtr)p)->portPixMap ))
#define GetControlOwner( control ) ((**control).contrlOwner)
#define GetControlBounds( c , b ) &((*b) = (**c).contrlRect )
#define GetPortBitMapForCopyBits( p ) ((BitMap*) &(((CGrafPtr)p)->portPixMap ))
#define GetControlOwner( control ) ((**control).contrlOwner)
-#define InvalWindowRgn( window , rgn ) InvalRgn( rgn )
+
#define GetPortPenMode( p ) (p->pnMode)
#define SetPortPenMode( p , mode ) (p->pnMode = mode )
// control manager
#define GetPortPenMode( p ) (p->pnMode)
#define SetPortPenMode( p , mode ) (p->pnMode = mode )
// control manager
@@
-244,13
+244,14
@@
void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate ) ;
#define SetListSelectionFlags( list , options ) (**list).selFlags = options
#define GetListRefCon( list ) (**list).refCon
#define SetListSelectionFlags( list , options ) (**list).selFlags = options
#define GetListRefCon( list ) (**list).refCon
+*/
+#define GetApplicationScript() smSystemScript
+#else
+
+// calls not in carbon
+
#endif
#endif
-#if TARGET_CARBON
#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
-#endif
-// Appearance Drawing
-
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
#endif
#endif