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

cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-27 09:49:19 +00:00
parent 789ae0cfa2
commit 02a55765c4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2344,7 +2344,7 @@ wxInt16 wxMacMLTEClassicControl::MacControlUserPaneFocusProc(wxInt16 action)
case kControlFocusPrevPart: case kControlFocusPrevPart:
case kControlFocusNextPart: case kControlFocusNextPart:
MacFocusPaneText( ( !wasFocused)); MacFocusPaneText( ( !wasFocused));
focusResult = (!wasFocused) ? kControlEditTextPart : kControlFocusNoPart; focusResult = (!wasFocused) ? (ControlPartCode) kControlEditTextPart : (ControlPartCode) kControlFocusNoPart;
break; break;
case kControlFocusNoPart: case kControlFocusNoPart:
@@ -2483,6 +2483,7 @@ static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control,
return kControlNoPart ; return kControlNoPart ;
} }
/*
static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info) static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
{ {
wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ; wxTextCtrl *textCtrl = wxDynamicCast( wxFindControlFromMacControl(control) , wxTextCtrl ) ;
@@ -2490,6 +2491,7 @@ static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, Contro
if ( win ) if ( win )
win->MacControlUserPaneBackgroundProc(info) ; win->MacControlUserPaneBackgroundProc(info) ;
} }
*/
#endif #endif
// TXNRegisterScrollInfoProc // TXNRegisterScrollInfoProc

1
src/mac/carbon/toolbar.cpp
View File

@@ -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 ) ; GetToolBar()->MacWindowToRootWindow( &x , &y ) ;
mac_x += x; mac_x += x;
mac_y += y; mac_y += y;

1
src/mac/carbon/window.cpp
View File

@@ -1811,7 +1811,6 @@ void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{ {
// we don't adjust twice for the origin // we don't adjust twice for the origin
Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ; Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
bool vis = MacIsReallyShown() ;
MacInvalidateBorders() ; MacInvalidateBorders() ;