X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c5a378ff21de766bab2fd76293be1008610afc2..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/cocoa/window.h?ds=sidebyside diff --git a/include/wx/cocoa/window.h b/include/wx/cocoa/window.h index b30b23ac1d..309cb29e5f 100644 --- a/include/wx/cocoa/window.h +++ b/include/wx/cocoa/window.h @@ -18,6 +18,22 @@ #import <Foundation/NSGeometry.h> #endif //def __OBJC__ +// We can only import Foundation/NSGeometry.h from Objective-C code but it's +// nice to be able to use NSPoint and NSRect in the declarations of helper +// methods so we must define them as opaque structs identically to the way +// they are defined by the real header. +// NOTE: We specifically use these regardless of C++ or Objective-C++ mode so +// the compiler will complain if we got the definitions wrong. In regular +// C++ mode there is no way to know if we got the definitons right so +// we depend on at least one Objective-C++ file including this header. +#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64) +typedef struct CGPoint NSPoint; +typedef struct CGRect NSRect; +#else +typedef struct _NSPoint NSPoint; +typedef struct _NSRect NSRect; +#endif + DECLARE_WXCOCOA_OBJC_CLASS(NSAffineTransform); class wxWindowCocoaHider; @@ -27,10 +43,10 @@ class wxCocoaTrackingRectManager; // ======================================================================== // wxWindowCocoa // ======================================================================== -class WXDLLEXPORT wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView +class WXDLLIMPEXP_CORE wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView { DECLARE_DYNAMIC_CLASS(wxWindowCocoa) - DECLARE_NO_COPY_CLASS(wxWindowCocoa) + wxDECLARE_NO_COPY_CLASS(wxWindowCocoa); DECLARE_EVENT_TABLE() friend wxWindow *wxWindowBase::GetCapture(); friend class wxWindowCocoaScrollView; @@ -84,7 +100,7 @@ public: #endif //def __OBJC__ protected: // actually enable/disable the cocoa control, overridden by subclasses - virtual void CocoaSetEnabled(bool enable) { } + virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } void CocoaCreateNSScrollView(); void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent); @@ -129,6 +145,8 @@ protected: NSPoint CocoaTransformWxToBounds(NSPoint pointWx); NSRect CocoaTransformWxToBounds(NSRect rectWx); #endif //def __OBJC__ + static wxPoint OriginInWxDisplayCoordinatesForRectInCocoaScreenCoordinates(NSRect windowFrame); + static NSPoint OriginInCocoaScreenCoordinatesForRectInWxDisplayCoordinates(wxCoord x, wxCoord y, wxCoord width, wxCoord height, bool keepOriginVisible); // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ @@ -142,6 +160,8 @@ public: virtual void SetFocus(); // Warp the pointer the given position virtual void WarpPointer(int x_pos, int y_pos) ; + // Change the window's cursor + virtual bool SetCursor( const wxCursor &cursor ); // Send the window a refresh event virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); // Set/get the window's font