From ee032c59df7ac4facdfdffce016768ab858e18c0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 30 Mar 2009 07:30:26 +0000 Subject: [PATCH] hiding the impl type more again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/cocoa/private.h | 2 +- include/wx/osx/core/private.h | 3 +++ include/wx/osx/window.h | 9 +++------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h index 18b35c9076..82fa07ce17 100644 --- a/include/wx/osx/cocoa/private.h +++ b/include/wx/osx/cocoa/private.h @@ -129,7 +129,7 @@ public : virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow); void SetFlipped(bool flipped); - bool IsFlipped() const { return m_isFlipped; } + virtual bool IsFlipped() const { return m_isFlipped; } // cocoa thunk connected calls diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 5a227e3368..cc2193377b 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -205,6 +205,9 @@ public : virtual void GetSize( int &width, int &height ) const = 0; virtual void SetControlSize( wxWindowVariant variant ) = 0; + // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin) + virtual bool IsFlipped() const { return true; } + virtual void SetNeedsDisplay( const wxRect* where = NULL ) = 0; virtual bool GetNeedsDisplay() const = 0; diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h index 8728a0a091..4536108994 100644 --- a/include/wx/osx/window.h +++ b/include/wx/osx/window.h @@ -22,12 +22,9 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; #if wxOSX_USE_CARBON class WXDLLIMPEXP_FWD_CORE wxMacControl ; typedef wxMacControl wxOSXWidgetImpl; -#elif wxOSX_USE_COCOA - class WXDLLIMPEXP_FWD_CORE wxWidgetCocoaImpl ; - typedef wxWidgetCocoaImpl wxOSXWidgetImpl; -#elif wxOSX_USE_IPHONE - class WXDLLIMPEXP_FWD_CORE wxWidgetIPhoneImpl ; - typedef wxWidgetIPhoneImpl wxOSXWidgetImpl; +#elif wxOSX_USE_COCOA_OR_IPHONE + class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ; + typedef wxWidgetImpl wxOSXWidgetImpl; #endif -- 2.45.2