Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-28 10:42:13 +00:00
parent 435a5ad0ee
commit 3e109f6d78
2 changed files with 13 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/wx/mac/carbon/private.h
View File

@@ -92,29 +92,6 @@ private:
CGContextRef m_cg; 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 // app.h
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
@@ -393,17 +370,16 @@ private :
wxMacCFStringHolder m_helpTextRef ; wxMacCFStringHolder m_helpTextRef ;
} ; } ;
/* // Quartz
GWorldPtr wxMacCreateGWorld( int width , int height , int depth );
void wxMacDestroyGWorld( GWorldPtr gw ); WXDLLIMPEXP_CORE void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 );
PicHandle wxMacCreatePict( GWorldPtr gw , GWorldPtr mask = NULL ); WXDLLIMPEXP_CORE void wxMacReleaseBitmapButton( ControlButtonContentInfo*info );
CIconHandle wxMacCreateCIcon(GWorldPtr image , GWorldPtr mask , short dstDepth , short iconSize ); WXDLLIMPEXP_CORE CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap );
void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue );
CTabHandle wxMacCreateColorTable( int numColors ); WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data );
*/ WXDLLIMPEXP_CORE CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data );
void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ); WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf );
void wxMacReleaseBitmapButton( ControlButtonContentInfo*info );
CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap );
#define MAC_WXHBITMAP(a) (GWorldPtr(a)) #define MAC_WXHBITMAP(a) (GWorldPtr(a))
#define MAC_WXHMETAFILE(a) (PicHandle(a)) #define MAC_WXHMETAFILE(a) (PicHandle(a))
@@ -1041,14 +1017,14 @@ public:
// draw the image 'upside down' corrected as HIViewDrawCGImage does // draw the image 'upside down' corrected as HIViewDrawCGImage does
OSStatus WXDLLEXPORT wxMacDrawCGImage( OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
CGContextRef inContext, CGContextRef inContext,
const HIRect * inBounds, const HIRect * inBounds,
CGImageRef inImage) ; CGImageRef inImage) ;
CGColorRef WXDLLEXPORT wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ; CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
CGColorSpaceRef WXDLLEXPORT wxMacGetGenericRGBColorSpace(void); CGColorSpaceRef WXDLLIMPEXP_CORE wxMacGetGenericRGBColorSpace(void);
// toplevel.cpp // toplevel.cpp

29
include/wx/mac/carbon/uma.h
View File

@@ -17,11 +17,6 @@
void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ; void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
long UMAGetSystemVersion() ; long UMAGetSystemVersion() ;
// process manager
long UMAGetProcessMode() ;
bool UMAGetProcessModeDoesActivateOnFGSwitch() ;
#if wxUSE_GUI #if wxUSE_GUI
// menu manager // menu manager
@@ -38,21 +33,6 @@ 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() ;
// 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 // Retrieves the Help menu handle. Warning: As a side-effect this functions also
// creates the Help menu if it didn't exist yet. // creates the Help menu if it didn't exist yet.
OSStatus UMAGetHelpMenu( OSStatus UMAGetHelpMenu(
@@ -64,15 +44,6 @@ OSStatus UMAGetHelpMenuDontCreate(
MenuRef * outHelpMenu, MenuRef * outHelpMenu,
MenuItemIndex * outFirstCustomItemIndex); /* can be NULL */ 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 // wxUSE_GUI
#endif #endif