X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5558135c4894ec39d39d46a3586df2bb0e89da09..8c9f8f91cd62335261ee29762747218f28d129de:/include/wx/cocoa/window.h?ds=sidebyside diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index 3f0138d6ce..06ce0bb977 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -18,8 +18,10 @@ #import <Foundation/NSGeometry.h> #endif //def __OBJC__ +DECLARE_WXCOCOA_OBJC_CLASS(NSAffineTransform); + class wxWindowCocoaHider; -class wxWindowCocoaScroller; +class wxWindowCocoaScrollView; // ======================================================================== // wxWindowCocoa @@ -30,7 +32,7 @@ class WXDLLEXPORT wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView DECLARE_NO_COPY_CLASS(wxWindowCocoa) DECLARE_EVENT_TABLE() friend wxWindow *wxWindowBase::GetCapture(); - friend class wxWindowCocoaScroller; + friend class wxWindowCocoaScrollView; // ------------------------------------------------------------------------ // initialization // ------------------------------------------------------------------------ @@ -70,6 +72,14 @@ public: // Add/remove children void CocoaAddChild(wxWindowCocoa *child); void CocoaRemoveFromParent(void); +#ifdef __OBJC__ + // Returns an autoreleased NSAffineTransform which can be applied + // to a graphics context currently using the view's coordinate system + // (such as the one locked when drawRect is called or after a call + // to [NSView lockFocus]) such that further drawing is done using + // the wxWidgets coordinate system. + WX_NSAffineTransform CocoaGetWxToBoundsTransform(); +#endif //def __OBJC__ protected: // enable==false: disables the control // enable==true: enables the control IF it should be enabled @@ -81,6 +91,7 @@ protected: void CocoaCreateNSScrollView(); void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent); + virtual wxWindow* GetWxWindow() const; virtual void Cocoa_FrameChanged(void); virtual bool Cocoa_drawRect(const NSRect &rect); virtual bool Cocoa_mouseDown(WX_NSEvent theEvent); @@ -99,7 +110,7 @@ protected: void SetNSView(WX_NSView cocoaNSView); WX_NSView m_cocoaNSView; wxWindowCocoaHider *m_cocoaHider; - wxWindowCocoaScroller *m_cocoaScroller; + wxWindowCocoaScrollView *m_wxCocoaScrollView; bool m_isInPaint; static wxWindow *sm_capturedWindow; virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView); @@ -110,6 +121,12 @@ protected: // NOTE: position is 10,10 to make it "obvious" that it's out of place return NSMakeRect(10.0,10.0,WidthDefault(size.x),HeightDefault(size.y)); } + // These functions translate NSPoint or NSRect between the coordinate + // system of Cocoa's boudns rect and wx's coordinate system. + NSPoint CocoaTransformBoundsToWx(NSPoint pointBounds); + NSRect CocoaTransformBoundsToWx(NSRect rectBounds); + NSPoint CocoaTransformWxToBounds(NSPoint pointWx); + NSRect CocoaTransformWxToBounds(NSRect rectWx); #endif //def __OBJC__ // ------------------------------------------------------------------------ // Implementation