#define MAC_OS_X_VERSION_10_3 1030
#endif
+#ifndef MAC_OS_X_VERSION_10_4
+ #define MAC_OS_X_VERSION_10_4 1040
+#endif
+
#ifdef __WXMAC_CARBON__
#include "wx/mac/corefoundation/cfstring.h"
#endif
#include "wx/dc.h"
#include "wx/window.h"
+#include "wx/toplevel.h"
class wxMacPortStateHelper
{
ThemeDrawingState m_themeDrawingState ;
} ;
+#if wxMAC_USE_CORE_GRAPHICS
+class WXDLLEXPORT wxMacCGContextStateSaver
+{
+ DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
+
+public:
+ wxMacCGContextStateSaver( CGContextRef cg )
+ {
+ m_cg = cg ;
+ CGContextSaveGState( cg ) ;
+ }
+ ~wxMacCGContextStateSaver()
+ {
+ CGContextRestoreGState( m_cg ) ;
+ }
+private:
+ CGContextRef m_cg ;
+} ;
+
+#endif
/*
class wxMacDrawingHelper
{
void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ;
CTabHandle wxMacCreateColorTable( int numColors ) ;
*/
-PicHandle wxMacCreatePicHandle( const wxBitmap &bmp ) ;
-IconRef wxMacCreateIconRef(const wxBitmap& bmp) ;
void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 ) ;
void wxMacReleaseBitmapButton( ControlButtonContentInfo*info ) ;
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 ) ;
+
wxWindow * wxFindControlFromMacControl(ControlRef inControl ) ;
wxTopLevelWindowMac* wxFindWinFromMacWindow( WindowRef inWindow ) ;
wxMenu* wxFindMenuFromMacMenu(MenuRef inMenuRef) ;
pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true ) ;
+ControlActionUPP GetwxMacLiveScrollbarActionProc() ;
+
class wxMacControl
{
public :
- wxMacControl()
- {
- m_controlRef = NULL ;
- }
+ wxMacControl( wxWindow* peer , bool isRootControl = false ) ;
+ wxMacControl( wxWindow* peer , ControlRef control ) ;
+ wxMacControl( wxWindow* peer , WXWidget control ) ;
+ virtual ~wxMacControl() ;
- wxMacControl( ControlRef control )
- {
- m_controlRef = control ;
- }
- wxMacControl( WXWidget control )
- {
- m_controlRef = (ControlRef) control ;
- }
- virtual ~wxMacControl()
- {
- }
+ void Init() ;
virtual void Dispose() ;
virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
virtual bool HasFocus() const ;
virtual bool NeedsFocusRect() const ;
+ virtual void SetNeedsFocusRect( bool needs ) ;
// templated helpers
// Flash the control for the specified amount of time
virtual void Flash( ControlPartCode part , UInt32 ticks = 8 ) ;
+
virtual void VisibilityChanged( bool shown ) ;
+ virtual void SuperChangedPosition() ;
+
+
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 ) ;
// invalidates this control and all children
virtual void InvalidateWithChildren() ;
virtual void SetDrawingEnabled( bool enable ) ;
+#ifdef __WXMAC_OSX__
virtual bool GetNeedsDisplay() const ;
- virtual void SetNeedsDisplay( bool needsDisplay , RgnHandle where = NULL ) ;
+#endif
+ // where is in native window relative coordinates
+ virtual void SetNeedsDisplay( RgnHandle where ) ;
+ // where is in native window relative coordinates
+ virtual void SetNeedsDisplay( Rect* where = NULL ) ;
virtual void ScrollRect( const wxRect &rect , int dx , int dy ) ;
+ // in native parent window relative coordinates
virtual void GetRect( Rect *r ) ;
+
+ // in native parent window relative coordinates
virtual void SetRect( Rect *r ) ;
+
virtual void GetRectInWindowCoords( Rect *r ) ;
virtual void GetBestRect( Rect *r ) ;
virtual void SetTitle( const wxString &title ) ;
// to be moved into a tab control class
virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable ) ;
+ bool IsCompositing() { return m_isCompositing ; }
+ bool IsRootControl() { return m_isRootControl ; }
protected :
ControlRef m_controlRef ;
wxFont m_font ;
long m_windowStyle ;
+ wxWindow* m_peer ;
+ bool m_needsFocusRect ;
+ bool m_isCompositing ;
+ bool m_isRootControl ;
} ;
#if wxMAC_USE_CORE_GRAPHICS
wxBrush m_brush ;
} ;
+#endif // wxMAC_USE_CORE_GRAPHICS
+
+#ifdef __WXMAC_OSX__
+
CGColorSpaceRef wxMacGetGenericRGBColorSpace(void) ;
void wxMacMemoryBufferReleaseProc(void *info, const void *data, size_t size) ;
-#endif // wxMAC_USE_CORE_GRAPHICS
+#endif
class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
{
#endif // wxUSE_PALETTE
wxMask * m_bitmapMask; // Optional mask
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
CGImageRef CGImageCreate() const ;
#endif
+
+ // returns true if the bitmap has a size that
+ // can be natively transferred into a true icon
+ // if no is returned GetIconRef will still produce
+ // an icon but it will be generated via a PICT and
+ // rescaled to 16 x 16
+ bool HasNativeSize() ;
+
+ // caller should increase ref count if needed longer
+ // than the bitmap exists
+ IconRef GetIconRef() ;
+
+ // returns a Pict from the bitmap content
+ PicHandle GetPictHandle() ;
GWorldPtr GetHBITMAP(GWorldPtr * mask = NULL ) const ;
void UpdateAlphaMask() const ;
wxMemoryBuffer m_memBuf ;
int m_rawAccessCount ;
bool m_ok;
-#if wxMAC_USE_CORE_GRAPHICS
+#ifdef __WXMAC_OSX__
mutable CGImageRef m_cgImageRef ;
#endif
+ IconRef m_iconRef ;
+ PicHandle m_pictHandle ;
GWorldPtr m_hBitmap;
GWorldPtr m_hMaskBitmap ;
wxMemoryBuffer m_maskMemBuf ;
int m_maskBytesPerRow ;
};
-#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
-
class WXDLLEXPORT wxIconRefData : public wxGDIRefData
{
public:
void Init() ;
virtual void Free();
+
+ void SetWidth( int width ) { m_width = width ; }
+ void SetHeight( int height ) { m_height = height ; }
+
+ int GetWidth() const { return m_width ; }
+ int GetHeight() const { return m_height ; }
+
WXHICON GetHICON() const { return (WXHICON) m_iconRef ; }
private :
IconRef m_iconRef ;
+ int m_width ;
+ int m_height ;
};
+// toplevel.cpp
+
+ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, Point location , WindowRef window , ControlPartCode *outPart ) ;
+
#endif // wxUSE_GUI
+#define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \
+UPP Get##x() \
+{ \
+ static UPP sHandler = NULL; \
+ if ( sHandler == NULL ) \
+ sHandler = New##UPP( x ); \
+ return sHandler; \
+}
+
//---------------------------------------------------------------------------
// wxMac string conversions
//---------------------------------------------------------------------------
void wxMacStringToPascal( const wxString&from , StringPtr to ) ;
wxString wxMacMakeStringFromPascal( ConstStringPtr from ) ;
-// toplevel.cpp
-
-ControlRef wxMacFindControlUnderMouse( Point location , WindowRef window , ControlPartCode *outPart ) ;
-
// filefn.cpp
wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL ) ;
projects / wxWidgets.git / blobdiff