X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b7003909e204166b3cbfff52bdb2e0e567bf6d8..acc0ebd7a871124d4d6b36069340227e6c584f38:/src/mac/window.cpp?ds=sidebyside diff --git a/src/mac/window.cpp b/src/mac/window.cpp index e602f93fab..7f2c51c279 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: windows.cpp -// Purpose: wxWindow +// Purpose: wxWindowMac // Author: AUTHOR // Modified by: // Created: ??/??/98 @@ -15,6 +15,7 @@ #include "wx/setup.h" #include "wx/menu.h" +#include "wx/window.h" #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/utils.h" @@ -23,6 +24,8 @@ #include "wx/layout.h" #include "wx/dialog.h" #include "wx/listbox.h" +#include "wx/scrolbar.h" +#include "wx/statbox.h" #include "wx/button.h" #include "wx/settings.h" #include "wx/msgdlg.h" @@ -30,9 +33,7 @@ #include "wx/notebook.h" #include "wx/tabctrl.h" #include "wx/tooltip.h" -// TODO remove the line below, just for lookup-up convenience CS -#include "wx/mac/window.h" - +#include "wx/statusbr.h" #include "wx/menuitem.h" #include "wx/log.h" @@ -53,16 +54,22 @@ #include extern wxList wxPendingDelete; -wxWindow* gFocusWindow = NULL ; +wxWindowMac* gFocusWindow = NULL ; + +#ifdef __WXUNIVERSAL__ + IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase) +#else // __WXMAC__ + IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase) +#endif // __WXUNIVERSAL__/__WXMAC__ #if !USE_SHARED_LIBRARY -IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler) -BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) - EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) - EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindow::OnInitDialog) - EVT_IDLE(wxWindow::OnIdle) -// EVT_SCROLL(wxWindow::OnScroll) + +BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) + EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground) + EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged) + EVT_INIT_DIALOG(wxWindowMac::OnInitDialog) + EVT_IDLE(wxWindowMac::OnIdle) + EVT_SET_FOCUS(wxWindowMac::OnSetFocus) END_EVENT_TABLE() #endif @@ -74,21 +81,21 @@ END_EVENT_TABLE() // =========================================================================== // --------------------------------------------------------------------------- -// wxWindow utility functions +// wxWindowMac utility functions // --------------------------------------------------------------------------- // Find an item given the Macintosh Window Reference wxList *wxWinMacWindowList = NULL; -wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef) +wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef) { wxNode *node = wxWinMacWindowList->Find((long)inWindowRef); if (!node) return NULL; - return (wxWindow *)node->Data(); + return (wxWindowMac *)node->Data(); } -void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win) +void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *win) { // adding NULL WindowRef is (first) surely a result of an error and // (secondly) breaks menu command processing @@ -98,7 +105,7 @@ void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win) wxWinMacWindowList->Append((long)inWindowRef, win); } -void wxRemoveMacWindowAssociation(wxWindow *win) +void wxRemoveMacWindowAssociation(wxWindowMac *win) { wxWinMacWindowList->DeleteObject(win); } @@ -107,11 +114,15 @@ void wxRemoveMacWindowAssociation(wxWindow *win) // constructors and such // ---------------------------------------------------------------------------- -void wxWindow::Init() +WindowRef wxWindowMac::s_macWindowInUpdate = NULL; + +void wxWindowMac::Init() { // generic InitBase(); + m_macEraseOnRedraw = true ; + // MSW specific m_doubleClickAllowed = 0; m_winCaptured = FALSE; @@ -129,6 +140,7 @@ void wxWindow::Init() m_isShown = TRUE; m_macWindowData = NULL ; + m_macEraseOnRedraw = true ; m_x = 0; m_y = 0 ; @@ -144,8 +156,22 @@ void wxWindow::Init() } // Destructor -wxWindow::~wxWindow() +wxWindowMac::~wxWindowMac() { + // deleting a window while it is shown invalidates the region + if ( IsShown() ) { + wxWindowMac* iter = this ; + while( iter ) { + if ( iter->m_macWindowData ) + { + Refresh() ; + break ; + } + iter = iter->GetParent() ; + + } + } + m_isBeingDeleted = TRUE; if ( s_lastMouseWindow == this ) @@ -173,13 +199,13 @@ wxWindow::~wxWindow() } // Constructor -bool wxWindow::Create(wxWindow *parent, wxWindowID id, +bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { - wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") ); + wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") ); if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; @@ -191,17 +217,20 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING); m_width = WidthDefault( size.x ); m_height = HeightDefault( size.y ) ; - - if ( ! IsKindOf( CLASSINFO ( wxControl ) ) ) +#ifndef __WXUNIVERSAL__ + if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) ) { MacCreateScrollBars( style ) ; } - +#endif return TRUE; } -void wxWindow::SetFocus() +void wxWindowMac::SetFocus() { + if ( gFocusWindow == this ) + return ; + if ( AcceptsFocus() ) { if (gFocusWindow ) @@ -213,12 +242,14 @@ void wxWindow::SetFocus() gFocusWindow->m_caret->OnKillFocus(); } #endif // wxUSE_CARET + #ifndef __WXUNIVERSAL__ wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) { UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ; control->MacRedrawControl() ; } + #endif wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId); event.SetEventObject(gFocusWindow); gFocusWindow->GetEventHandler()->ProcessEvent(event) ; @@ -236,14 +267,15 @@ void wxWindow::SetFocus() wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); if ( panel ) { - panel->SetLastFocus(this); + panel->SetLastFocus((wxWindow*)this); } + #ifndef __WXUNIVERSAL__ wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) { UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ; } - + #endif wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event) ; @@ -251,7 +283,7 @@ void wxWindow::SetFocus() } } -bool wxWindow::Enable(bool enable) +bool wxWindowMac::Enable(bool enable) { if ( !wxWindowBase::Enable(enable) ) return FALSE; @@ -259,7 +291,7 @@ bool wxWindow::Enable(bool enable) wxWindowList::Node *node = GetChildren().GetFirst(); while ( node ) { - wxWindow *child = node->GetData(); + wxWindowMac *child = node->GetData(); child->Enable(enable); node = node->GetNext(); @@ -268,19 +300,24 @@ bool wxWindow::Enable(bool enable) return TRUE; } -void wxWindow::CaptureMouse() +void wxWindowMac::CaptureMouse() { wxTheApp->s_captureWindow = this ; } -void wxWindow::ReleaseMouse() +wxWindow* wxWindowBase::GetCapture() +{ + return wxTheApp->s_captureWindow ; +} + +void wxWindowMac::ReleaseMouse() { wxTheApp->s_captureWindow = NULL ; } #if wxUSE_DRAG_AND_DROP -void wxWindow::SetDropTarget(wxDropTarget *pDropTarget) +void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget) { if ( m_pDropTarget != 0 ) { delete m_pDropTarget; @@ -296,32 +333,36 @@ void wxWindow::SetDropTarget(wxDropTarget *pDropTarget) #endif // Old style file-manager drag&drop -void wxWindow::DragAcceptFiles(bool accept) +void wxWindowMac::DragAcceptFiles(bool accept) { // TODO } // Get total size -void wxWindow::DoGetSize(int *x, int *y) const +void wxWindowMac::DoGetSize(int *x, int *y) const { - *x = m_width ; - *y = m_height ; + if(x) *x = m_width ; + if(y) *y = m_height ; } -void wxWindow::DoGetPosition(int *x, int *y) const +void wxWindowMac::DoGetPosition(int *x, int *y) const { - *x = m_x ; - *y = m_y ; + int xx,yy; + + xx = m_x ; + yy = m_y ; if (GetParent()) { wxPoint pt(GetParent()->GetClientAreaOrigin()); - *x -= pt.x; - *y -= pt.y; + xx -= pt.x; + yy -= pt.y; } + if(x) *x = xx; + if(y) *y = yy; } - -bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) +#if wxUSE_MENUS +bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { menu->SetInvokingWindow(this); menu->UpdateUI(); @@ -335,14 +376,16 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) return TRUE; } +#endif -void wxWindow::DoScreenToClient(int *x, int *y) const +void wxWindowMac::DoScreenToClient(int *x, int *y) const { WindowRef window = GetMacRootWindow() ; - Point localwhere ; - localwhere.h = * x ; - localwhere.v = * y ; + Point localwhere = {0,0} ; + + if(x) localwhere.h = * x ; + if(y) localwhere.v = * y ; GrafPtr port ; ::GetPort( &port ) ; @@ -350,21 +393,21 @@ void wxWindow::DoScreenToClient(int *x, int *y) const ::GlobalToLocal( &localwhere ) ; ::SetPort( port ) ; - *x = localwhere.h ; - *y = localwhere.v ; + if(x) *x = localwhere.h ; + if(y) *y = localwhere.v ; MacRootWindowToClient( x , y ) ; } -void wxWindow::DoClientToScreen(int *x, int *y) const +void wxWindowMac::DoClientToScreen(int *x, int *y) const { WindowRef window = GetMacRootWindow() ; MacClientToRootWindow( x , y ) ; - Point localwhere ; - localwhere.h = * x ; - localwhere.v = * y ; + Point localwhere = { 0,0 }; + if(x) localwhere.h = * x ; + if(y) localwhere.v = * y ; GrafPtr port ; ::GetPort( &port ) ; @@ -372,49 +415,51 @@ void wxWindow::DoClientToScreen(int *x, int *y) const ::SetOrigin( 0 , 0 ) ; ::LocalToGlobal( &localwhere ) ; ::SetPort( port ) ; - *x = localwhere.h ; - *y = localwhere.v ; + if(x) *x = localwhere.h ; + if(y) *y = localwhere.v ; } -void wxWindow::MacClientToRootWindow( int *x , int *y ) const +void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const { - if ( m_macWindowData ) - { - } - else + if ( m_macWindowData == NULL) { - *x += m_x ; - *y += m_y ; + if(x) *x += m_x ; + if(y) *y += m_y ; GetParent()->MacClientToRootWindow( x , y ) ; } } -void wxWindow::MacRootWindowToClient( int *x , int *y ) const +void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const { - if ( m_macWindowData ) - { - } - else + if ( m_macWindowData == NULL) { - *x -= m_x ; - *y -= m_y ; + if(x) *x -= m_x ; + if(y) *y -= m_y ; GetParent()->MacRootWindowToClient( x , y ) ; } } -bool wxWindow::SetCursor(const wxCursor& cursor) +bool wxWindowMac::SetCursor(const wxCursor& cursor) { - if ( !wxWindowBase::SetCursor(cursor) ) - { - // no change + if (m_cursor == cursor) return FALSE; - } + + if (wxNullCursor == cursor) + { + if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) ) + return FALSE ; + } + else + { + if ( ! wxWindowBase::SetCursor( cursor ) ) + return FALSE ; + } wxASSERT_MSG( m_cursor.Ok(), wxT("cursor must be valid after call to the base version")); Point pt ; - wxWindow *mouseWin ; + wxWindowMac *mouseWin ; GetMouse( &pt ) ; // Change the cursor NOW if we're within the correct window @@ -423,7 +468,7 @@ bool wxWindow::SetCursor(const wxCursor& cursor) { if ( mouseWin == this && !wxIsBusy() ) { - cursor.MacInstall() ; + m_cursor.MacInstall() ; } } @@ -432,13 +477,14 @@ bool wxWindow::SetCursor(const wxCursor& cursor) // Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindow::DoGetClientSize(int *x, int *y) const +void wxWindowMac::DoGetClientSize(int *x, int *y) const { - *x = m_width ; - *y = m_height ; + int ww, hh; + ww = m_width ; + hh = m_height ; - *x -= 2 * MacGetBorderSize( ) ; - *y -= 2 * MacGetBorderSize( ) ; + ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; + hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) { @@ -450,8 +496,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const MacClientToRootWindow( &x1 , &y1 ) ; MacClientToRootWindow( &w , &h ) ; - WindowRef window = NULL ; - wxWindow *iter = (wxWindow*)this ; + wxWindowMac *iter = (wxWindowMac*)this ; int totW = 10000 , totH = 10000; while( iter ) @@ -468,21 +513,23 @@ void wxWindow::DoGetClientSize(int *x, int *y) const if (m_hScrollBar && m_hScrollBar->IsShown() ) { - (*y) -= MAC_SCROLLBAR_SIZE; + hh -= MAC_SCROLLBAR_SIZE; if ( h-y1 >= totH ) { - (*y)+= 1 ; + hh += 1 ; } } if (m_vScrollBar && m_vScrollBar->IsShown() ) { - (*x) -= MAC_SCROLLBAR_SIZE; + ww -= MAC_SCROLLBAR_SIZE; if ( w-x1 >= totW ) { - (*x) += 1 ; + ww += 1 ; } } } + if(x) *x = ww; + if(y) *y = hh; } @@ -492,7 +539,7 @@ void wxWindow::DoGetClientSize(int *x, int *y) const #if wxUSE_TOOLTIPS -void wxWindow::DoSetToolTip(wxToolTip *tooltip) +void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) { wxWindowBase::DoSetToolTip(tooltip); @@ -502,12 +549,20 @@ void wxWindow::DoSetToolTip(wxToolTip *tooltip) #endif // wxUSE_TOOLTIPS -void wxWindow::DoMoveWindow(int x, int y, int width, int height) +void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) { DoSetSize( x,y, width, height ) ; } -void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) +// set the size of the window: if the dimensions are positive, just use them, +// but if any of them is equal to -1, it means that we must find the value for +// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in +// which case -1 is a valid value for x and y) +// +// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate +// the width/height to best suit our contents, otherwise we reuse the current +// width/height +void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags) { int former_x = m_x ; @@ -528,11 +583,49 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) actualX = currentX; if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) actualY = currentY; - if (width == -1) + + wxSize size( -1 , -1 ) ; + + if (width == -1 || height == -1 ) + { + size = DoGetBestSize() ; + } + + if ( width == -1 ) + { + if ( sizeFlags & wxSIZE_AUTO_WIDTH ) + { + actualWidth = size.x ; + if ( actualWidth == -1 ) + actualWidth = 80 ; + } + else + { actualWidth = currentW ; + } + } if (height == -1) + { + if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) + { + actualHeight = size.y ; + if ( actualHeight == -1 ) + actualHeight = 26 ; + } + else + { actualHeight = currentH ; + } + } + if ((m_minWidth != -1) && (actualWidth < m_minWidth)) + actualWidth = m_minWidth; + if ((m_minHeight != -1) && (actualHeight < m_minHeight)) + actualHeight = m_minHeight; + if ((m_maxWidth != -1) && (actualWidth > m_maxWidth)) + actualWidth = m_maxWidth; + if ((m_maxHeight != -1) && (actualHeight > m_maxHeight)) + actualHeight = m_maxHeight; if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH) { MacRepositionScrollBars() ; // we might have a real position shift @@ -562,13 +655,12 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) else { // erase former position + wxMacDrawingHelper focus( this ) ; + if ( focus.Ok() ) { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - InvalWindowRect( GetMacRootWindow() , &clientrect ) ; - } + Rect clientrect = { 0 , 0 , m_height , m_width } ; + // ClipRect( &clientrect ) ; + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } } m_x = actualX ; @@ -583,7 +675,8 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) if ( doResize ) ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height , true); - // the OS takes care of invalidating and erasing + // the OS takes care of invalidating and erasing the new area + // we have erased the old one if ( IsKindOf( CLASSINFO( wxFrame ) ) ) { @@ -595,44 +688,49 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) else { // erase new position + { - wxMacDrawingClientHelper focus( this ) ; + wxMacDrawingHelper focus( this ) ; if ( focus.Ok() ) { Rect clientrect = { 0 , 0 , m_height , m_width } ; + // ClipRect( &clientrect ) ; InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } } + if ( doMove ) - wxWindow::MacSuperChangedPosition() ; // like this only children will be notified + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified } MacRepositionScrollBars() ; if ( doMove ) { - wxMoveEvent event(wxPoint(m_x, m_y), m_windowId); + wxPoint point(m_x, m_y); + wxMoveEvent event(point, m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event) ; } if ( doResize ) { - MacRepositionScrollBars() ; - wxSizeEvent event(wxSize(m_width, m_height), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + MacRepositionScrollBars() ; + wxSize size(m_width, m_height); + wxSizeEvent event(size, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } } } // For implementation purposes - sometimes decorations make the client area // smaller -wxPoint wxWindow::GetClientAreaOrigin() const +wxPoint wxWindowMac::GetClientAreaOrigin() const { - return wxPoint(MacGetBorderSize( ) , MacGetBorderSize( ) ); + return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) ); } // Makes an adjustment to the window position (for example, a frame that has // a toolbar that it manages itself). -void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) +void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) { if( !m_macWindowData ) { @@ -644,7 +742,7 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) } } -void wxWindow::SetTitle(const wxString& title) +void wxWindowMac::SetTitle(const wxString& title) { m_label = title ; @@ -659,12 +757,12 @@ void wxWindow::SetTitle(const wxString& title) UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; } -wxString wxWindow::GetTitle() const +wxString wxWindowMac::GetTitle() const { return m_label ; } -bool wxWindow::Show(bool show) +bool wxWindowMac::Show(bool show) { if ( !wxWindowBase::Show(show) ) return FALSE; @@ -677,7 +775,8 @@ bool wxWindow::Show(bool show) UMASelectWindow( m_macWindowData->m_macWindow ) ; // no need to generate events here, they will get them triggered by macos // actually they should be , but apparently they are not - wxSizeEvent event(wxSize(m_width, m_height), m_windowId); + wxSize size(m_width, m_height); + wxSizeEvent event(size, m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); } @@ -687,47 +786,73 @@ bool wxWindow::Show(bool show) } } MacSuperShown( show ) ; - Refresh() ; - if(m_macWindowData) - MacUpdateImmediately() ; + if ( !show ) + { + WindowRef window = GetMacRootWindow() ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win && !win->m_isBeingDeleted ) + Refresh() ; + } + else + { + Refresh() ; + } return TRUE; } -void wxWindow::MacSuperShown( bool show ) +void wxWindowMac::MacSuperShown( bool show ) { wxNode *node = GetChildren().First(); while ( node ) { - wxWindow *child = (wxWindow *)node->Data(); + wxWindowMac *child = (wxWindowMac *)node->Data(); if ( child->m_isShown ) child->MacSuperShown( show ) ; node = node->Next(); } } -int wxWindow::GetCharHeight() const +bool wxWindowMac::MacIsReallyShown() const +{ + if ( m_isShown && (m_parent != NULL) ) { + return m_parent->MacIsReallyShown(); + } + return m_isShown; +/* + bool status = m_isShown ; + wxWindowMac * win = this ; + while ( status && win->m_parent != NULL ) + { + win = win->m_parent ; + status = win->m_isShown ; + } + return status ; +*/ +} + +int wxWindowMac::GetCharHeight() const { - wxClientDC dc ( (wxWindow*)this ) ; + wxClientDC dc ( (wxWindowMac*)this ) ; return dc.GetCharHeight() ; } -int wxWindow::GetCharWidth() const +int wxWindowMac::GetCharWidth() const { - wxClientDC dc ( (wxWindow*)this ) ; + wxClientDC dc ( (wxWindowMac*)this ) ; return dc.GetCharWidth() ; } -void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, +void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, int *descent, int *externalLeading, const wxFont *theFont ) const { const wxFont *fontToUse = theFont; if ( !fontToUse ) fontToUse = &m_font; - wxClientDC dc( this ) ; + wxClientDC dc( (wxWindowMac*) this ) ; long lx,ly,ld,le ; - dc.GetTextExtent( string , &lx , &ly , &ld, &le, fontToUse ) ; + dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ; if ( externalLeading ) *externalLeading = le ; if ( descent ) @@ -738,8 +863,9 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, *y = ly ; } -void wxWindow::MacEraseBackground( Rect *rect ) +void wxWindowMac::MacEraseBackground( Rect *rect ) { +/* WindowRef window = GetMacRootWindow() ; if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) { @@ -751,7 +877,7 @@ void wxWindow::MacEraseBackground( Rect *rect ) // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have // either a non gray background color or a non control window - wxWindow* parent = GetParent() ; + wxWindowMac* parent = GetParent() ; while( parent ) { if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) @@ -792,7 +918,7 @@ void wxWindow::MacEraseBackground( Rect *rect ) for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - wxWindow *child = (wxWindow*)node->Data(); + wxWindowMac *child = (wxWindowMac*)node->Data(); Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ; SectRect( &clientrect , rect , &clientrect ) ; @@ -807,15 +933,21 @@ void wxWindow::MacEraseBackground( Rect *rect ) } } } +*/ } -void wxWindow::Refresh(bool eraseBack, const wxRect *rect) +void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) { - wxMacDrawingHelper focus( this ) ; +// if ( !IsShown() ) +// return ; + + wxMacDrawingClientHelper focus( this ) ; if ( focus.Ok() ) { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - ClipRect( &clientrect ) ; + wxPoint client ; + client = GetClientAreaOrigin( ) ; + Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ; + // ClipRect( &clientrect ) ; if ( rect ) { @@ -824,16 +956,20 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect) } InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } + if ( !eraseBack ) + m_macEraseOnRedraw = false ; + else + m_macEraseOnRedraw = true ; } // Responds to colour changes: passes event on to children. -void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event) { wxNode *node = GetChildren().First(); while ( node ) { // Only propagate to non-top-level windows - wxWindow *win = (wxWindow *)node->Data(); + wxWindowMac *win = (wxWindowMac *)node->Data(); if ( win->GetParent() ) { wxSysColourChangedEvent event2; @@ -850,36 +986,36 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) // Caret manipulation // --------------------------------------------------------------------------- -void wxWindow::CreateCaret(int w, int h) +void wxWindowMac::CreateCaret(int w, int h) { SetCaret(new wxCaret(this, w, h)); } -void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) +void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) { wxFAIL_MSG("not implemented"); } -void wxWindow::ShowCaret(bool show) +void wxWindowMac::ShowCaret(bool show) { wxCHECK_RET( m_caret, "no caret to show" ); m_caret->Show(show); } -void wxWindow::DestroyCaret() +void wxWindowMac::DestroyCaret() { SetCaret(NULL); } -void wxWindow::SetCaretPos(int x, int y) +void wxWindowMac::SetCaretPos(int x, int y) { wxCHECK_RET( m_caret, "no caret to move" ); m_caret->Move(x, y); } -void wxWindow::GetCaretPos(int *x, int *y) const +void wxWindowMac::GetCaretPos(int *x, int *y) const { wxCHECK_RET( m_caret, "no caret to get position of" ); @@ -887,24 +1023,24 @@ void wxWindow::GetCaretPos(int *x, int *y) const } #endif // wxUSE_CARET -wxWindow *wxGetActiveWindow() +wxWindowMac *wxGetActiveWindow() { // actually this is a windows-only concept return NULL; } // Coordinates relative to the window -void wxWindow::WarpPointer (int x_pos, int y_pos) +void wxWindowMac::WarpPointer (int x_pos, int y_pos) { // We really dont move the mouse programmatically under mac } -void wxWindow::OnEraseBackground(wxEraseEvent& event) +void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { // TODO : probably we would adopt the EraseEvent structure } -int wxWindow::GetScrollPos(int orient) const +int wxWindowMac::GetScrollPos(int orient) const { if ( orient == wxHORIZONTAL ) { @@ -921,7 +1057,7 @@ int wxWindow::GetScrollPos(int orient) const // This now returns the whole range, not just the number // of positions that we can scroll. -int wxWindow::GetScrollRange(int orient) const +int wxWindowMac::GetScrollRange(int orient) const { if ( orient == wxHORIZONTAL ) { @@ -936,7 +1072,7 @@ int wxWindow::GetScrollRange(int orient) const return 0; } -int wxWindow::GetScrollThumb(int orient) const +int wxWindowMac::GetScrollThumb(int orient) const { if ( orient == wxHORIZONTAL ) { @@ -951,7 +1087,7 @@ int wxWindow::GetScrollThumb(int orient) const return 0; } -void wxWindow::SetScrollPos(int orient, int pos, bool refresh) +void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) { if ( orient == wxHORIZONTAL ) { @@ -965,7 +1101,7 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) } } -void wxWindow::MacCreateRealWindow( const wxString& title, +void wxWindowMac::MacCreateRealWindow( const wxString& title, const wxPoint& pos, const wxSize& size, long style, @@ -999,8 +1135,8 @@ void wxWindow::MacCreateRealWindow( const wxString& title, // translate the window attributes in the appropriate window class and attributes - WindowClass wclass ; - WindowAttributes attr ; + WindowClass wclass = 0; + WindowAttributes attr = kWindowNoAttributes ; if ( HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) ) { @@ -1010,35 +1146,22 @@ void wxWindow::MacCreateRealWindow( const wxString& title, attr |= kWindowSideTitlebarAttribute ; } } - else if ( HasFlag( wxTHICK_FRAME ) ) + else if ( HasFlag( wxCAPTION ) ) { if ( HasFlag( wxDIALOG_MODAL ) ) { wclass = kMovableModalWindowClass ; } - else if ( HasFlag( wxDIALOG_MODELESS ) ) + else { wclass = kDocumentWindowClass ; } - else - { - if ( HasFlag( wxCAPTION ) ) - { - wclass = kDocumentWindowClass ; - } - else - { - wclass = kModalWindowClass ; - } - } } else { wclass = kModalWindowClass ; } - attr = kWindowNoAttributes ; - if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) { attr |= kWindowFullZoomAttribute ; @@ -1064,13 +1187,14 @@ void wxWindow::MacCreateRealWindow( const wxString& title, UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ; m_macWindowData->m_macFocus = NULL ; + m_macWindowData->m_macHasReceivedFirstActivate = true ; } -void wxWindow::MacPaint( wxPaintEvent &event ) +void wxWindowMac::MacPaint( wxPaintEvent &event ) { } -void wxWindow::MacPaintBorders( ) +void wxWindowMac::MacPaintBorders( ) { if( m_macWindowData ) return ; @@ -1184,7 +1308,7 @@ void wxWindow::MacPaintBorders( ) } // New function that will replace some of the above. -void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, +void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) { if ( orient == wxHORIZONTAL ) @@ -1200,7 +1324,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, { if ( !m_hScrollBar->IsShown() ) m_hScrollBar->Show(true) ; - m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; + m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } } } @@ -1217,7 +1341,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, { if ( !m_vScrollBar->IsShown() ) m_vScrollBar->Show(true) ; - m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; + m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } } } @@ -1225,7 +1349,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, } // Does a physical scroll -void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) +void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { wxMacDrawingClientHelper focus( this ) ; if ( focus.Ok() ) @@ -1249,7 +1373,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - wxWindow *child = (wxWindow*)node->Data(); + wxWindowMac *child = (wxWindowMac*)node->Data(); if (child == m_vScrollBar) continue; if (child == m_hScrollBar) continue; if (child->IsTopLevel()) continue; @@ -1262,7 +1386,7 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) } -void wxWindow::MacOnScroll(wxScrollEvent &event ) +void wxWindowMac::MacOnScroll(wxScrollEvent &event ) { if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) { @@ -1297,7 +1421,7 @@ void wxWindow::MacOnScroll(wxScrollEvent &event ) } } -bool wxWindow::SetFont(const wxFont& font) +bool wxWindowMac::SetFont(const wxFont& font) { if ( !wxWindowBase::SetFont(font) ) { @@ -1309,7 +1433,7 @@ bool wxWindow::SetFont(const wxFont& font) } // Get the window with the focus -wxWindow *wxWindowBase::FindFocus() +wxWindowMac *wxWindowBase::FindFocus() { return gFocusWindow ; } @@ -1318,7 +1442,7 @@ wxWindow *wxWindowBase::FindFocus() // If nothing defined for this, try the parent. // E.g. we may be a button loaded from a resource, with no callback function // defined. -void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event) +void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event) { if ( GetEventHandler()->ProcessEvent(event) ) return; @@ -1328,7 +1452,7 @@ void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event) #endif // WXWIN_COMPATIBILITY_2 #if WXWIN_COMPATIBILITY -wxObject* wxWindow::GetChild(int number) const +wxObject* wxWindowMac::GetChild(int number) const { // Return a pointer to the Nth object in the Panel wxNode *node = GetChildren().First(); @@ -1345,7 +1469,31 @@ wxObject* wxWindow::GetChild(int number) const } #endif // WXWIN_COMPATIBILITY -void wxWindow::Clear() +void wxWindowMac::OnSetFocus(wxFocusEvent& event) +{ + // panel wants to track the window which was the last to have focus in it, + // so we want to set ourselves as the window which last had focus + // + // notice that it's also important to do it upwards the tree becaus + // otherwise when the top level panel gets focus, it won't set it back to + // us, but to some other sibling + wxWindowMac *win = this; + while ( win ) + { + wxWindowMac *parent = win->GetParent(); + wxPanel *panel = wxDynamicCast(parent, wxPanel); + if ( panel ) + { + panel->SetLastFocus(win); + } + + win = parent; + } + + event.Skip(); +} + +void wxWindowMac::Clear() { if ( m_macWindowData ) { @@ -1367,13 +1515,13 @@ void wxWindow::Clear() } // Setup background and foreground colours correctly -void wxWindow::SetupColours() +void wxWindowMac::SetupColours() { if ( GetParent() ) SetBackgroundColour(GetParent()->GetBackgroundColour()); } -void wxWindow::OnIdle(wxIdleEvent& event) +void wxWindowMac::OnIdle(wxIdleEvent& event) { /* // Check if we need to send a LEAVE event @@ -1396,18 +1544,24 @@ void wxWindow::OnIdle(wxIdleEvent& event) } // Raise the window to the top of the Z order -void wxWindow::Raise() +void wxWindowMac::Raise() { - // TODO + if ( m_macWindowData ) + { + UMABringToFront( m_macWindowData->m_macWindow ) ; + } } // Lower the window to the bottom of the Z order -void wxWindow::Lower() +void wxWindowMac::Lower() { - // TODO + if ( m_macWindowData ) + { + UMASendBehind( m_macWindowData->m_macWindow , NULL ) ; + } } -void wxWindow::DoSetClientSize(int width, int height) +void wxWindowMac::DoSetClientSize(int width, int height) { if ( width != -1 || height != -1 ) { @@ -1417,17 +1571,17 @@ void wxWindow::DoSetClientSize(int width, int height) if ( height != -1 && m_vScrollBar ) height += MAC_SCROLLBAR_SIZE ; - width += 2 * MacGetBorderSize( ) ; - height += 2 * MacGetBorderSize( ) ; + width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; + height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; DoSetSize( -1 , -1 , width , height ) ; } } -wxWindow* wxWindow::s_lastMouseWindow = NULL ; +wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ; -bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) +bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) { if ((point.x < m_x) || (point.y < m_y) || (point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) @@ -1442,8 +1596,9 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - wxWindow *child = (wxWindow*)node->Data(); - if ( child->GetMacRootWindow() == window ) + wxWindowMac *child = (wxWindowMac*)node->Data(); + // added the m_isShown test --dmazzoni + if ( child->GetMacRootWindow() == window && child->m_isShown ) { if (child->MacGetWindowFromPointSub(newPoint , outWin )) return TRUE; @@ -1454,23 +1609,26 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi return TRUE; } -bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin ) +bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) { WindowRef window ; Point pt = { screenpoint.y , screenpoint.x } ; if ( ::FindWindow( pt , &window ) == 3 ) { wxPoint point( screenpoint ) ; - wxWindow* win = wxFindWinFromMacWindow( window ) ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win ) + { win->ScreenToClient( point ) ; return win->MacGetWindowFromPointSub( point , outWin ) ; } + } return FALSE ; } extern int wxBusyCursorCount ; -bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) +bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event) { if ((event.m_x < m_x) || (event.m_y < m_y) || (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height))) @@ -1490,7 +1648,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - wxWindow *child = (wxWindow*)node->Data(); + wxWindowMac *child = (wxWindowMac*)node->Data(); if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() ) { if (child->MacDispatchMouseEvent(event)) @@ -1505,6 +1663,13 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) { m_cursor.MacInstall() ; } + + if ( event.GetEventType() == wxEVT_LEFT_DOWN ) + { + // set focus to this window + if (AcceptsFocus() && FindFocus()!=this) + SetFocus(); + } #if wxUSE_TOOLTIPS if ( event.GetEventType() == wxEVT_MOTION @@ -1519,7 +1684,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) Point lastWhere ; long lastWhen = 0 ; -wxString wxWindow::MacGetToolTipString( wxPoint &pt ) +wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) { if ( m_tooltip ) { @@ -1527,7 +1692,7 @@ wxString wxWindow::MacGetToolTipString( wxPoint &pt ) } return "" ; } -void wxWindow::MacFireMouseEvent( EventRecord *ev ) +void wxWindowMac::MacFireMouseEvent( EventRecord *ev ) { wxMouseEvent event(wxEVT_LEFT_DOWN); bool isDown = !(ev->modifiers & btnState) ; // 1 is for up @@ -1580,8 +1745,12 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev ) else event.SetEventType(wxEVT_LEFT_DCLICK ) ; } + lastWhen = 0 ; + } + else + { + lastWhen = ev->when ; } - lastWhen = ev->when ; lastWhere = localwhere ; } @@ -1622,14 +1791,13 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev ) } } -void wxWindow::MacMouseDown( EventRecord *ev , short part) +void wxWindowMac::MacMouseDown( EventRecord *ev , short part) { MacFireMouseEvent( ev ) ; } -void wxWindow::MacMouseUp( EventRecord *ev , short part) +void wxWindowMac::MacMouseUp( EventRecord *ev , short part) { - WindowPtr frontWindow ; switch (part) { case inContent: @@ -1640,9 +1808,8 @@ void wxWindow::MacMouseUp( EventRecord *ev , short part) } } -void wxWindow::MacMouseMoved( EventRecord *ev , short part) +void wxWindowMac::MacMouseMoved( EventRecord *ev , short part) { - WindowPtr frontWindow ; switch (part) { case inContent: @@ -1652,22 +1819,30 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part) break ; } } -void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating ) +void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating ) { - wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating); + if ( !m_macWindowData->m_macHasReceivedFirstActivate ) + m_macWindowData->m_macHasReceivedFirstActivate = true ; + + wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); event.m_timeStamp = ev->when ; event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); + Refresh(false) ; UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ; +// MacUpdateImmediately() ; } -void wxWindow::MacRedraw( RgnHandle updatergn , long time) +void wxWindowMac::MacRedraw( RgnHandle updatergn , long time) { // updatergn is always already clipped to our boundaries WindowRef window = GetMacRootWindow() ; - wxWindow* win = wxFindWinFromMacWindow( window ) ; + // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children + RgnHandle ownUpdateRgn = NewRgn() ; + CopyRgn( updatergn , ownUpdateRgn ) ; + { wxMacDrawingHelper focus( this ) ; // was client if ( focus.Ok() ) @@ -1687,7 +1862,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) // either a non gray background color or a non control window - wxWindow* parent = GetParent() ; + wxWindowMac* parent = GetParent() ; while( parent ) { if ( parent->GetMacRootWindow() != window ) @@ -1731,23 +1906,45 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) { RGBBackColor( &m_backgroundColour.GetPixel()) ; } + // subtract all non transparent children from updatergn + + RgnHandle childarea = NewRgn() ; + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + // eventually test for transparent windows + if ( child->GetMacRootWindow() == window && child->IsShown() ) + { + if ( child->GetBackgroundColour() != m_backgroundColour && !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() ) + { + SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; + DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ; + } + } + } + DisposeRgn( childarea ) ; + if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() ) eraseBackground = true ; - SetClip( updatergn ) ; - if ( eraseBackground ) - { - EraseRgn( updatergn ) ; - } + SetClip( ownUpdateRgn ) ; + if ( m_macEraseOnRedraw ) { + if ( eraseBackground ) + { + EraseRgn( ownUpdateRgn ) ; + } + } + else { + m_macEraseOnRedraw = true ; + } } - m_macUpdateRgn = updatergn ; { RgnHandle newupdate = NewRgn() ; wxSize point = GetClientSize() ; wxPoint origin = GetClientAreaOrigin() ; SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ; - SectRgn( newupdate , m_macUpdateRgn , newupdate ) ; + SectRgn( newupdate , ownUpdateRgn , newupdate ) ; OffsetRgn( newupdate , -origin.x , -origin.y ) ; m_updateRegion = newupdate ; DisposeRgn( newupdate ) ; @@ -1765,9 +1962,9 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - wxWindow *child = (wxWindow*)node->Data(); + wxWindowMac *child = (wxWindowMac*)node->Data(); SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; - SectRgn( childupdate , m_macUpdateRgn , childupdate ) ; + SectRgn( childupdate , updatergn , childupdate ) ; OffsetRgn( childupdate , -child->m_x , -child->m_y ) ; if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) ) { @@ -1779,12 +1976,12 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) // eventually a draw grow box here } -void wxWindow::MacUpdateImmediately() +void wxWindowMac::MacUpdateImmediately() { WindowRef window = GetMacRootWindow() ; if ( window ) { - wxWindow* win = wxFindWinFromMacWindow( window ) ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; #if TARGET_CARBON AGAPortHelper help( GetWindowPort(window) ) ; #else @@ -1801,7 +1998,7 @@ void wxWindow::MacUpdateImmediately() GetPortVisibleRegion( GetWindowPort( window ), region ); // if windowshade gives incompatibility , take the follwing out - if ( !EmptyRgn( region ) ) + if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate ) { win->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ; } @@ -1812,10 +2009,10 @@ void wxWindow::MacUpdateImmediately() } } -void wxWindow::MacUpdate( EventRecord *ev ) +void wxWindowMac::MacUpdate( EventRecord *ev ) { WindowRef window = (WindowRef) ev->message ; - wxWindow * win = wxFindWinFromMacWindow( window ) ; + wxWindowMac * win = wxFindWinFromMacWindow( window ) ; #if TARGET_CARBON AGAPortHelper help( GetWindowPort(window) ) ; #else @@ -1832,7 +2029,7 @@ void wxWindow::MacUpdate( EventRecord *ev ) GetPortVisibleRegion( GetWindowPort( window ), region ); // if windowshade gives incompatibility , take the follwing out - if ( !EmptyRgn( region ) ) + if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate ) { MacRedraw( region , ev->when ) ; } @@ -1842,10 +2039,9 @@ void wxWindow::MacUpdate( EventRecord *ev ) EndUpdate( window ) ; } -WindowRef wxWindow::GetMacRootWindow() const +WindowRef wxWindowMac::GetMacRootWindow() const { - WindowRef window = NULL ; - wxWindow *iter = (wxWindow*)this ; + wxWindowMac *iter = (wxWindowMac*)this ; while( iter ) { @@ -1858,7 +2054,7 @@ WindowRef wxWindow::GetMacRootWindow() const return NULL ; } -void wxWindow::MacCreateScrollBars( long style ) +void wxWindowMac::MacCreateScrollBars( long style ) { wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ; @@ -1897,7 +2093,7 @@ void wxWindow::MacCreateScrollBars( long style ) MacRepositionScrollBars() ; // we might have a real position shift } -void wxWindow::MacRepositionScrollBars() +void wxWindowMac::MacRepositionScrollBars() { bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ; @@ -1907,8 +2103,8 @@ void wxWindow::MacRepositionScrollBars() int width = m_width ; int height = m_height ; - width -= 2 * MacGetBorderSize() ; - height -= 2 * MacGetBorderSize() ; + width -= MacGetLeftBorderSize() + MacGetRightBorderSize(); + height -= MacGetTopBorderSize() + MacGetBottomBorderSize(); wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ; wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ; @@ -1923,8 +2119,7 @@ void wxWindow::MacRepositionScrollBars() MacClientToRootWindow( &x , &y ) ; MacClientToRootWindow( &w , &h ) ; - WindowRef window = NULL ; - wxWindow *iter = (wxWindow*)this ; + wxWindowMac *iter = (wxWindowMac*)this ; int totW = 10000 , totH = 10000; while( iter ) @@ -1972,18 +2167,18 @@ void wxWindow::MacRepositionScrollBars() } } -void wxWindow::MacKeyDown( EventRecord *ev ) +void wxWindowMac::MacKeyDown( EventRecord *ev ) { } -bool wxWindow::AcceptsFocus() const +bool wxWindowMac::AcceptsFocus() const { return MacCanFocus() && wxWindowBase::AcceptsFocus(); } -ControlHandle wxWindow::MacGetContainerForEmbedding() +ControlHandle wxWindowMac::MacGetContainerForEmbedding() { if ( m_macWindowData ) return m_macWindowData->m_macRootControl ; @@ -1991,70 +2186,20 @@ ControlHandle wxWindow::MacGetContainerForEmbedding() return GetParent()->MacGetContainerForEmbedding() ; } -void wxWindow::MacSuperChangedPosition() +void wxWindowMac::MacSuperChangedPosition() { // only window-absolute structures have to be moved i.e. controls wxNode *node = GetChildren().First(); while ( node ) { - wxWindow *child = (wxWindow *)node->Data(); + wxWindowMac *child = (wxWindowMac *)node->Data(); child->MacSuperChangedPosition() ; node = node->Next(); } } -/* - -bool wxWindow::MacSetupFocusPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; -} -bool wxWindow::MacSetupFocusClientPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; -} - -bool wxWindow::MacSetupDrawingPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; -} - -bool wxWindow::MacSetupDrawingClientPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; -} -*/ - -bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) +bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) { if ( window == NULL ) return false ; @@ -2072,7 +2217,7 @@ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & cl return true; } -bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) +bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) { if ( window == NULL ) return false ; @@ -2097,7 +2242,7 @@ bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & return true; } -void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin) +void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) { if ( m_macWindowData ) { @@ -2127,7 +2272,7 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w } } -void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) +void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) { // int width , height ; // GetClientSize( &width , &height ) ; @@ -2162,7 +2307,7 @@ void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, Wind } } -void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) +void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) { MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ; @@ -2183,7 +2328,7 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window SectRect(clipRect, &myClip, clipRect); } -long wxWindow::MacGetBorderSize( ) const +long wxWindowMac::MacGetLeftBorderSize( ) const { if( m_macWindowData ) return 0 ; @@ -2203,48 +2348,79 @@ long wxWindow::MacGetBorderSize( ) const return 0 ; } -long wxWindow::MacRemoveBordersFromStyle( long style ) +long wxWindowMac::MacGetRightBorderSize( ) const { - return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; + if( m_macWindowData ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + return 3 ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + return 3 ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 3 ; + } + return 0 ; } -/* -wxMacFocusHelper::wxMacFocusHelper( wxWindow * theWindow ) + +long wxWindowMac::MacGetTopBorderSize( ) const { - m_ok = false ; - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - m_currentPort = NULL ; - GetPort( &m_formerPort ) ; - if ( theWindow ) - { - - theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - m_currentPort = UMAGetWindowPort( window ) ; - theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; - m_ok = true ; - } + if( m_macWindowData ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + return 2 ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + return 2 ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 1 ; + } + return 0 ; } - -wxMacFocusHelper::~wxMacFocusHelper() + +long wxWindowMac::MacGetBottomBorderSize( ) const { - if ( m_ok ) - { - SetPort( m_currentPort ) ; - SetOrigin( 0 , 0 ) ; - } - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; + if( m_macWindowData ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + return 3 ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + return 3 ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 3 ; + } + return 0 ; } -*/ -wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) + +long wxWindowMac::MacRemoveBordersFromStyle( long style ) +{ + return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; +} + + +wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) { m_ok = false ; Point localOrigin ; Rect clipRect ; WindowRef window ; - wxWindow *rootwin ; + wxWindowMac *rootwin ; m_currentPort = NULL ; GetPort( &m_formerPort ) ; @@ -2275,46 +2451,14 @@ wxMacDrawingHelper::~wxMacDrawingHelper() if ( m_formerPort != m_currentPort ) SetPort( m_formerPort ) ; } -/* -wxMacFocusClientHelper::wxMacFocusClientHelper( wxWindow * theWindow ) -{ - m_ok = false ; - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - m_currentPort = NULL ; - - GetPort( &m_formerPort ) ; - - if ( theWindow ) - { - theWindow->MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; - m_currentPort = UMAGetWindowPort( window ) ; - theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; - m_ok = true ; - } -} - -wxMacFocusClientHelper::~wxMacFocusClientHelper() -{ - if ( m_ok ) - { - SetPort( m_currentPort ) ; - SetOrigin( 0 , 0 ) ; - } - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; -} -*/ -wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) +wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) { m_ok = false ; Point localOrigin ; Rect clipRect ; WindowRef window ; - wxWindow *rootwin ; + wxWindowMac *rootwin ; m_currentPort = NULL ; GetPort( &m_formerPort ) ; @@ -2347,12 +2491,12 @@ wxMacDrawingClientHelper::~wxMacDrawingClientHelper() SetPort( m_formerPort ) ; } -// Find the wxWindow at the current mouse position, returning the mouse +// Find the wxWindowMac at the current mouse position, returning the mouse // position. -wxWindow* wxFindWindowAtPointer(wxPoint& pt) +wxWindowMac* wxFindWindowAtPointer(wxPoint& pt) { pt = wxGetMousePosition(); - wxWindow* found = wxFindWindowAtPoint(pt); + wxWindowMac* found = wxFindWindowAtPoint(pt); return found; }