added wxGrid::UseNativeColHeader() (column reordering doesn't work yet); more wxGrid...

[wxWidgets.git] / include / wx / osx / cocoa / private.h

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 51f7015479ac90c5faca8209482d15fea0f2f7f3..f46aeafa2fe690706768605401b286171d0b5585 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -16,10 +16,16 @@
 
 #include "wx/osx/core/private.h"
 
 
 #include "wx/osx/core/private.h"
 

+#include "wx/defs.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+

 #ifdef __OBJC__
 
     #import <Cocoa/Cocoa.h>
 
 #ifdef __OBJC__
 
     #import <Cocoa/Cocoa.h>
 

+    #if wxUSE_GUI
+

     extern NSRect wxToNSRect( NSView* parent, const wxRect& r );
     extern wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
     extern NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
     extern NSRect wxToNSRect( NSView* parent, const wxRect& r );
     extern wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
     extern NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );


@@ -63,6 +69,8 @@
 
     NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , 
         bool adjustForOrigin = true );
 
     NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , 
         bool adjustForOrigin = true );

+        
+    #endif // wxUSE_GUI

 
 #endif // __OBJC__
 
 
 #endif // __OBJC__
 


@@ -72,15 +80,17 @@
 
 // bring in themeing types without pulling in the headers
 
 
 // bring in themeing types without pulling in the headers
 

+#if wxUSE_GUI

 typedef SInt16 ThemeBrush;
 typedef SInt16 ThemeBrush;

-long UMAGetSystemVersion() ;
-CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
+CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;

 OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;
 OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;

-WX_NSImage  wxOSXCreateNSImageFromCGImage( CGImageRef image );
+WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
+#endif

 
 

+long UMAGetSystemVersion() ;

 WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to );
 WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
 WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
 WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to );
 WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
 WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );


@@ -148,6 +158,9 @@ public :
     void                PulseGauge();
     void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
 
     void                PulseGauge();
     void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
 

+    void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
+
+    void                InstallEventHandler( WXWidget control = NULL );

 protected:
     WXWidget m_osxView;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 protected:
     WXWidget m_osxView;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)