no real change; just add the standard separator where it's missing

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

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index d5693becf3a2cdadbc1bc4bc9f1dfc9bc13896ed..453610899491a7357f5a97b2287991cb221e590b 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -19,8 +19,14 @@ class WXDLLIMPEXP_FWD_CORE wxButton;
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 
 class WXDLLIMPEXP_FWD_CORE wxScrollBar;
 class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
 

-class WXDLLIMPEXP_FWD_CORE wxMacControl ;
-class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ;
+#if wxOSX_USE_CARBON
+    class WXDLLIMPEXP_FWD_CORE wxMacControl ;
+    typedef wxMacControl wxOSXWidgetImpl;
+#elif wxOSX_USE_COCOA_OR_IPHONE
+    class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ;
+    typedef wxWidgetImpl wxOSXWidgetImpl;
+#endif
+

 
 class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {
 
 class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
 {


@@ -198,7 +204,10 @@ public:
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 
     bool                MacIsReallyEnabled() ;
     bool                MacIsReallyHilited() ;
 

+#if WXWIN_COMPATIBILITY_2_8

     bool                MacIsUserPane() { return m_macIsUserPane; }
     bool                MacIsUserPane() { return m_macIsUserPane; }

+#endif
+    bool                MacIsUserPane() const { return m_macIsUserPane; }

 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
 
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
 


@@ -241,11 +250,7 @@ public:
                                            int& w, int& h , bool adjustForOrigin ) const ;
 
     // the 'true' OS level control for this wxWindow
                                            int& w, int& h , bool adjustForOrigin ) const ;
 
     // the 'true' OS level control for this wxWindow

-#if wxOSX_USE_CARBON
-    wxMacControl*       GetPeer() const { return m_peer ; }
-#else
-    wxWidgetImpl*       GetPeer() const { return m_peer ; }
-#endif
+    wxOSXWidgetImpl*       GetPeer() const { return m_peer ; }

  
     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
  
     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }


@@ -258,12 +263,9 @@ protected:
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;
 
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;
 

-#if wxOSX_USE_CARBON

     // the peer object, allowing for cleaner API support
     // the peer object, allowing for cleaner API support

-    wxMacControl *       m_peer ;
-#else
-    wxWidgetImpl *       m_peer ;
-#endif
+    wxOSXWidgetImpl *   m_peer ;
+

     void *              m_cgContextRef ;
 
     // cache the clipped rectangles within the window hierarchy
     void *              m_cgContextRef ;
 
     // cache the clipped rectangles within the window hierarchy