cleanup

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

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 314b3a1c85c7f570d7fa0be55156e053c6e1e1b7..f053c3fe774fe1c64fde5ddd7d33cad05d9c924d 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -92,29 +92,6 @@ private:
     CGContextRef m_cg;
 };
 
-/*
-class wxMacDrawingHelper
-{
-    DECLARE_NO_COPY_CLASS(wxMacDrawingHelper)
-
-public:
-    wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
-    ~wxMacDrawingHelper();
-    bool Ok() const { return IsOk(); }
-    bool IsOk() { return m_ok; }
-    void LocalToWindow( Rect *rect) { OffsetRect( rect , m_origin.h , m_origin.v ); }
-    void LocalToWindow( Point *pt ) { AddPt( m_origin , pt ); }
-    void LocalToWindow( RgnHandle rgn ) { OffsetRgn( rgn , m_origin.h , m_origin.v ); }
-    const Point& GetOrigin() { return m_origin; }
-private:
-    Point     m_origin;
-    GrafPtr   m_formerPort;
-    GrafPtr   m_currentPort;
-    PenState  m_savedPenState;
-    bool      m_ok;
-};
-*/
-
 // app.h
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
@@ -393,17 +370,16 @@ private :
     wxMacCFStringHolder m_helpTextRef ;
 } ;
 
-/*
-GWorldPtr         wxMacCreateGWorld( int width , int height , int depth );
-void                 wxMacDestroyGWorld( GWorldPtr gw );
-PicHandle         wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL );
-CIconHandle     wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize  );
-void                 wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green ,  int blue );
-CTabHandle         wxMacCreateColorTable( int numColors );
-*/
-void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 );
-void wxMacReleaseBitmapButton( ControlButtonContentInfo*info );
-CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap );
+// Quartz 
+
+WXDLLIMPEXP_CORE void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 );
+WXDLLIMPEXP_CORE void wxMacReleaseBitmapButton( ControlButtonContentInfo*info );
+WXDLLIMPEXP_CORE CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap );
+
+WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data );
+WXDLLIMPEXP_CORE CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data );
+WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf );
+
 
 #define MAC_WXHBITMAP(a) (GWorldPtr(a))
 #define MAC_WXHMETAFILE(a) (PicHandle(a))
@@ -1041,14 +1017,14 @@ public:
 
 // draw the image 'upside down' corrected as HIViewDrawCGImage does
 
-OSStatus WXDLLEXPORT wxMacDrawCGImage(
+OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                CGContextRef    inContext,
                                const HIRect *  inBounds,
                                CGImageRef      inImage) ;
 
-CGColorRef WXDLLEXPORT wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
+CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
 
-CGColorSpaceRef WXDLLEXPORT wxMacGetGenericRGBColorSpace(void);
+CGColorSpaceRef WXDLLIMPEXP_CORE wxMacGetGenericRGBColorSpace(void);
 
 // toplevel.cpp
 

diff --git a/include/wx/mac/carbon/uma.h b/include/wx/mac/carbon/uma.h
index 0248af2b52aa18c3dbbf30428408a436287b276e..78a34d3fa318adb6d63feb02875f319d18f4a660 100644 (file)
--- a/include/wx/mac/carbon/uma.h
+++ b/include/wx/mac/carbon/uma.h
@@ -17,11 +17,6 @@
 void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
 long UMAGetSystemVersion() ;
 
-// process manager
-
-long UMAGetProcessMode() ;
-bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
-
 #if wxUSE_GUI
 
 // menu manager
@@ -38,21 +33,6 @@ void             UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxA
 
 void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title , wxFontEncoding encoding ) ;
 
-// quickdraw
-
-void            UMAShowWatchCursor() ;
-
-// control hierarchy
-
-Rect * UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds) ;
-
-// events
-
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn ) ;
-OSErr UMAGetRootControl( WindowPtr inWindow , ControlRef *outControl ) ;
-
-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(
@@ -64,15 +44,6 @@ OSStatus UMAGetHelpMenuDontCreate(
   MenuRef *        outHelpMenu,
   MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */
 
-// Appearance Drawing
-
-#define GetWindowUpdateRgn( inWindow , updateRgn ) GetWindowRegion( inWindow , kWindowUpdateRgn, updateRgn )
-
-// Quartz 
-
-CGDataProviderRef UMACGDataProviderCreateWithCFData( CFDataRef data );
-CGDataConsumerRef UMACGDataConsumerCreateWithCFData( CFMutableDataRef data );
-
 #endif // wxUSE_GUI
 
 #endif