cleanup, fixing exports

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index f959648aa957fffa36b258e84d4d8c1ec5a681e6..1e66662f2c9c22efa96fd26582902906ea481750 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -12,6 +12,4 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
-class wxMacPortStateHelper;
-
 #endif // _WX_DC_H_

diff --git a/include/wx/mac/carbon/uma.h b/include/wx/mac/carbon/uma.h
index 641b26eb1434facb3959937890ceed94e5356952..0248af2b52aa18c3dbbf30428408a436287b276e 100644 (file)
--- a/include/wx/mac/carbon/uma.h
+++ b/include/wx/mac/carbon/uma.h
@@ -15,12 +15,8 @@
 #include "wx/mac/private.h"
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
-void UMACleanupToolbox() ;
 long UMAGetSystemVersion() ;
 
-WXDLLIMPEXP_BASE bool UMASystemIsInitialized();
-WXDLLIMPEXP_BASE void UMASetSystemIsInitialized(bool val);
-
 // process manager
 
 long UMAGetProcessMode() ;
@@ -32,7 +28,6 @@ bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
 
 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 ) ;
@@ -46,52 +41,16 @@ void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wx
 // quickdraw
 
 void            UMAShowWatchCursor() ;
-void            UMAShowArrowCursor() ;
-
-// window manager
-
-WXDLLIMPEXP_BASE 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( ControlRef inControl ) ;
-
-void             UMAEnableControl( ControlRef inControl ) ;
-void            UMADisableControl( ControlRef inControl ) ;
-void             UMAActivateControl( ControlRef inControl ) ;
-void            UMADeactivateControl( ControlRef inControl ) ;
-//                                 ControlPartCode         hiliteState)    ;
-void UMAShowControl                        (ControlRef             theControl)    ;
-void UMAHideControl                        (ControlRef             theControl);
-void UMAActivateControl                    (ControlRef             inControl);
-void UMADeactivateControl                (ControlRef             inControl);
-void UMASetControlTitle( ControlRef inControl , const wxString& title , wxFontEncoding encoding) ;
-
-void UMAMoveControl( ControlRef inControl , short x , short y ) ;
-void UMASizeControl( ControlRef inControl , short x , short y ) ;
 // control hierarchy
 
 Rect * UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds) ;
 
-// keyboard focus
-OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
-                                 ControlRef             inControl,
-                                 ControlFocusPart         inPart)    ;
-
 // events
 
 void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) ;
 OSErr UMAGetRootControl( WindowPtr inWindow , ControlRef *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
@@ -107,8 +66,6 @@ OSStatus UMAGetHelpMenuDontCreate(
 
 // Appearance Drawing
 
-OSStatus UMADrawThemePlacard( const Rect *inRect , ThemeDrawState inState ) ;
-
 #define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
 
 // Quartz