virtual void Paste() ;
virtual bool CanPaste() const ;
virtual void SetEditable( bool editable ) ;
- virtual wxTextPos GetLastPosition() const ;
+ virtual long GetLastPosition() const ;
virtual void Replace( long from, long to, const wxString &str ) ;
virtual void Remove( long from, long to ) ;
__WXOSX_IPHONE__ means OS X iPhone
*/
-/* supporting the old short name */
+/* backwards compatible define, until configure gets updated */
+#if defined __WXMAC__
+#define __WXOSX_CARBON__
+#endif
-#ifdef __WXMAC__
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
# define __WXOSX__
#endif
#ifdef __WXOSX__
/* for backwards compatibility of code (including our own) define __WXMAC__ */
-#ifndef __WXMAC__
-#define __WXMAC__
-#endif
+# ifndef __WXMAC__
+# define __WXMAC__
+# endif
/* setup precise defines according to sdk used */
# include <TargetConditionals.h>
-# if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
-# define __WXOSX_IPHONE__
-# undef __WXOSX_MAC__
-# elif defined(TARGET_OS_MAC) && TARGET_OS_MAC
-# undef __WXOSX_IPHONE__
+# if defined(__WXOSX_IPHONE__)
+# if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
+# error "incorrect SDK for an iPhone build"
+# endif
+# elif defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__)
+# if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
+# error "incorrect SDK for a Mac OS X build"
+# endif
# define __WXOSX_MAC__
# else
-# error "unknown SDK, neither TARGET_OS_MAC nor TARGET_OS_IPHONE set in <TargetConditionals.h>"
+# error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
# endif
#endif
#endif
/*
- __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+ __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.
DO NOT use this define in base library code. Although wxMac has its own
- private base library (and thus __WXOSX__,__WXMAC__ and related defines are
+ private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are
valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
- To keep wx authors from screwing this up, only enable __WXOSX__ for wxCocoa when
+ To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when
not compiling the base library. We determine this by first checking if
wxUSE_BASE is not defined. If it is not defined, then we're not buildling
the base library, and possibly not building wx at all (but actually building
using OS X libraries like Carbon or CoreServices.
*/
-#if defined(__WXOSX_MAC__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXOSX_IPHONE__)
-# define __WXOSX__
+#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+# define __WXOSX_OR_COCOA__
#endif
-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__
# ifdef __WXMAC_XCODE__
# include <unistd.h>
# include <TargetConditionals.h>
#define wxFNCONV(name) wxConvFileName->cWX2MB(name)
#define wxFNSTRINGCAST wxMBSTRINGCAST
#else
-#if defined( __WXOSX__ ) && wxMBFILES
+#if defined( __WXOSX_OR_COCOA__ ) && wxMBFILES
#define wxFNCONV(name) wxConvFileName->cWC2MB( wxConvLocal.cWX2WC(name) )
#else
#define wxFNCONV(name) name
#include "wx/dcclient.h"
-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__
#ifdef __WXOSX_IPHONE__
#include <CoreGraphics/CoreGraphics.h>
#else
void wxGCDCImpl::Flush()
{
-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__
CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() );
#endif
}
{
return m_text->GetInsertionPoint();
}
-wxTextPos wxSearchCtrl::GetLastPosition() const
+long wxSearchCtrl::GetLastPosition() const
{
return m_text->GetLastPosition();
}
virtual void Paste() ;
virtual bool CanPaste() const ;
virtual void SetEditable( bool editable ) ;
- virtual wxTextPos GetLastPosition() const ;
+ virtual long GetLastPosition() const ;
virtual void Replace( long from, long to, const wxString &str ) ;
virtual void Remove( long from, long to ) ;
virtual void GetSelection( long* from, long* to ) const ;
TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ;
}
-wxTextPos wxMacMLTEControl::GetLastPosition() const
+long wxMacMLTEControl::GetLastPosition() const
{
wxTextPos actualsize = 0 ;
void wxTextCtrl::SetInsertionPointEnd()
{
- wxTextPos pos = GetLastPosition();
+ long pos = GetLastPosition();
SetInsertionPoint( pos );
}
{
}
-wxTextPos wxTextWidgetImpl::GetLastPosition() const
+long wxTextWidgetImpl::GetLastPosition() const
{
return GetStringValue().length() ;
}
}
}
- menu->MacAfterDisplay( true ) ;
- menu->SetInvokingWindow( NULL );
#else
menu->SetInvokingWindow( NULL );
return false;
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMSW)
#elif defined(__WXGTK__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowGTK)
-#elif defined(__WXOSX__)
+#elif defined(__WXOSX_OR_COCOA__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMac)
#elif defined(__WXMGL__)
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowMGL)