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

Fix some of vadim's compilation problems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2004-09-26 09:14:58 +00:00
parent 2e7573f70e
commit eab19a7c79
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/textctrl.cpp
View File

@@ -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; TXNOffset theOffset;
TXNPointToOffset(m_txn, thePoint, &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; TXNOffset theOffset;
TXNPointToOffset(m_txn, thePoint, &theOffset); TXNPointToOffset(m_txn, thePoint, &theOffset);

5
src/mac/carbon/toplevel.cpp
View File

@@ -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 ) ) else if ( HasFlag( wxFRAME_DRAWER ) )
{ {
wclass = kDrawerWindowClass; wclass = kDrawerWindowClass;