#define MAC_OS_X_VERSION_10_4 1040
#endif
+#ifndef MAC_OS_X_VERSION_10_5
+ #define MAC_OS_X_VERSION_10_5 1050
+#endif
+
#ifdef __WXMAC_CARBON__
#include "wx/mac/corefoundation/cfstring.h"
#endif
}
#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+typedef UInt32 URefCon;
+typedef SInt32 SRefCon;
+#endif
+
#if wxUSE_GUI
#include "wx/listbox.h"
+#ifndef __LP64__
+
class wxMacPortStateHelper
{
DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)
GrafPtr m_newPort;
ThemeDrawingState m_themeDrawingState;
};
+#endif
#if wxMAC_USE_CORE_GRAPHICS
class WXDLLEXPORT wxMacCGContextStateSaver
public:
wxMacDrawingHelper( wxWindowMac * theWindow , bool clientArea = false );
~wxMacDrawingHelper();
- bool Ok() { return m_ok; }
+ 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 ); }
#endif // wxUSE_GUI
// filefn.h
-WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec );
-WXDLLEXPORT void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec );
+WXDLLIMPEXP_BASE wxString wxMacFSSpec2MacFilename( const FSSpec *spec );
+WXDLLIMPEXP_BASE void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec );
// utils.h
-WXDLLEXPORT wxString wxMacFindFolderNoSeparator(short vRefNum,
- OSType folderType,
- Boolean createFolder);
-WXDLLEXPORT wxString wxMacFindFolder(short vRefNum,
- OSType folderType,
- Boolean createFolder);
+WXDLLIMPEXP_BASE wxString wxMacFindFolderNoSeparator(short vRefNum,
+ OSType folderType,
+ Boolean createFolder);
+WXDLLIMPEXP_BASE wxString wxMacFindFolder(short vRefNum,
+ OSType folderType,
+ Boolean createFolder);
template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ); return 0; }
template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle; }
ControlActionUPP GetwxMacLiveScrollbarActionProc();
-class wxMacControl
+class wxMacControl : public wxObject
{
public :
wxMacControl( wxWindow* peer , bool isRootControl = false );
wxMacControl( wxWindow* peer , ControlRef control );
wxMacControl( wxWindow* peer , WXWidget control );
+ wxMacControl() ;
virtual ~wxMacControl();
void Init();
virtual void Dispose();
- bool Ok() const { return GetControlRef() != NULL; }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return GetControlRef() != NULL; }
void SetReferenceInNativeControl();
static wxMacControl* GetReferenceFromNativeControl(ControlRef control);
virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
virtual ControlRef GetControlRef() const { return m_controlRef; }
- virtual void SetReference( SInt32 data );
+ virtual void SetReference( URefCon data );
/*
void operator= (ControlRef c) { m_controlRef = c; }
operator ControlRef () { return m_controlRef; }
wxWindow* m_peer;
bool m_needsFocusRect;
bool m_isRootControl;
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl)
};
// ============================================================================
{
public :
wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
+ wxMacDataBrowserControl() {}
OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
OSStatus GetItemCount( DataBrowserItemID container,
Boolean recurse,
DataBrowserItemState state,
- UInt32 *numItems) const;
+ ItemCount *numItems) const;
OSStatus GetItems( DataBrowserItemID container,
Boolean recurse,
OSStatus AddColumn( DataBrowserListViewColumnDesc *columnDesc,
DataBrowserTableViewColumnIndex position );
-
+
OSStatus RemoveColumn( DataBrowserTableViewColumnIndex position );
OSStatus AutoSizeColumns();
OSStatus GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id );
- OSStatus GetColumnPosition( DataBrowserPropertyID column, UInt32 *position) const;
- OSStatus SetColumnPosition( DataBrowserPropertyID column, UInt32 position);
+ OSStatus GetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex *position) const;
+ OSStatus SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position);
OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const;
OSStatus SetScrollPosition( UInt32 top , UInt32 left );
Boolean changeValue ) = 0;
static pascal Boolean DataBrowserCompareProc(
- ControlRef browser,
- DataBrowserItemID itemOneID,
- DataBrowserItemID itemTwoID,
- DataBrowserPropertyID sortProperty);
-
- virtual Boolean CompareItems(DataBrowserItemID itemOneID,
- DataBrowserItemID itemTwoID,
- DataBrowserPropertyID sortProperty) = 0;
+ ControlRef browser,
+ DataBrowserItemID itemOneID,
+ DataBrowserItemID itemTwoID,
+ DataBrowserPropertyID sortProperty);
+
+ virtual Boolean CompareItems(DataBrowserItemID itemOneID,
+ DataBrowserItemID itemTwoID,
+ DataBrowserPropertyID sortProperty) = 0;
+ DECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl)
};
// ============================================================================
const DataBrowserPropertyID kTextColumnId = 1024;
const DataBrowserPropertyID kNumericOrderColumnId = 1025;
-// for multi-column controls, we will use this + the column ID to identify the
+// for multi-column controls, we will use this + the column ID to identify the
// column. We don't use kTextColumnId there, and ideally the two should merge.
const DataBrowserPropertyID kMinColumnId = 1050;
{
public:
virtual void MacDelete( unsigned int n ) = 0;
- virtual void MacInsert( unsigned int n, const wxString& item, int column = -1 ) = 0;
- virtual void MacInsert( unsigned int n, const wxArrayString& items, int column = -1 ) = 0;
+ virtual void MacInsert( unsigned int n, const wxArrayStringsAdapter& items, int column = -1 ) = 0;
// returns index of newly created line
virtual int MacAppend( const wxString& item ) = 0;
virtual void MacSetString( unsigned int n, const wxString& item ) = 0;
virtual void * MacGetClientData( unsigned int) const = 0;
virtual ~wxMacListControl() { }
-};
+};
// base class for databrowser items
virtual void Notification(wxMacDataItemBrowserControl *owner ,
DataBrowserItemNotification message,
DataBrowserItemDataRef itemData ) const;
-
+
void SetLabel( const wxString& str);
- const wxString& GetLabel() const;
+ const wxString& GetLabel() const;
void SetOrder( SInt32 order );
SInt32 GetOrder() const;
void SetData( void* data);
void* GetData() const;
-
+
void SetColumn( short col );
- short GetColumn();
-
+ short GetColumn();
+
protected :
wxString m_label;
wxMacCFStringHolder m_cfLabel;
void * m_data;
SInt32 m_order;
- short m_colId;
-
+ DataBrowserPropertyID m_colId;
+
};
enum ListSortOrder {
{
public :
wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style);
-
+ wxMacDataItemBrowserControl() {}
// create a list item (can be a subclass of wxMacListBoxItem)
virtual wxMacDataItem* CreateItem();
unsigned int GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const;
void GetItems(const wxMacDataItem* container, bool recurse ,
DataBrowserItemState state, wxArrayMacDataItemPtr &items ) const;
-
+
unsigned int GetSelectedItemCount( const wxMacDataItem* container, bool recurse ) const;
unsigned int GetLineFromItem(const wxMacDataItem *item) const;
void InsertColumn(int colId, DataBrowserPropertyType colType,
const wxString& title, SInt16 just = teFlushDefault, int defaultWidth = -1);
-
+
int GetColumnWidth(int colId);
void SetColumnWidth(int colId, int width);
bool IsSelectionSuppressed() const { return m_suppressSelection; }
bool SuppressSelection( bool suppress );
-
-
+
+
// wxMacListControl Methods
// add and remove
virtual void MacDelete( unsigned int n );
- virtual void MacInsert( unsigned int n, const wxString& item, int column = -1 );
- virtual void MacInsert( unsigned int n, const wxArrayString& items, int column = -1 );
+ virtual void MacInsert( unsigned int n, const wxArrayStringsAdapter& items, int column = -1 );
virtual int MacAppend( const wxString& item );
virtual void MacClear();
virtual wxClientDataType GetClientDataType() const;
virtual void SetClientDataType(wxClientDataType clientDataItemsType);
- virtual ListSortOrder GetSortOrder() const;
- virtual void SetSortOrder(const ListSortOrder sort);
+ //virtual ListSortOrder GetSortOrder() const;
+ //virtual void SetSortOrder(const ListSortOrder sort);
+
-
protected:
private :
bool m_suppressSelection;
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
};
class wxMacDataItemBrowserSelectionSuppressor
{
public:
wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
+ wxMacDataBrowserListControl() {}
virtual ~wxMacDataBrowserListControl();
+ virtual wxMacDataItem* CreateItem();
+
// pointing back
wxWindow * GetPeer() const;
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)
};
// ============================================================================
// graphics implementation
// ============================================================================
-#if wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS && !wxUSE_GRAPHICS_CONTEXT
class WXDLLEXPORT wxMacCGPath : public wxGraphicPath
{
void SetNativeContext( CGContextRef cg );
CGPathDrawingMode GetDrawingMode() const { return m_mode; }
- virtual void Translate( wxCoord dx , wxCoord dy );
- virtual void Scale( wxCoord xScale , wxCoord yScale );
+ virtual void Translate( wxCoord dx , wxCoord dy );
+ virtual void Scale( wxCoord xScale , wxCoord yScale );
virtual void DrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, wxCoord w, wxCoord h );
virtual void DrawIcon( const wxIcon &icon, wxCoord x, wxCoord y, wxCoord w, wxCoord h );
- virtual void PushState();
+ virtual void PushState();
virtual void PopState();
-
+
virtual void DrawText( const wxString &str, wxCoord x, wxCoord y, double angle ) ;
-
+
virtual void GetTextExtent( const wxString &str, wxCoord *width, wxCoord *height,
wxCoord *descent, wxCoord *externalLeading ) const ;
-
+
virtual void GetPartialTextExtents(const wxString& text, wxArrayInt& widths) const ;
-
+
virtual void SetFont( const wxFont &font ) ;
- virtual void SetTextColor( const wxColour &col ) ;
+ virtual void SetTextColor( const wxColour &col ) ;
private:
CGContextRef m_cgContext;
CGrafPtr m_qdPort;
class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
{
- DECLARE_NO_COPY_CLASS(wxBitmapRefData)
-
- friend class WXDLLEXPORT wxIcon;
- friend class WXDLLEXPORT wxCursor;
+ friend class WXDLLIMPEXP_FWD_CORE wxIcon;
+ friend class WXDLLIMPEXP_FWD_CORE wxCursor;
public:
wxBitmapRefData(int width , int height , int depth);
wxBitmapRefData();
+ wxBitmapRefData(const wxBitmapRefData &tocopy);
+
virtual ~wxBitmapRefData();
void Free();
- bool Ok() const { return m_ok; }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return m_ok; }
void SetOk( bool isOk) { m_ok = isOk; }
void SetWidth( int width ) { m_width = width; }
ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart );
+#ifndef __LP64__
+
#ifdef WORDS_BIGENDIAN
inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect )
{
}
#endif
+#endif
+
#endif // wxUSE_GUI
#define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \
void wxMacSetupConverters();
void wxMacCleanupConverters();
-void wxMacStringToPascal( const wxString&from , StringPtr to );
-wxString wxMacMakeStringFromPascal( ConstStringPtr from );
+WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to );
+WXDLLIMPEXP_BASE wxString wxMacMakeStringFromPascal( ConstStringPtr from );
// filefn.cpp
-wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
-OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
-wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
+WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
+WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
+WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
+
+#if wxUSE_GUI
+
+// deprecating QD
+
+void wxMacLocalToGlobal( WindowRef window , Point*pt );
+void wxMacGlobalToLocal( WindowRef window , Point*pt );
+
+#endif
#endif
// _WX_PRIVATE_H_
projects / wxWidgets.git / blobdiff