From: Ryan Norton <wxprojects@comcast.net>
Date: Sun, 26 Sep 2004 09:14:58 +0000 (+0000)
Subject: Fix some of vadim's compilation problems
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/eab19a7c793d452734e0f7ecbc10694a7bdfb3da

Fix some of vadim's compilation problems


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 2edb5c0a07..92e971a019 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1839,7 +1839,7 @@ wxString wxMacMLTEControl::GetLineText(long lineNo) const
             currentHeight += lineHeight;
         }
         
-        Point thePoint = { firstPoint.v + Fix2Long(currentHeight), firstPoint.h + Fix2Long(0) };
+        Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);
                     
@@ -1878,7 +1878,7 @@ int  wxMacMLTEControl::GetLineLength(long lineNo) const
             currentHeight += lineHeight;
         }
         
-        Point thePoint = { firstPoint.v + Fix2Long(currentHeight), firstPoint.h + Fix2Long(0) };
+        Point thePoint = { firstPoint.v + (currentHeight >> 16), firstPoint.h + (0) };
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);
                     
diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 23472b4bf8..d41ae760f0 100644
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -49,6 +49,9 @@
 
 #include <ToolUtils.h>
 
+//For targeting OSX
+#include "wx/mac/private.h"
+
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -983,7 +986,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     {
         wclass = kDocumentWindowClass ;
     }
-#if ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
+#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX && ( MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2 )
     else if ( HasFlag( wxFRAME_DRAWER ) )
     {
         wclass = kDrawerWindowClass;