From 0b6a49c21fb59ab3b03480a299ce2beab5fa6811 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Fri, 5 Sep 2008 19:02:51 +0000 Subject: [PATCH] forward define for non precomp build, switching preproc constants for consistency git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/core/private.h | 2 +- include/wx/platform.h | 40 ++++++++++++++++++++--------------- include/wx/strconv.h | 2 +- src/common/dcgraph.cpp | 4 ++-- src/generic/srchctlg.cpp | 2 +- src/osx/carbon/textctrl.cpp | 4 ++-- src/osx/textctrl_osx.cpp | 4 ++-- src/osx/window_osx.cpp | 2 -- src/univ/winuniv.cpp | 2 +- 9 files changed, 33 insertions(+), 29 deletions(-) diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index 4453c638f7..fd50f3b047 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -520,7 +520,7 @@ public : 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 ) ; diff --git a/include/wx/platform.h b/include/wx/platform.h index 6bfd68285e..bc61753e16 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -33,27 +33,33 @@ __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 -# 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 " +# error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined" # endif #endif @@ -75,13 +81,13 @@ #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 @@ -93,11 +99,11 @@ 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 # include diff --git a/include/wx/strconv.h b/include/wx/strconv.h index e9d68a51a3..148eeb01e0 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -631,7 +631,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI; #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 diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index bdadaffff8..2b9eb8c97a 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -30,7 +30,7 @@ #include "wx/dcclient.h" -#ifdef __WXOSX__ +#ifdef __WXOSX_OR_COCOA__ #ifdef __WXOSX_IPHONE__ #include #else @@ -228,7 +228,7 @@ void wxGCDCImpl::EndPage() void wxGCDCImpl::Flush() { -#ifdef __WXOSX__ +#ifdef __WXOSX_OR_COCOA__ CGContextFlush( (CGContextRef) m_graphicContext->GetNativeContext() ); #endif } diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index fd18cb07ea..e520c7dd24 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -811,7 +811,7 @@ long wxSearchCtrl::GetInsertionPoint() const { return m_text->GetInsertionPoint(); } -wxTextPos wxSearchCtrl::GetLastPosition() const +long wxSearchCtrl::GetLastPosition() const { return m_text->GetLastPosition(); } diff --git a/src/osx/carbon/textctrl.cpp b/src/osx/carbon/textctrl.cpp index 2a280a7526..fc47348ff9 100644 --- a/src/osx/carbon/textctrl.cpp +++ b/src/osx/carbon/textctrl.cpp @@ -238,7 +238,7 @@ public : 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 ; @@ -1113,7 +1113,7 @@ void wxMacMLTEControl::SetEditable(bool editable) TXNSetTXNObjectControls( m_txn, false, WXSIZEOF(tag), tag, data ) ; } -wxTextPos wxMacMLTEControl::GetLastPosition() const +long wxMacMLTEControl::GetLastPosition() const { wxTextPos actualsize = 0 ; diff --git a/src/osx/textctrl_osx.cpp b/src/osx/textctrl_osx.cpp index feda0352d3..9ace17a932 100644 --- a/src/osx/textctrl_osx.cpp +++ b/src/osx/textctrl_osx.cpp @@ -290,7 +290,7 @@ void wxTextCtrl::SetInsertionPoint(long pos) void wxTextCtrl::SetInsertionPointEnd() { - wxTextPos pos = GetLastPosition(); + long pos = GetLastPosition(); SetInsertionPoint( pos ); } @@ -767,7 +767,7 @@ void wxTextWidgetImpl::SetEditable(bool WXUNUSED(editable)) { } -wxTextPos wxTextWidgetImpl::GetLastPosition() const +long wxTextWidgetImpl::GetLastPosition() const { return GetStringValue().length() ; } diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp index cadecef90b..f2466b5526 100644 --- a/src/osx/window_osx.cpp +++ b/src/osx/window_osx.cpp @@ -774,8 +774,6 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) } } - menu->MacAfterDisplay( true ) ; - menu->SetInvokingWindow( NULL ); #else menu->SetInvokingWindow( NULL ); return false; diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 85635f1319..c49db6611d 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -92,7 +92,7 @@ public: 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)