From 02a55765c470cd56bd4e5061b6c0f2258f3dda65 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 27 Feb 2005 09:49:19 +0000 Subject: [PATCH] cleanup git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/textctrl.cpp | 4 +++- src/mac/carbon/toolbar.cpp | 1 - src/mac/carbon/window.cpp | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 791f18486b..90ff16053b 100644 --- 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)); - focusResult = (!wasFocused) ? kControlEditTextPart : kControlFocusNoPart; + focusResult = (!wasFocused) ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart; break; case kControlFocusNoPart: @@ -2483,6 +2483,7 @@ static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, return kControlNoPart ; } +/* 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) ; } +*/ #endif // TXNRegisterScrollInfoProc diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 5c6aedcb0e..29ad6f810d 100644 --- 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() ) { - WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetTopLevelWindowRef() ; 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 df6c49635b..396de9fd34 100644 --- 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 ) ; - bool vis = MacIsReallyShown() ; MacInvalidateBorders() ; -- 2.45.2