X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad604d0f8d50abf9f3a7b844f90c9a039ab0e348..344ff08345eba81fcdcc55dd711ce6bc4bb747a3:/src/mac/carbon/textctrl.cpp?ds=sidebyside

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index e1aad6cff3..42a7d30c28 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -22,6 +22,8 @@
     #include "wx/dc.h"
     #include "wx/button.h"
     #include "wx/menu.h"
+    #include "wx/settings.h"
+    #include "wx/msgdlg.h"
 #endif
 
 #ifdef __DARWIN__
@@ -31,8 +33,6 @@
     #include <stat.h>
 #endif
 
-#include "wx/msgdlg.h"
-
 #if wxUSE_STD_IOSTREAM
     #if wxUSE_IOSTREAMH
         #include <fstream.h>
@@ -42,7 +42,6 @@
 #endif
 
 #include "wx/toplevel.h"
-#include "wx/settings.h"
 #include "wx/filefn.h"
 #include "wx/sysopt.h"
 
@@ -202,7 +201,7 @@ public :
 
     virtual bool SetupCursor( const wxPoint& pt )
     { return false ; }
-    
+
     virtual void Clear() ;
     virtual bool CanUndo() const;
     virtual void Undo() ;
@@ -307,7 +306,7 @@ public :
                              const wxPoint& pos,
                              const wxSize& size, long style ) ;
     ~wxMacMLTEHIViewControl() ;
-    
+
     virtual OSStatus SetFocus( ControlFocusPart focusPart ) ;
     virtual bool HasFocus() const ;
     virtual void SetBackground( const wxBrush &brush) ;
@@ -1382,7 +1381,7 @@ static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerC
     OSStatus result = eventNotHandledErr ;
     wxMacUnicodeTextControl* focus = (wxMacUnicodeTextControl*) data ;
     wxMacCarbonEvent cEvent( event ) ;
-    
+
     switch ( GetEventKind( event ) )
     {
         case kEventControlSetFocusPart :
@@ -1404,20 +1403,20 @@ static pascal OSStatus wxMacUnicodeTextControlControlEventHandler( EventHandlerC
         default:
             break ;
     }
-    
+
     return result ;
 }
 
 static pascal OSStatus wxMacUnicodeTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
-    
+
     switch ( GetEventClass( event ) )
     {
         case kEventClassControl :
             result = wxMacUnicodeTextControlControlEventHandler( handler , event , data ) ;
             break ;
-            
+
         default :
             break ;
     }
@@ -1539,7 +1538,7 @@ void wxMacUnicodeTextControl::GetSelection( long* from, long* to ) const
         verify_noerr( GetData<ControlEditTextSelectionRec>( 0, kControlEditTextSelectionTag, &sel ) ) ;
     else
         sel = m_selection ;
-    
+
     if ( from )
         *from = sel.selStart ;
     if ( to )
@@ -1561,7 +1560,7 @@ void wxMacUnicodeTextControl::SetSelection( long from , long to )
     if ((from == -1) && (to == -1))
     {
         from = 0 ;
-        to = textLength ; 
+        to = textLength ;
     }
     else
     {
@@ -1855,7 +1854,7 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
                 | kTXNSupportSpellCheckCommandUpdating
                 | kTXNSupportFontCommandProcessing
                 | kTXNSupportFontCommandUpdating;
-            
+
             TXNSetCommandEventSupport( m_txn , options ) ;
         }
     }
@@ -1881,7 +1880,7 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
     if ( style.HasFont() )
     {
         const wxFont &font = style.GetFont() ;
-                
+
 #if 0 // old version
         Str255 fontName = "\pMonaco" ;
         SInt16 fontSize = 12 ;
@@ -3012,7 +3011,7 @@ OSStatus wxMacMLTEClassicControl::DoCreate()
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
 
 // tiger multi-line textcontrols with no CR in the entire content
-// don't scroll automatically, so we need a hack. 
+// don't scroll automatically, so we need a hack.
 // This attempt only works 'before' the key (ie before CallNextEventHandler)
 // is processed, thus the scrolling always occurs one character too late, but
 // better than nothing ...
@@ -3021,12 +3020,12 @@ static const EventTypeSpec eventList[] =
 {
     { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
 } ;
-    
+
 static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
     wxMacMLTEHIViewControl* focus = (wxMacMLTEHIViewControl*) data ;
-    
+
     switch ( GetEventKind( event ) )
     {
         case kEventTextInputUnicodeForKeyEvent :
@@ -3044,20 +3043,20 @@ static pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler
         default:
             break ;
     }
-    
+
     return result ;
 }
 
 static pascal OSStatus wxMacTextControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
 {
     OSStatus result = eventNotHandledErr ;
-    
+
     switch ( GetEventClass( event ) )
     {
         case kEventClassTextInput :
             result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
             break ;
-            
+
         default :
             break ;
     }