Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor...

[wxWidgets.git] / src / mac / carbon / textctrl.cpp

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 70bbef2d7a5d4c419c4ed530048cac8eba262134..7e06fb7eda1947fdf7148e9e8b3657b6d6b9679e 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -23,6 +23,8 @@
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/button.h"
     #include "wx/menu.h"
     #include "wx/settings.h"

+    #include "wx/msgdlg.h"
+    #include "wx/toplevel.h"

 #endif
 
 #ifdef __DARWIN__
 #endif
 
 #ifdef __DARWIN__


@@ -32,8 +34,6 @@
     #include <stat.h>
 #endif
 
     #include <stat.h>
 #endif
 

-#include "wx/msgdlg.h"
-

 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>


@@ -42,7 +42,6 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#include "wx/toplevel.h"

 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 
 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 


@@ -1019,6 +1018,7 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
     }
 
     if ( ( key >= 0x20 && key < WXK_START ) ||
     }
 
     if ( ( key >= 0x20 && key < WXK_START ) ||

+         ( key >= WXK_NUMPAD0 && key <= WXK_DIVIDE ) ||

          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)
          key == WXK_RETURN ||
          key == WXK_DELETE ||
          key == WXK_BACK)


@@ -1555,7 +1555,7 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     if ( value )
     {
         wxMacCFStringHolder cf(value) ;
     if ( value )
     {
         wxMacCFStringHolder cf(value) ;

-        textLength = cf.AsString().Length() ;
+        textLength = cf.AsString().length() ;

     }
 
     if ((from == -1) && (to == -1))
     }
 
     if ((from == -1) && (to == -1))


@@ -1589,6 +1589,7 @@ void wxMacUnicodeTextControl::WriteText( const wxString& str )
         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
     }
         CFStringRef value = cf ;
         SetData<CFStringRef>( 0, kControlEditTextInsertCFStringRefTag, &value );
     }

+    else

 #endif
     {
         wxString val = GetStringValue() ;
 #endif
     {
         wxString val = GetStringValue() ;


@@ -2209,7 +2210,7 @@ void wxMacMLTEControl::SetTXNData( const wxString& st, TXNOffset start, TXNOffse
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2
 {
 #if wxUSE_UNICODE
 #if SIZEOF_WCHAR_T == 2

-    size_t len = st.Len() ;
+    size_t len = st.length() ;

     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
 #else
     wxMBConvUTF16 converter ;
     TXNSetData( m_txn, kTXNUnicodeTextData, (void*)st.wc_str(), len * 2, start, end );
 #else
     wxMBConvUTF16 converter ;