hiding the impl type more again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 18b35c9076e44fb611dbd3e9ab7d8dbc39899942..82fa07ce1723be9735d21ea6d88c72688f70287a 100644 (file)
--- 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);
     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
 
 
     // cocoa thunk connected calls
 

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 5a227e33683595a9e8e6b61133e1e036a1f8927c..cc2193377b53a4e2b3dd9ba533a07aed660f74b6 100644 (file)
--- 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;
 
     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;
 
     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 8728a0a091d5a744eb7575ca81fd3a179d63784a..453610899491a7357f5a97b2287991cb221e590b 100644 (file)
--- 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;
 #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
 
 
 #endif