#define MAC_OS_X_VERSION_10_3 1030
#endif
+#ifdef __WXMAC_CARBON__
+#include "wx/mac/corefoundation/cfstring.h"
+#endif
+
#if wxUSE_GUI
#include "wx/window.h"
// filefn.h
WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
-WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
-WXDLLEXPORT void wxMacFilename2FSSpec( const wxChar *path , FSSpec *spec ) ;
-# ifndef __DARWIN__
-// Mac file names are POSIX (Unix style) under Darwin, so these are not needed
-WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
-WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
-WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
-WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
-# endif
+WXDLLEXPORT void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec ) ;
// utils.h
WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
virtual ~wxMacControl()
{
}
- bool Ok() const { return m_controlRef != NULL ; }
+ virtual void Dispose() ;
+
+ bool Ok() const { return GetControlRef() != NULL ; }
+
+ virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
+ virtual ControlRef GetControlRef() const { return m_controlRef ; }
+
+ virtual void SetReference( SInt32 data ) ;
+ /*
void operator= (ControlRef c) { m_controlRef = c ; }
operator ControlRef () { return m_controlRef; }
operator ControlRef * () { return &m_controlRef; }
-
+ */
// accessing data and values
virtual OSStatus SetData( ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData ) ;
virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum ) ;
virtual void SetRange( SInt32 minimum , SInt32 maximum ) ;
+ virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
+ virtual bool HasFocus() const ;
+ virtual bool NeedsFocusRect() const ;
+
// templated helpers
Size GetDataSize( ControlPartCode inPartCode , ResType inTag ) const
virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ) ;
virtual void VisibilityChanged( bool shown ) ;
virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle ) ;
-
+ virtual void SetBackground( const wxBrush &brush ) ;
+ virtual ControlPartCode HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers ) ;
+ void SetActionProc( ControlActionUPP actionProc ) ;
+ void SetViewSize( SInt32 viewSize ) ;
+ SInt32 GetViewSize() const ;
+
+ virtual bool IsVisible() const ;
+ virtual void SetVisibility( bool visible , bool redraw ) ;
+ virtual bool IsEnabled() const ;
+ virtual bool IsActive() const ;
+ virtual void Enable( bool enable ) ;
+
+ // invalidates this control and all children
+ virtual void InvalidateWithChildren() ;
+ virtual void SetDrawingEnabled( bool enable ) ;
+ virtual bool GetNeedsDisplay() const ;
+ virtual void SetNeedsDisplay( bool needsDisplay , RgnHandle where = NULL ) ;
+
+ virtual void ScrollRect( const wxRect &rect , int dx , int dy ) ;
+
+ virtual void GetRect( Rect *r ) ;
+ virtual void SetRect( Rect *r ) ;
+ virtual void GetRectInWindowCoords( Rect *r ) ;
+ virtual void GetBestRect( Rect *r ) ;
+ virtual void SetTitle( const wxString &title ) ;
+ // converts from Toplevel-Content relative to local
+ static void Convert( wxPoint *pt , wxMacControl *convert , wxMacControl *to ) ;
+
+ virtual void GetFeatures( UInt32 *features ) ;
+ virtual OSStatus GetRegion( ControlPartCode partCode , RgnHandle region ) ;
+ virtual OSStatus SetZOrder( bool above , wxMacControl* other ) ;
+ // to be moved into a databrowser subclass
+
+ virtual OSStatus SetSelectionFlags( DataBrowserSelectionFlags ) ;
+ virtual OSStatus AddListViewColumn( DataBrowserListViewColumnDesc *columnDesc,
+ DataBrowserTableViewColumnIndex position ) ;
+ virtual OSStatus AutoSizeListViewColumns() ;
+ virtual OSStatus SetHasScrollBars( bool horiz , bool vert ) ;
+ virtual OSStatus SetTableViewHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle ) ;
+ virtual OSStatus SetListViewHeaderBtnHeight(UInt16 height) ;
+ virtual OSStatus SetCallbacks(const DataBrowserCallbacks * callbacks) ;
+ virtual OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,
+ const DataBrowserItemID* items,
+ DataBrowserPropertyID preSortProperty,
+ DataBrowserPropertyID propertyID ) ;
+ virtual OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
+ const DataBrowserItemID* items,
+ DataBrowserPropertyID preSortProperty ) ;
+ virtual OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,
+ const DataBrowserItemID* items,
+ DataBrowserPropertyID preSortProperty ) ;
+ virtual OSStatus RevealItem( DataBrowserItemID item,
+ DataBrowserPropertyID propertyID,
+ DataBrowserRevealOptions options ) ;
+ virtual OSStatus GetSelectionAnchor( DataBrowserItemID * first, DataBrowserItemID * last ) ;
+ virtual bool IsItemSelected( DataBrowserItemID item ) ;
+ virtual OSStatus SetSelectedItems(UInt32 numItems,
+ const DataBrowserItemID * items,
+ DataBrowserSetOption operation ) ;
+
+ // to be moved into a tab control class
+
+ virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;
protected :
ControlRef m_controlRef ;
wxFont m_font ;
void wxMacStringToPascal( const wxString&from , StringPtr to ) ;
wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
-void wxMacConvertNewlines13To10( char * data ) ;
-void wxMacConvertNewlines10To13( char * data ) ;
-void wxMacConvertNewlines13To10( wxString *data ) ;
-void wxMacConvertNewlines10To13( wxString *data ) ;
-
-#if wxUSE_UNICODE
-void wxMacConvertNewlines13To10( wxChar * data ) ;
-void wxMacConvertNewlines10To13( wxChar * data ) ;
-#endif
-
-#if TARGET_CARBON
-
-class wxMacCFStringHolder
-{
-public:
- wxMacCFStringHolder()
- {
- m_cfs = NULL ;
- m_release = false ;
- }
-
- wxMacCFStringHolder(const wxString &str , wxFontEncoding encoding )
- {
- m_cfs = NULL ;
- m_release = false ;
- Assign( str , encoding ) ;
- }
-
- wxMacCFStringHolder(CFStringRef ref , bool release = true )
- {
- m_cfs = ref ;
- m_release = release ;
- }
-
- ~wxMacCFStringHolder()
- {
- Release() ;
- }
-
- CFStringRef Detach()
- {
- CFStringRef retval = m_cfs ;
- m_release = false ;
- m_cfs = NULL ;
- return retval ;
- }
-
- void Release()
- {
- if ( m_release && m_cfs)
- CFRelease( m_cfs ) ;
- m_cfs = NULL ;
- }
-
- void Assign( const wxString &str , wxFontEncoding encoding ) ;
-
- operator CFStringRef () { return m_cfs; }
- wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
-
-private:
-
- CFStringRef m_cfs;
- bool m_release ;
-} ;
-
-#endif
-
-// utils.cpp
-
-wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
-wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
-void wxMacWakeUp() ;
-
// toplevel.cpp
ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;
+// filefn.cpp
+
+wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ) ;
+OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ) ;
+wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ) ;
+
#endif
// _WX_PRIVATE_H_