cleanup

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 791f18486b380f4b770a046c89e7c79046b0b239..90ff16053b6d4e33f5a99aef19fae9ef1466afe4 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -2344,7 +2344,7 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
         case kControlFocusPrevPart:
         case kControlFocusNextPart:
             MacFocusPaneText( ( !wasFocused));
         case kControlFocusPrevPart:
         case kControlFocusNextPart:
             MacFocusPaneText( ( !wasFocused));

-            focusResult = (!wasFocused) ? kControlEditTextPart : kControlFocusNoPart;
+            focusResult = (!wasFocused) ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart;

             break;
             
         case kControlFocusNoPart:
             break;
             
         case kControlFocusNoPart:


@@ -2483,6 +2483,7 @@ static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control,
         return kControlNoPart ;
 }
 
         return kControlNoPart ;
 }
 

+/*

 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
 {
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
 static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
 {
     wxTextCtrl *textCtrl =  wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;


@@ -2490,6 +2491,7 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro
     if ( win )
         win->MacControlUserPaneBackgroundProc(info) ;
 }
     if ( win )
         win->MacControlUserPaneBackgroundProc(info) ;
 }

+*/

 #endif
 
 // TXNRegisterScrollInfoProc
 #endif
 
 // TXNRegisterScrollInfoProc

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 5c6aedcb0ef290ac3c59bf290fb80cbfec33efbf..29ad6f810d8683b8a8df1826f01dbd591ec00bd0 100644 (file)
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -247,7 +247,6 @@ void wxToolBarTool::SetPosition(const wxPoint& position)
 
     if ( ! GetToolBar()->MacGetTopLevelWindow()->MacUsesCompositing() )
     {
 
     if ( ! GetToolBar()->MacGetTopLevelWindow()->MacUsesCompositing() )
     {

-        WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetTopLevelWindowRef() ;    

         GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
         mac_x += x;
         mac_y += y;
         GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
         mac_x += x;
         mac_y += y;

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index df6c49635b33eb72e056e7ccaa74dba301840b16..396de9fd3495a1b4e786daae1345fe9147ddc312 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -1811,7 +1811,6 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
     {
         // we don't adjust twice for the origin
         Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
     {
         // we don't adjust twice for the origin
         Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;

-        bool vis = MacIsReallyShown() ;

 
         MacInvalidateBorders() ;
         
 
         MacInvalidateBorders() ;