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 2edb5c0a07305e586aa348399c1f14be2ed727d5..92e971a0190e59251f337d60385e253f72ab9c89 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1839,7 +1839,7 @@ wxString wxMacMLTEControl::GetLineText(long lineNo) const
             currentHeight += lineHeight;
         }
         
             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);
                     
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);
                     


@@ -1878,7 +1878,7 @@ int  wxMacMLTEControl::GetLineLength(long lineNo) const
             currentHeight += lineHeight;
         }
         
             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);
                     
         TXNOffset theOffset;
         TXNPointToOffset(m_txn, thePoint, &theOffset);
                     

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 23472b4bf8bbc9577f767277a1cf082001dbe075..d41ae760f042f007907aef794a75fc58b2647a84 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -49,6 +49,9 @@
 
 #include <ToolUtils.h>
 
 
 #include <ToolUtils.h>
 

+//For targeting OSX
+#include "wx/mac/private.h"
+

 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------


@@ -983,7 +986,7 @@ void  wxTopLevelWindowMac::MacCreateRealWindow( const wxString& title,
     {
         wclass = kDocumentWindowClass ;
     }
     {
         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;
     else if ( HasFlag( wxFRAME_DRAWER ) )
     {
         wclass = kDrawerWindowClass;