Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

streamlining code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-03-29 20:44:58 +00:00
parent 1ac1336856
commit c099b53353
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/wx/osx/window.h
View File

@@ -19,8 +19,17 @@ class WXDLLIMPEXP_FWD_CORE wxButton;
class WXDLLIMPEXP_FWD_CORE wxScrollBar; class WXDLLIMPEXP_FWD_CORE wxScrollBar;
class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
class WXDLLIMPEXP_FWD_CORE wxMacControl ; #if wxOSX_USE_CARBON
class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ; 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;
#endif
class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
{ {
@@ -244,11 +253,7 @@ public:
int& w, int& h , bool adjustForOrigin ) const ; int& w, int& h , bool adjustForOrigin ) const ;
// the 'true' OS level control for this wxWindow // the 'true' OS level control for this wxWindow
#if wxOSX_USE_CARBON wxOSXWidgetImpl* GetPeer() const { return m_peer ; }
wxMacControl* GetPeer() const { return m_peer ; }
#else
wxWidgetImpl* GetPeer() const { return m_peer ; }
#endif
void * MacGetCGContextRef() { return m_cgContextRef ; } void * MacGetCGContextRef() { return m_cgContextRef ; }
void MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; } void MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
@@ -261,12 +266,9 @@ protected:
// For controls like radio buttons which are genuinely composite // For controls like radio buttons which are genuinely composite
wxList m_subControls; 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 ; wxOSXWidgetImpl * m_peer ;
#else
wxWidgetImpl * m_peer ;
#endif
void * m_cgContextRef ; void * m_cgContextRef ;
// cache the clipped rectangles within the window hierarchy // cache the clipped rectangles within the window hierarchy