#if wxUSE_GUI
#include "wx/listbox.h"
-
-#ifndef __LP64__
-
-class WXDLLEXPORT wxMacPortSaver
-{
- DECLARE_NO_COPY_CLASS(wxMacPortSaver)
-
-public:
- wxMacPortSaver( GrafPtr port );
- ~wxMacPortSaver();
-private :
- GrafPtr m_port;
-};
-
-
-/*
- Clips to the visible region of a control within the current port
- */
-
-class WXDLLEXPORT wxMacWindowClipper : public wxMacPortSaver
-{
- DECLARE_NO_COPY_CLASS(wxMacWindowClipper)
-
-public:
- wxMacWindowClipper( const wxWindow* win );
- ~wxMacWindowClipper();
-private:
- GrafPtr m_newPort;
- RgnHandle m_formerClip;
- RgnHandle m_newClip;
-};
-
-class WXDLLEXPORT wxMacWindowStateSaver : public wxMacWindowClipper
-{
- DECLARE_NO_COPY_CLASS(wxMacWindowStateSaver)
-
-public:
- wxMacWindowStateSaver( const wxWindow* win );
- ~wxMacWindowStateSaver();
-private:
- GrafPtr m_newPort;
- ThemeDrawingState m_themeDrawingState;
-};
-#endif
+#include "wx/mac/carbon/dc.h"
+#include "wx/mac/carbon/dcclient.h"
+#include "wx/mac/carbon/dcmemory.h"
class WXDLLEXPORT wxMacCGContextStateSaver
{
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
template<> EventParamType wxMacGetEventParamType<GWorldPtr>() { return typeGWorldPtr; }
*/
-class wxMacCarbonEvent
+class WXDLLEXPORT wxMacCarbonEvent
{
public :
typedef wxMacUPP<NMProcPtr,NMUPP,NewNMUPP,DisposeNMUPP> wxMacNMUPP;
-template <typename refType> class wxMacCFRefHolder
-{
-public :
- wxMacCFRefHolder()
- : m_ref(NULL) , m_release(false)
- {
- }
-
- wxMacCFRefHolder( refType ref , bool release = true )
- : m_ref(ref) , m_release(release)
- {
- }
-
- ~wxMacCFRefHolder()
- {
- Release();
- }
-
- void Release()
- {
- if ( m_release && m_ref != NULL )
- CFRelease( m_ref );
- m_ref = NULL;
- }
-
- refType Detach()
- {
- refType val = m_ref;
- m_release = false;
- m_ref = NULL;
- return val;
- }
-
- void Set( refType ref , bool release = true )
- {
- Release();
- m_release = release;
- m_ref = ref;
- }
-
- operator refType () const { return m_ref; }
-
- wxMacCFRefHolder& operator=(refType r)
- {
- Set( r );
- return *this;
- }
-private :
- refType m_ref;
- bool m_release;
-
- DECLARE_NO_COPY_CLASS( wxMacCFRefHolder )
-};
-
#if wxUSE_GUI
-class wxMacToolTipTimer ;
+class WXDLLIMPEXP_FWD_CORE wxMacToolTipTimer ;
-class wxMacToolTip
+class WXDLLEXPORT wxMacToolTip
{
public :
wxMacToolTip() ;
#if wxUSE_TIMER
wxMacToolTipTimer* m_timer ;
#endif
- wxMacCFStringHolder m_helpTextRef ;
+ wxCFStringRef 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))
WindowRef m_data;
};
-void wxMacRectToNative( const wxRect *wx , Rect *n );
-void wxMacNativeToRect( const Rect *n , wxRect* wx );
-void wxMacPointToNative( const wxPoint* wx , Point *n );
-void wxMacNativeToPoint( const Point *n , wxPoint* wx );
+WXDLLIMPEXP_CORE void wxMacRectToNative( const wxRect *wx , Rect *n );
+WXDLLIMPEXP_CORE void wxMacNativeToRect( const Rect *n , wxRect* wx );
+WXDLLIMPEXP_CORE void wxMacPointToNative( const wxPoint* wx , Point *n );
+WXDLLIMPEXP_CORE void wxMacNativeToPoint( const Point *n , wxPoint* wx );
WXDLLIMPEXP_CORE wxWindow * wxFindControlFromMacControl(ControlRef inControl );
WXDLLIMPEXP_CORE wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow );
ControlActionUPP GetwxMacLiveScrollbarActionProc();
-class wxMacControl : public wxObject
+// additional optional event defines
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+enum {
+ kEventControlFocusPartChanged = 164
+};
+#endif
+
+class WXDLLEXPORT wxMacControl : public wxObject
{
public :
wxMacControl( wxWindow* peer , bool isRootControl = false );
// basing on DataBrowserItemIDs
//
-class wxMacDataBrowserControl : public wxMacControl
+class WXDLLEXPORT wxMacDataBrowserControl : public wxMacControl
{
public :
wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
// base API for high-level databrowser operations
-class wxMacListControl
+class WXDLLEXPORT wxMacListControl
{
public:
virtual void MacDelete( unsigned int n ) = 0;
DataItem_Text
};
-class wxMacDataItem
+class WXDLLEXPORT wxMacDataItem
{
public :
wxMacDataItem();
protected :
wxString m_label;
- wxMacCFStringHolder m_cfLabel;
+ wxCFStringRef m_cfLabel;
void * m_data;
SInt32 m_order;
DataBrowserPropertyID m_colId;
WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxMacDataItemPtr, wxArrayMacDataItemPtr, class WXDLLIMPEXP_CORE);
-class wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMacListControl
+class WXDLLEXPORT wxMacDataItemBrowserControl : public wxMacDataBrowserControl, public wxMacListControl
{
public :
wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style);
DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
};
-class wxMacDataItemBrowserSelectionSuppressor
+class WXDLLEXPORT wxMacDataItemBrowserSelectionSuppressor
{
public :
wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser);
// exposed for reuse in wxCheckListBox
-class wxMacListBoxItem : public wxMacDataItem
+class WXDLLEXPORT wxMacListBoxItem : public wxMacDataItem
{
public :
wxMacListBoxItem();
DataBrowserItemDataRef itemData ) const;
};
-class wxMacDataBrowserListControl : public wxMacDataItemBrowserControl
+class WXDLLEXPORT wxMacDataBrowserListControl : public wxMacDataItemBrowserControl
{
public:
wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
// 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
-class wxMacDeferredWindowDeleter : public wxObject
+class WXDLLEXPORT wxMacDeferredWindowDeleter : public wxObject
{
public :
wxMacDeferredWindowDeleter( WindowRef windowRef );
bool wxMacInitCocoa();
-class wxMacAutoreleasePool
+class WXDLLEXPORT wxMacAutoreleasePool
{
public :
wxMacAutoreleasePool();
projects / wxWidgets.git / blobdiff