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

cleanup for 10.5

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-10-14 14:55:46 +00:00
parent 8c9fd6e54e
commit eb89f88a43
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/mac/carbon/private.h
View File

@@ -64,6 +64,8 @@ inline int FixedToInt( Fixed inFixed )
#include "wx/listbox.h" #include "wx/listbox.h"
#ifndef __LP64__
class wxMacPortStateHelper class wxMacPortStateHelper
{ {
DECLARE_NO_COPY_CLASS(wxMacPortStateHelper) DECLARE_NO_COPY_CLASS(wxMacPortStateHelper)
@@ -140,6 +142,7 @@ private:
GrafPtr m_newPort; GrafPtr m_newPort;
ThemeDrawingState m_themeDrawingState; ThemeDrawingState m_themeDrawingState;
}; };
#endif
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
class WXDLLEXPORT wxMacCGContextStateSaver class WXDLLEXPORT wxMacCGContextStateSaver
@@ -496,7 +499,7 @@ public :
virtual ControlRef * GetControlRefAddr() { return &m_controlRef; } virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
virtual ControlRef GetControlRef() const { return m_controlRef; } virtual ControlRef GetControlRef() const { return m_controlRef; }
virtual void SetReference( SInt32 data ); virtual void SetReference( URefCon data );
/* /*
void operator= (ControlRef c) { m_controlRef = c; } void operator= (ControlRef c) { m_controlRef = c; }
operator ControlRef () { return m_controlRef; } operator ControlRef () { return m_controlRef; }
@@ -663,7 +666,7 @@ public :
OSStatus GetItemCount( DataBrowserItemID container, OSStatus GetItemCount( DataBrowserItemID container,
Boolean recurse, Boolean recurse,
DataBrowserItemState state, DataBrowserItemState state,
UInt32 *numItems) const; ItemCount *numItems) const;
OSStatus GetItems( DataBrowserItemID container, OSStatus GetItems( DataBrowserItemID container,
Boolean recurse, Boolean recurse,
@@ -727,8 +730,8 @@ public :
OSStatus GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id ); OSStatus GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id );
OSStatus GetColumnPosition( DataBrowserPropertyID column, UInt32 *position) const; OSStatus GetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex *position) const;
OSStatus SetColumnPosition( DataBrowserPropertyID column, UInt32 position); OSStatus SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position);
OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const; OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const;
OSStatus SetScrollPosition( UInt32 top , UInt32 left ); OSStatus SetScrollPosition( UInt32 top , UInt32 left );
@@ -1261,6 +1264,8 @@ private :
ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart ); ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, const Point& location , WindowRef window , ControlPartCode *outPart );
#ifndef __LP64__
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect ) inline Rect* wxMacGetPictureBounds( PicHandle pict , Rect* rect )
{ {
@@ -1274,6 +1279,8 @@ ControlRef wxMacFindControlUnderMouse( wxTopLevelWindowMac* toplevelWindow, cons
} }
#endif #endif
#endif
#endif // wxUSE_GUI #endif // wxUSE_GUI
#define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \ #define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \
@@ -1301,5 +1308,14 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef ); OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname ); wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
#if wxUSE_GUI
// deprecating QD
void wxMacLocalToGlobal( WindowRef window , Point*pt );
void wxMacGlobalToLocal( WindowRef window , Point*pt );
#endif
#endif #endif
// _WX_PRIVATE_H_ // _WX_PRIVATE_H_