Regenerated makefiles for runtime lib change

[wxWidgets.git] / include / wx / cocoa / window.h

diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h
index fc4b09707984779280bd1ff949ada55f0cf744ff..06ce0bb977d58cdf42bfe70cc585c3b5cb2fc6f1 100644 (file)
--- a/include/wx/cocoa/window.h
+++ b/include/wx/cocoa/window.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/26
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
 // Created:     2002/12/26
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWidgets licence
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_WINDOW_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_WINDOW_H__


@@ -18,8 +18,10 @@
     #import <Foundation/NSGeometry.h>
 #endif //def __OBJC__
 
     #import <Foundation/NSGeometry.h>
 #endif //def __OBJC__
 

+DECLARE_WXCOCOA_OBJC_CLASS(NSAffineTransform);
+

 class wxWindowCocoaHider;
 class wxWindowCocoaHider;

-class wxWindowCocoaScroller;
+class wxWindowCocoaScrollView;

 
 // ========================================================================
 // wxWindowCocoa
 
 // ========================================================================
 // wxWindowCocoa


@@ -30,7 +32,7 @@ class WXDLLEXPORT wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView
     DECLARE_NO_COPY_CLASS(wxWindowCocoa)
     DECLARE_EVENT_TABLE()
     friend wxWindow *wxWindowBase::GetCapture();
     DECLARE_NO_COPY_CLASS(wxWindowCocoa)
     DECLARE_EVENT_TABLE()
     friend wxWindow *wxWindowBase::GetCapture();

-    friend class wxWindowCocoaScroller;
+    friend class wxWindowCocoaScrollView;

 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------


@@ -70,6 +72,14 @@ public:
     // Add/remove children
     void CocoaAddChild(wxWindowCocoa *child);
     void CocoaRemoveFromParent(void);
     // 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
 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);
 
     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);
     virtual void Cocoa_FrameChanged(void);
     virtual bool Cocoa_drawRect(const NSRect &rect);
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent);


@@ -95,10 +106,11 @@ protected:
     virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent);
     virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent);
     virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent);
     virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent);
     virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent);
     virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent);

+    virtual bool Cocoa_resetCursorRects();

     void SetNSView(WX_NSView cocoaNSView);
     WX_NSView m_cocoaNSView;
     wxWindowCocoaHider *m_cocoaHider;
     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);
     bool m_isInPaint;
     static wxWindow *sm_capturedWindow;
     virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);


@@ -109,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));
     }
         // 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
 #endif //def __OBJC__
 // ------------------------------------------------------------------------
 // Implementation


@@ -160,6 +178,8 @@ public:
     // Get/set client (application-useable) size
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int size);
     // Get/set client (application-useable) size
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int size);

+    // Set this window's tooltip
+    virtual void DoSetToolTip( wxToolTip *tip );

     // Set the size of the wxWindow (the contentView of an NSWindow)
     // wxTopLevelWindow will override this and set the NSWindow size
     // such that the contentView will be this size
     // Set the size of the wxWindow (the contentView of an NSWindow)
     // wxTopLevelWindow will override this and set the NSWindow size
     // such that the contentView will be this size