X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..6d9022fe3bb50a75b9b5eaf5cf32558e518ba310:/src/mac/window.cpp diff --git a/src/mac/window.cpp b/src/mac/window.cpp index e8015acc3b..fd36642550 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: windows.cpp -// Purpose: wxWindow +// Purpose: wxWindowMac // Author: AUTHOR // Modified by: // Created: ??/??/98 // RCS-ID: $Id$ // Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -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,23 +24,32 @@ #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" #include "wx/frame.h" #include "wx/notebook.h" #include "wx/tabctrl.h" -// TODO remove the line below, just for lookup-up convenience CS -#include "wx/mac/window.h" - +#include "wx/tooltip.h" +#include "wx/statusbr.h" #include "wx/menuitem.h" #include "wx/log.h" +#if wxUSE_CARET + #include "wx/caret.h" +#endif // wxUSE_CARET + #define wxWINDOW_HSCROLL 5998 #define wxWINDOW_VSCROLL 5997 #define MAC_SCROLLBAR_SIZE 16 -#include +#include "wx/mac/uma.h" +#ifndef __DARWIN__ +#include +#include +#endif #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" @@ -48,299 +58,227 @@ #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_CHAR(wxWindow::OnChar) - EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground) - EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) - EVT_INIT_DIALOG(wxWindow::OnInitDialog) - EVT_IDLE(wxWindow::OnIdle) - EVT_PAINT(wxWindow::OnPaint) + +BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase) + EVT_NC_PAINT(wxWindowMac::OnNcPaint) + 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 +#define wxMAC_DEBUG_REDRAW 0 +#ifndef wxMAC_DEBUG_REDRAW +#define wxMAC_DEBUG_REDRAW 0 +#endif -// Constructor -wxWindow::wxWindow() -{ - Init() ; -} - -void wxWindow::Init() -{ - m_macWindowData = NULL ; - m_isWindow = TRUE; - m_x = 0; - m_y = 0 ; - m_width = 0 ; - m_height = 0 ; - // these are the defaults for MSW - m_macShown = true ; - m_macEnabled = true ; - // Generic - m_windowId = 0; - m_windowStyle = 0; - m_windowParent = NULL; - m_windowEventHandler = this; - m_windowName = ""; - m_windowCursor = *wxSTANDARD_CURSOR; - m_children = new wxWindowList; - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; - m_windowSizer = NULL; - m_sizerParent = NULL; - m_autoLayout = FALSE; - m_windowValidator = NULL; - m_defaultItem = NULL; - m_returnCode = 0; - m_caretWidth = 0; m_caretHeight = 0; - m_caretEnabled = FALSE; - m_caretShown = FALSE; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ; - // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ; - m_foregroundColour = *wxBLACK; - m_hScrollBar = NULL ; - m_vScrollBar = NULL ; - m_mouseInWindow = FALSE; +#define wxMAC_USE_THEME_BORDER 0 -#if wxUSE_DRAG_AND_DROP - m_pDropTarget = NULL; -#endif -} -// Destructor -wxWindow::~wxWindow() -{ - if ( s_lastMouseWindow == this ) - { - s_lastMouseWindow = NULL ; - } - // Have to delete constraints/sizer FIRST otherwise - // sizers may try to look at deleted windows as they - // delete themselves. -#if wxUSE_CONSTRAINTS - DeleteRelatedConstraints(); - if (m_constraints) - { - // This removes any dangling pointers to this window - // in other windows' constraintsInvolvedIn lists. - UnsetConstraints(m_constraints); - delete m_constraints; - m_constraints = NULL; - } - if (m_windowSizer) - { - delete m_windowSizer; - m_windowSizer = NULL; - } - // If this is a child of a sizer, remove self from parent - if (m_sizerParent) - m_sizerParent->RemoveChild((wxWindow *)this); -#endif +// =========================================================================== +// implementation +// =========================================================================== - if ( FindFocus() == this ) - { - // really a bad thing - maybe an error ? - // we cannot even send it a kill focus message at this stage - gFocusWindow = NULL ; - } - if (m_windowParent) - m_windowParent->RemoveChild(this); +// ---------------------------------------------------------------------------- +// constructors and such +// ---------------------------------------------------------------------------- - DestroyChildren(); +void wxWindowMac::Init() +{ + // generic + InitBase(); - if ( m_macWindowData ) - { - UMADisposeWindow( m_macWindowData->m_macWindow ) ; - delete m_macWindowData ; - wxRemoveMacWindowAssociation( this ) ; - } + // MSW specific + m_doubleClickAllowed = 0; + m_winCaptured = FALSE; + + m_isBeingDeleted = FALSE; + + m_useCtl3D = FALSE; + m_mouseInWindow = FALSE; + + m_xThumbSize = 0; + m_yThumbSize = 0; + m_backgroundTransparent = FALSE; - delete m_children; - m_children = NULL; + // as all windows are created with WS_VISIBLE style... + m_isShown = TRUE; - // Just in case the window has been Closed, but - // we're then deleting immediately: don't leave - // dangling pointers. - wxPendingDelete.DeleteObject(this); + m_x = 0; + m_y = 0 ; + m_width = 0 ; + m_height = 0 ; - if ( m_windowValidator ) - delete m_windowValidator; + m_hScrollBar = NULL ; + m_vScrollBar = NULL ; } -// Destroy the window (delayed, if a managed window) -bool wxWindow::Destroy() +// Destructor +wxWindowMac::~wxWindowMac() { - delete this; - return TRUE; + // deleting a window while it is shown invalidates the region + if ( IsShown() ) { + wxWindowMac* iter = this ; + while( iter ) { + if ( iter->IsTopLevel() ) + { + Refresh() ; + break ; + } + iter = iter->GetParent() ; + + } + } + + m_isBeingDeleted = TRUE; + + if ( s_lastMouseWindow == this ) + { + s_lastMouseWindow = NULL ; + } + + if ( gFocusWindow == this ) + { + gFocusWindow = NULL ; + } + + if ( m_parent ) + m_parent->RemoveChild(this); + + DestroyChildren(); } // 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) { - m_isWindow = TRUE; - // Generic - m_windowId = 0; - m_windowStyle = 0; - m_windowParent = NULL; - m_windowEventHandler = this; - m_windowName = ""; - m_windowCursor = *wxSTANDARD_CURSOR; - m_constraints = NULL; - m_constraintsInvolvedIn = NULL; - m_windowSizer = NULL; - m_sizerParent = NULL; - m_autoLayout = FALSE; - m_windowValidator = NULL; - -#if wxUSE_DRAG_AND_DROP - m_pDropTarget = NULL; -#endif + wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") ); - m_caretWidth = 0; m_caretHeight = 0; - m_caretEnabled = FALSE; - m_caretShown = FALSE; - m_minSizeX = -1; - m_minSizeY = -1; - m_maxSizeX = -1; - m_maxSizeY = -1; - m_defaultItem = NULL; - m_windowParent = NULL; - if (!parent) + if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) return FALSE; - if (parent) parent->AddChild(this); - - m_returnCode = 0; - - SetName(name); - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; - - // m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW) ; ; - m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE) ; - m_foregroundColour = *wxBLACK; + parent->AddChild(this); - m_windowStyle = style; + m_x = (int)pos.x; + m_y = (int)pos.y; + AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING); + m_width = WidthDefault( size.x ); + m_height = HeightDefault( size.y ) ; +#ifndef __WXUNIVERSAL__ + if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) ) + { + MacCreateScrollBars( style ) ; + } +#endif + return TRUE; +} - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; +void wxWindowMac::SetFocus() +{ + if ( gFocusWindow == this ) + return ; + + if ( AcceptsFocus() ) + { + if (gFocusWindow ) + { + #if wxUSE_CARET + // Deal with caret + if ( gFocusWindow->m_caret ) + { + gFocusWindow->m_caret->OnKillFocus(); + } + #endif // wxUSE_CARET + #ifndef __WXUNIVERSAL__ + wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; + if ( control && control->GetMacControl() ) + { + UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNoPart ) ; + control->MacRedrawControl() ; + } + #endif + wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId); + event.SetEventObject(gFocusWindow); + gFocusWindow->GetEventHandler()->ProcessEvent(event) ; + } + gFocusWindow = this ; + { + #if wxUSE_CARET + // Deal with caret + if ( m_caret ) + { + m_caret->OnSetFocus(); + } + #endif // wxUSE_CARET + // panel wants to track the window which was the last to have focus in it + wxChildFocusEvent eventFocus(this); + GetEventHandler()->ProcessEvent(eventFocus); + + #ifndef __WXUNIVERSAL__ + wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; + if ( control && control->GetMacControl() ) + { + UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlEditTextPart ) ; + } + #endif + wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event) ; + } + } +} - m_x = (int)pos.x; - m_y = (int)pos.y; - AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING); - m_width = size.x; - m_height = size.y; +bool wxWindowMac::Enable(bool enable) +{ + if ( !wxWindowBase::Enable(enable) ) + return FALSE; - MacCreateScrollBars( style ) ; + MacSuperEnabled( enable ) ; return TRUE; } -void wxWindow::SetFocus() -{ - if ( AcceptsFocus() ) - { - if (gFocusWindow ) - { - wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; - if ( control && control->GetMacControl() ) - { - UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ; - } - wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId); - event.SetEventObject(gFocusWindow); - gFocusWindow->GetEventHandler()->ProcessEvent(event) ; - } - gFocusWindow = this ; - { - wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; - if ( control && control->GetMacControl() ) - { - UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ; - } - - wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event) ; - } - } -} - -void wxWindow::Enable(bool enable) -{ - if ( m_macEnabled == enable ) - return ; - - m_macEnabled = enable ; - - MacSuperEnabled( enable ) ; - return; -} - -void wxWindow::CaptureMouse() +void wxWindowMac::DoCaptureMouse() { wxTheApp->s_captureWindow = this ; } -void wxWindow::ReleaseMouse() -{ - wxTheApp->s_captureWindow = NULL ; -} - -// Push/pop event handler (i.e. allow a chain of event handlers -// be searched) -void wxWindow::PushEventHandler(wxEvtHandler *handler) +wxWindow* wxWindowBase::GetCapture() { - handler->SetNextHandler(GetEventHandler()); - SetEventHandler(handler); + return wxTheApp->s_captureWindow ; } -wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler) +void wxWindowMac::DoReleaseMouse() { - if ( GetEventHandler() ) - { - wxEvtHandler *handlerA = GetEventHandler(); - wxEvtHandler *handlerB = handlerA->GetNextHandler(); - handlerA->SetNextHandler(NULL); - SetEventHandler(handlerB); - if ( deleteHandler ) - { - delete handlerA; - return NULL; - } - else - return handlerA; - } - else - return NULL; + 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; + if ( m_dropTarget != 0 ) { + delete m_dropTarget; } - m_pDropTarget = pDropTarget; - if ( m_pDropTarget != 0 ) + m_dropTarget = pDropTarget; + if ( m_dropTarget != 0 ) { // TODO } @@ -349,1379 +287,985 @@ 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::GetSize(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::GetPosition(int *x, int *y) const +void wxWindowMac::DoGetPosition(int *x, int *y) const { - *x = m_x ; - *y = m_y ; - if (GetParent()) + int xx,yy; + + xx = m_x ; + yy = m_y ; + if ( !IsTopLevel() && 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; } -void wxWindow::ScreenToClient(int *x, int *y) const +#if wxUSE_MENUS +bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) { - WindowRef window = GetMacRootWindow() ; + menu->SetInvokingWindow(this); + menu->UpdateUI(); + ClientToScreen( &x , &y ) ; - Point localwhere ; - localwhere.h = * x ; - localwhere.v = * y ; + ::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ; + long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ; + menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ; + ::DeleteMenu( menu->MacGetMenuId() ) ; + menu->SetInvokingWindow(NULL); - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( window ) ) ; - ::GlobalToLocal( &localwhere ) ; - ::SetPort( port ) ; - - *x = localwhere.h ; - *y = localwhere.v ; - - MacRootWindowToClient( x , y ) ; + return TRUE; } +#endif -void wxWindow::ClientToScreen(int *x, int *y) const +void wxWindowMac::DoScreenToClient(int *x, int *y) const { - WindowRef window = GetMacRootWindow() ; - - MacClientToRootWindow( x , y ) ; - - Point localwhere ; - localwhere.h = * x ; - localwhere.v = * y ; - - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( window ) ) ; - ::LocalToGlobal( &localwhere ) ; - ::SetPort( port ) ; - *x = localwhere.h ; - *y = localwhere.v ; -} + WindowRef window = (WindowRef) MacGetRootWindow() ; -void wxWindow::MacClientToRootWindow( int *x , int *y ) const -{ - if ( m_macWindowData ) - { - } - else - { - *x += m_x ; - *y += m_y ; - GetParent()->MacClientToRootWindow( x , y ) ; - } -} + Point localwhere = {0,0} ; -void wxWindow::MacRootWindowToClient( int *x , int *y ) const -{ - if ( m_macWindowData ) - { - } - else - { - *x -= m_x ; - *y -= m_y ; - GetParent()->MacRootWindowToClient( x , y ) ; - } -} + if(x) localwhere.h = * x ; + if(y) localwhere.v = * y ; -void wxWindow::SetCursor(const wxCursor& cursor) -{ - m_windowCursor = cursor; - if (m_windowCursor.Ok()) - { - // since this only affects the window-cursor, we adopt the same - // behaviour as windows -> it will only change on mouse moved events - // otherwise the ::WxSetCursor routine will have to be used - } -} + GrafPtr port ; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( window ) ) ; + ::GlobalToLocal( &localwhere ) ; + ::SetPort( port ) ; + if(x) *x = localwhere.h ; + if(y) *y = localwhere.v ; + + MacRootWindowToWindow( x , y ) ; + if ( x ) + x -= MacGetLeftBorderSize() ; + if ( y ) + y -= MacGetTopBorderSize() ; +} -// Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindow::GetClientSize(int *x, int *y) const +void wxWindowMac::DoClientToScreen(int *x, int *y) const { - *x = m_width ; - *y = m_height ; + WindowRef window = (WindowRef) MacGetRootWindow() ; + + if ( x ) + x += MacGetLeftBorderSize() ; + if ( y ) + y += MacGetTopBorderSize() ; + + MacWindowToRootWindow( x , y ) ; + + Point localwhere = { 0,0 }; + if(x) localwhere.h = * x ; + if(y) localwhere.v = * y ; + + GrafPtr port ; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( window ) ) ; - if (m_vScrollBar && m_vScrollBar->IsShown() ) - (*x) -= MAC_SCROLLBAR_SIZE; - if (m_hScrollBar && m_hScrollBar->IsShown() ) - (*y) -= MAC_SCROLLBAR_SIZE; + ::LocalToGlobal( &localwhere ) ; + ::SetPort( port ) ; + if(x) *x = localwhere.h ; + if(y) *y = localwhere.v ; } -void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) +void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const { - int former_x = m_x ; - int former_y = m_y ; - int former_w = m_width ; - int former_h = m_height ; - - int currentX, currentY; - GetPosition(¤tX, ¤tY); - int currentW,currentH; - GetSize(¤tW, ¤tH); - - int actualWidth = width; - int actualHeight = height; - int actualX = x; - int actualY = y; - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - actualX = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) - actualY = currentY; - if (width == -1) - actualWidth = currentW ; - if (height == -1) - actualHeight = currentH ; - - if ( actualX == currentX && actualY == currentY && actualWidth == currentW && actualHeight == currentH) - { - MacRepositionScrollBars() ; // we might have a real position shift - return ; - } - - AdjustForParentClientOrigin(actualX, actualY, sizeFlags); - - - bool doMove = false ; - bool doResize = false ; - - if ( actualX != former_x || actualY != former_y ) - { - doMove = true ; - } - if ( actualWidth != former_w || actualHeight != former_h ) - { - doResize = true ; - } - - if ( doMove || doResize ) - { - if ( m_macWindowData ) - { - } - else - { - // erase former position - { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - InvalRect( &clientrect ) ; - } - } - } - m_x = actualX ; - m_y = actualY ; - m_width = actualWidth ; - m_height = actualHeight ; - if ( m_macWindowData ) - { - if ( doMove ) - ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y, false); // don't make frontmost - - if ( doResize ) - ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height, true); - - // the OS takes care of invalidating and erasing - - if ( IsKindOf( CLASSINFO( wxFrame ) ) ) - { - wxFrame* frame = (wxFrame*) this ; - frame->PositionStatusBar(); - frame->PositionToolBar(); - } - } - else - { - // erase new position - { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - InvalRect( &clientrect ) ; - } - } - if ( doMove ) - wxWindow::MacSuperChangedPosition() ; // like this only children will be notified - } - MacRepositionScrollBars() ; - if ( doMove ) - { - wxMoveEvent event(wxPoint(m_x, m_y), 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); - } - } + wxPoint origin = GetClientAreaOrigin() ; + if(x) *x += origin.x ; + if(y) *y += origin.y ; + + MacWindowToRootWindow( x , y ) ; } -// For implementation purposes - sometimes decorations make the client area -// smaller -wxPoint wxWindow::GetClientAreaOrigin() const +void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const { - return wxPoint(0, 0); + wxPoint origin = GetClientAreaOrigin() ; + MacRootWindowToWindow( x , y ) ; + if(x) *x -= origin.x ; + if(y) *y -= origin.y ; } -// 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::MacWindowToRootWindow( int *x , int *y ) const { - if( !m_macWindowData ) - { - if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent()) + if ( !IsTopLevel() ) { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - x += pt.x; y += pt.y; + if(x) *x += m_x ; + if(y) *y += m_y ; + GetParent()->MacWindowToRootWindow( x , y ) ; } - } } -void wxWindow::SetTitle(const wxString& title) +void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const { - wxString label ; - - if( wxApp::s_macDefaultEncodingIsPC ) - label = wxMacMakeMacStringFromPC( title ) ; - else - label = title ; - - if ( m_macWindowData ) - UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; + if ( !IsTopLevel() ) + { + if(x) *x -= m_x ; + if(y) *y -= m_y ; + GetParent()->MacRootWindowToWindow( x , y ) ; + } } -wxString wxWindow::GetTitle() const +bool wxWindowMac::SetCursor(const wxCursor& cursor) { - if ( m_macWindowData ) - { - char title[256] ; - wxString label ; - UMAGetWTitleC( m_macWindowData->m_macWindow , title ) ; - if( wxApp::s_macDefaultEncodingIsPC ) - label = wxMacMakePCStringFromMac( title ) ; - else - label = title ; - return label; - } + 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 ; + wxWindowMac *mouseWin ; + GetMouse( &pt ) ; - return wxEmptyString ; -} + // Change the cursor NOW if we're within the correct window -void wxWindow::Centre(int direction) -{ - int x_offset,y_offset ; - int display_width, display_height; - int width, height, x, y; - wxWindow *parent = GetParent(); - if ((direction & wxCENTER_FRAME) && parent) - { - parent->GetPosition(&x_offset,&y_offset) ; - parent->GetSize(&display_width,&display_height) ; - } - else + if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) ) { - wxDisplaySize(&display_width, &display_height); - x_offset = 0 ; - y_offset = LMGetMBarHeight() + LMGetMBarHeight() / 2 ; // approx. the window title height + if ( mouseWin == this && !wxIsBusy() ) + { + m_cursor.MacInstall() ; + } } - GetSize(&width, &height); - GetPosition(&x, &y); - - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); - - SetSize(x+x_offset, y+y_offset, width, height); -} - - -bool wxWindow::Show(bool show) -{ - if ( m_macShown == show ) - return TRUE ; - - m_macShown = show ; - if ( m_macWindowData ) - { - if (show) - { - UMAShowWindow( m_macWindowData->m_macWindow ) ; - UMASelectWindow( m_macWindowData->m_macWindow ) ; - // no need to generate events here, they will get them triggered by macos - wxSizeEvent event(wxSize(m_width, m_height), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - } - else - { - UMAHideWindow( m_macWindowData->m_macWindow ) ; - } - } - Refresh() ; - MacSuperShown( show ) ; - return TRUE; + return TRUE ; } -bool wxWindow::IsShown() const -{ - return m_macShown; -} -int wxWindow::GetCharHeight() const +// Get size *available for subwindows* i.e. excluding menu bar etc. +void wxWindowMac::DoGetClientSize(int *x, int *y) const { - wxClientDC dc ( (wxWindow*)this ) ; - return dc.GetCharHeight() ; -} + int ww, hh; + ww = m_width ; + hh = m_height ; -int wxWindow::GetCharWidth() const -{ - wxClientDC dc ( (wxWindow*)this ) ; - return dc.GetCharWidth() ; + ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; + hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( ); + + if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) ) + { + int x1 = 0 ; + int y1 = 0 ; + int w = m_width ; + int h = m_height ; + + MacClientToRootWindow( &x1 , &y1 ) ; + MacClientToRootWindow( &w , &h ) ; + + wxWindowMac *iter = (wxWindowMac*)this ; + + int totW = 10000 , totH = 10000; + while( iter ) + { + if ( iter->IsTopLevel() ) + { + totW = iter->m_width ; + totH = iter->m_height ; + break ; + } + + iter = iter->GetParent() ; + } + + if (m_hScrollBar && m_hScrollBar->IsShown() ) + { + hh -= MAC_SCROLLBAR_SIZE; + if ( h-y1 >= totH ) + { + hh += 1 ; + } + } + if (m_vScrollBar && m_vScrollBar->IsShown() ) + { + ww -= MAC_SCROLLBAR_SIZE; + if ( w-x1 >= totW ) + { + ww += 1 ; + } + } + } + if(x) *x = ww; + if(y) *y = hh; } -void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, - int *descent, int *externalLeading, const wxFont *theFont, bool) const + +// ---------------------------------------------------------------------------- +// tooltips +// ---------------------------------------------------------------------------- + +#if wxUSE_TOOLTIPS + +void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) { - wxFont *fontToUse = (wxFont *)theFont; - if (!fontToUse) - fontToUse = (wxFont *) & m_windowFont; + wxWindowBase::DoSetToolTip(tooltip); - // TODO + if ( m_tooltip ) + m_tooltip->SetWindow(this); } -void wxWindow::MacEraseBackground( Rect *rect ) -{ - WindowRef window = GetMacRootWindow() ; - if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) - { - UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ; - } - else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether - // 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() ; - while( parent ) - { - if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // if we have any other colours in the hierarchy - RGBBackColor( &parent->m_backgroundColour.GetPixel()) ; - break ; - } - if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() ) - { - // if we have the normal colours in the hierarchy but another control etc. -> use it's background - if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - ApplyThemeBackground (kThemeBackgroundTabPane, rect, kThemeStateActive,8,true); - break ; - } - } - else - { - // we have arrived at a non control item - parent = NULL ; - break ; - } - parent = parent->GetParent() ; - } - if ( !parent ) - { - // if there is nothing special -> use default - UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ; - } - } - else - { - RGBBackColor( &m_backgroundColour.GetPixel()) ; - } - - EraseRect( rect ) ; - - for (wxNode *node = m_children->First(); node; node = node->Next()) - { - wxWindow *child = (wxWindow*)node->Data(); -// int width ; -// int height ; - -// child->GetClientSize( &width , &height ) ; - - Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ; - SectRect( &clientrect , rect , &clientrect ) ; - - OffsetRect( &clientrect , -child->m_x , -child->m_y ) ; - if ( child->GetMacRootWindow() == window && child->IsReallyShown() ) - { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - child->MacEraseBackground( &clientrect ) ; - } - } - } -} - -void wxWindow::Refresh(bool eraseBack, const wxRect *rect) -{ - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - int width , height ; - GetClientSize( &width , &height ) ; - Rect clientrect = { 0 , 0 , height , width } ; - ClipRect( &clientrect ) ; +#endif // wxUSE_TOOLTIPS - if ( rect ) +void wxWindowMac::DoMoveWindow(int x, int y, int width, int height) +{ + int former_x = m_x ; + int former_y = m_y ; + int former_w = m_width ; + int former_h = m_height ; + + int actualWidth = width; + int actualHeight = height; + int actualX = x; + int actualY = y; + + 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; + + bool doMove = false ; + bool doResize = false ; + + if ( actualX != former_x || actualY != former_y ) + { + doMove = true ; + } + if ( actualWidth != former_w || actualHeight != former_h ) { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; - SectRect( &clientrect , &r , &clientrect ) ; + doResize = true ; } - InvalRect( &clientrect ) ; - /* - if ( eraseBack ) + + if ( doMove || doResize ) { - MacEraseBackground( &clientrect ) ; - } - */ - } + // erase former position + + Refresh() ; + + m_x = actualX ; + m_y = actualY ; + m_width = actualWidth ; + m_height = actualHeight ; + + // erase new position + + Refresh() ; + if ( doMove ) + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified + + MacRepositionScrollBars() ; + if ( doMove ) + { + wxPoint point(m_x, m_y); + wxMoveEvent event(point, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event) ; + } + if ( doResize ) + { + MacRepositionScrollBars() ; + wxSize size(m_width, m_height); + wxSizeEvent event(size, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } + } + } -// Responds to colour changes: passes event on to children. -void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) +// 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) { - wxNode *node = GetChildren().First(); - while ( node ) + // get the current size and position... + int currentX, currentY; + GetPosition(¤tX, ¤tY); + + int currentW,currentH; + GetSize(¤tW, ¤tH); + + // ... and don't do anything (avoiding flicker) if it's already ok + if ( x == currentX && y == currentY && + width == currentW && height == currentH ) { - // Only propagate to non-top-level windows - wxWindow *win = (wxWindow *)node->Data(); - if ( win->GetParent() ) + MacRepositionScrollBars() ; // we might have a real position shift + return; + } + + if ( x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) + x = currentX; + if ( y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) ) + y = currentY; + + AdjustForParentClientOrigin(x, y, sizeFlags); + + wxSize size(-1, -1); + if ( width == -1 ) + { + if ( sizeFlags & wxSIZE_AUTO_WIDTH ) + { + size = DoGetBestSize(); + width = size.x; + } + else { - wxSysColourChangedEvent event2; - event.m_eventObject = win; - win->GetEventHandler()->ProcessEvent(event2); + // just take the current one + width = currentW; } + } - node = node->Next(); + if ( height == -1 ) + { + if ( sizeFlags & wxSIZE_AUTO_HEIGHT ) + { + if ( size.x == -1 ) + { + size = DoGetBestSize(); + } + //else: already called DoGetBestSize() above + + height = size.y; + } + else + { + // just take the current one + height = currentH; + } } + + DoMoveWindow(x, y, width, height); + } +// For implementation purposes - sometimes decorations make the client area +// smaller -// This can be called by the app (or wxWindows) to do default processing for the current -// event. Save message/event info in wxWindow so they can be used in this function. -long wxWindow::Default() +wxPoint wxWindowMac::GetClientAreaOrigin() const { - // TODO - return 0; + return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) ); } -void wxWindow::InitDialog() +void wxWindow::SetTitle(const wxString& title) { - wxInitDialogEvent event(GetId()); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + m_label = title ; } -// Default init dialog behaviour is to transfer data to window -void wxWindow::OnInitDialog(wxInitDialogEvent& event) +wxString wxWindow::GetTitle() const { - TransferDataToWindow(); + return m_label ; } -// Caret manipulation -void wxWindow::CreateCaret(int w, int h) +bool wxWindowMac::Show(bool show) { - m_caretWidth = w; - m_caretHeight = h; - m_caretEnabled = TRUE; + if ( !wxWindowBase::Show(show) ) + return FALSE; + + MacSuperShown( show ) ; + if ( !show ) + { + WindowRef window = (WindowRef) MacGetRootWindow() ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win && !win->m_isBeingDeleted ) + Refresh() ; + } + else + { + Refresh() ; + } + + return TRUE; } -void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) +void wxWindowMac::MacSuperShown( bool show ) { - // TODO + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + if ( child->m_isShown ) + child->MacSuperShown( show ) ; + node = node->Next(); + } } -void wxWindow::ShowCaret(bool show) +void wxWindowMac::MacSuperEnabled( bool enabled ) { - // TODO + if ( !IsTopLevel() ) + { + // to be absolutely correct we'd have to invalidate (with eraseBkground + // because unter MacOSX the frames are drawn with an addXXX mode) + // the borders area + } + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + if ( child->m_isShown ) + child->MacSuperEnabled( enabled ) ; + node = node->Next(); + } } -void wxWindow::DestroyCaret() +bool wxWindowMac::MacIsReallyShown() const { - // TODO - m_caretEnabled = FALSE; + 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 ; +*/ } -void wxWindow::SetCaretPos(int x, int y) +int wxWindowMac::GetCharHeight() const { - // TODO + wxClientDC dc ( (wxWindowMac*)this ) ; + return dc.GetCharHeight() ; } -void wxWindow::GetCaretPos(int *x, int *y) const +int wxWindowMac::GetCharWidth() const { - // TODO + wxClientDC dc ( (wxWindowMac*)this ) ; + return dc.GetCharWidth() ; } -wxWindow *wxGetActiveWindow() +void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, + int *descent, int *externalLeading, const wxFont *theFont ) const { - // actually this is a windows-only concept - return NULL; + const wxFont *fontToUse = theFont; + if ( !fontToUse ) + fontToUse = &m_font; + + wxClientDC dc( (wxWindowMac*) this ) ; + long lx,ly,ld,le ; + dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ; + if ( externalLeading ) + *externalLeading = le ; + if ( descent ) + *descent = ld ; + if ( x ) + *x = lx ; + if ( y ) + *y = ly ; } -void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH)) -{ - m_minSizeX = minW; - m_minSizeY = minH; - m_maxSizeX = maxW; - m_maxSizeY = maxH; +/* + * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect + * we always intersect with the entire window, not only with the client area + */ + +void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) +{ + if ( MacGetTopLevelWindow() == NULL ) + return ; + + wxPoint client ; + client = GetClientAreaOrigin( ) ; + Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ; + if ( rect ) + { + Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; + SectRect( &clientrect , &r , &clientrect ) ; + } + if ( !EmptyRect( &clientrect ) ) + { + int top = 0 , left = 0 ; + + MacClientToRootWindow( &left , &top ) ; + OffsetRect( &clientrect , left , top ) ; + + MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ; + } } +#if wxUSE_CARET && WXWIN_COMPATIBILITY +// --------------------------------------------------------------------------- +// Caret manipulation +// --------------------------------------------------------------------------- -// Coordinates relative to the window -void wxWindow::WarpPointer (int x_pos, int y_pos) +void wxWindowMac::CreateCaret(int w, int h) { - // We really dont move the mouse programmatically under mac + SetCaret(new wxCaret(this, w, h)); } -void wxWindow::OnEraseBackground(wxEraseEvent& event) +void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) { - // TODO : probably we would adopt the EraseEvent structure - Default(); + wxFAIL_MSG("not implemented"); } -int wxWindow::GetScrollPos(int orient) const +void wxWindowMac::ShowCaret(bool show) { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - return m_hScrollBar->GetThumbPosition() ; - } - else - { - if ( m_vScrollBar ) - return m_vScrollBar->GetThumbPosition() ; - } - return 0; -} + wxCHECK_RET( m_caret, "no caret to show" ); -// This now returns the whole range, not just the number -// of positions that we can scroll. -int wxWindow::GetScrollRange(int orient) const -{ - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - return m_hScrollBar->GetRange() ; - } - else - { - if ( m_vScrollBar ) - return m_vScrollBar->GetRange() ; - } - return 0; + m_caret->Show(show); } -int wxWindow::GetScrollThumb(int orient) const +void wxWindowMac::DestroyCaret() { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - return m_hScrollBar->GetThumbSize() ; - } - else - { - if ( m_vScrollBar ) - return m_vScrollBar->GetThumbSize() ; - } - return 0; + SetCaret(NULL); } -void wxWindow::SetScrollPos(int orient, int pos, bool refresh) +void wxWindowMac::SetCaretPos(int x, int y) { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - m_hScrollBar->SetThumbPosition( pos ) ; - } - else - { - if ( m_vScrollBar ) - m_vScrollBar->SetThumbPosition( pos ) ; - } + wxCHECK_RET( m_caret, "no caret to move" ); + + m_caret->Move(x, y); } -// New function that will replace some of the above. -void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, - int range, bool refresh) +void wxWindowMac::GetCaretPos(int *x, int *y) const { - if ( orient == wxHORIZONTAL ) - { - if ( m_hScrollBar ) - { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_hScrollBar->IsShown() ) - m_hScrollBar->Show(false) ; - } - else - { - if ( !m_hScrollBar->IsShown() ) - m_hScrollBar->Show(true) ; - m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; - } - } - } - else - { - if ( m_vScrollBar ) - { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_vScrollBar->IsShown() ) - m_vScrollBar->Show(false) ; - } - else - { - if ( !m_vScrollBar->IsShown() ) - m_vScrollBar->Show(true) ; - m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; - } - } - } - MacRepositionScrollBars() ; -} - -// Does a physical scroll -void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) -{ - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - int width , height ; - GetClientSize( &width , &height ) ; - Rect scrollrect = { 0 , 0 , height , width } ; - - RgnHandle updateRgn = NewRgn() ; - ClipRect( &scrollrect ) ; - if ( rect ) - { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; - SectRect( &scrollrect , &r , &scrollrect ) ; - } - ScrollRect( &scrollrect , dx , dy , updateRgn ) ; - InvalRgn( updateRgn ) ; - DisposeRgn( updateRgn ) ; - } -} - -void wxWindow::SetFont(const wxFont& font) -{ - m_windowFont = font; - - if (!m_windowFont.Ok()) - return; - // TODO -} - -void wxWindow::OnChar(wxKeyEvent& event) -{ - if ( event.KeyCode() == WXK_TAB ) { - // propagate the TABs to the parent - it's up to it to decide what - // to do with it - if ( GetParent() ) { - if ( GetParent()->ProcessEvent(event) ) - return; - } - } -} - -void wxWindow::OnPaint(wxPaintEvent& event) -{ -/* - if ( m_macWindowData ) - { - wxMacDrawingClientHelper helper ( this ) ; - long x ,y ,w ,h ; - GetUpdateRegion().GetBox( x , y , w , h ) ; - UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ; - Rect r = { y , x, y+h , x+w } ; - EraseRect( &r ) ; - } - else - { - wxMacDrawingClientHelper helper ( this ) ; - long x ,y ,w ,h ; - GetUpdateRegion().GetBox( x , y , w , h ) ; - RGBBackColor( &m_backgroundColour.GetPixel() ) ; - Rect r = { y , x, y+h , x+w } ; - EraseRect( &r ) ; - } -*/ -} - -bool wxWindow::IsEnabled() const -{ - return m_macEnabled ; -} - -// Dialog support: override these and call -// base class members to add functionality -// that can't be done using validators. -// NOTE: these functions assume that controls -// are direct children of this window, not grandchildren -// or other levels of descendant. + wxCHECK_RET( m_caret, "no caret to get position of" ); -// Transfer values to controls. If returns FALSE, -// it's an application error (pops up a dialog) -bool wxWindow::TransferDataToWindow() -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && - !child->GetValidator()->TransferToWindow() ) - { - wxMessageBox("Application Error", "Could not transfer data to window", wxOK|wxICON_EXCLAMATION); - return FALSE; - } - - node = node->Next(); - } - return TRUE; + m_caret->GetPosition(x, y); } +#endif // wxUSE_CARET -// Transfer values from controls. If returns FALSE, -// validation failed: don't quit -bool wxWindow::TransferDataFromWindow() +wxWindowMac *wxGetActiveWindow() { - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() ) - { - return FALSE; - } - - node = node->Next(); - } - return TRUE; + // actually this is a windows-only concept + return NULL; } -bool wxWindow::Validate() +// Coordinates relative to the window +void wxWindowMac::WarpPointer (int x_pos, int y_pos) { - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) ) - { - return FALSE; - } - - node = node->Next(); - } - return TRUE; + // We really dont move the mouse programmatically under mac } -// Get the window with the focus -wxWindow *wxWindow::FindFocus() +const wxBrush& wxWindowMac::MacGetBackgroundBrush() { - return gFocusWindow ; -} - -// ---------------------------------------------------------------------------- -// RTTI -// ---------------------------------------------------------------------------- + if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) + { + m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ; + } + else if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) ) + { + // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether + // 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 + + WindowRef window = (WindowRef) MacGetRootWindow() ; + + wxWindowMac* parent = GetParent() ; + while( parent ) + { + if ( parent->MacGetRootWindow() != window ) + { + // we are in a different window on the mac system + parent = NULL ; + break ; + } -bool wxWindow::IsTopLevel() const -{ - return wxDynamicCast(this, wxFrame) || wxDynamicCast(this, wxDialog); -} + { + if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) + && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) ) + { + // if we have any other colours in the hierarchy + m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ; + break ; + } + // if we have the normal colours in the hierarchy but another control etc. -> use it's background + if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) + { + Rect extent = { 0 , 0 , 0 , 0 } ; + int x , y ; + x = y = 0 ; + wxSize size = GetSize() ; + parent->MacClientToRootWindow( &x , &y ) ; + extent.left = x ; + extent.top = y ; + extent.top-- ; + extent.right = x + size.x ; + extent.bottom = y + size.y ; + m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; // todo eventually change for inactive + break ; + } + } + parent = parent->GetParent() ; + } + if ( !parent ) + { + m_macBackgroundBrush.SetMacTheme( kThemeBrushDialogBackgroundActive ) ; // todo eventually change for inactive + } + } + else + { + m_macBackgroundBrush.SetColour( m_backgroundColour ) ; + } -void wxWindow::AddChild(wxWindow *child) -{ - GetChildren().Append(child); - child->m_windowParent = this; + return m_macBackgroundBrush ; + } -void wxWindow::RemoveChild(wxWindow *child) +void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { - GetChildren().DeleteObject(child); - child->m_windowParent = NULL; + event.GetDC()->Clear() ; } -void wxWindow::DestroyChildren() +void wxWindowMac::OnNcPaint( wxNcPaintEvent& event ) { - wxNode *node; - while ((node = GetChildren().First()) != (wxNode *)NULL) { - wxWindow *child; - if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) { - delete child; - if ( GetChildren().Find(child) ) - delete node; - } - } /* while */ + wxWindowDC dc(this) ; + wxMacPortSetter helper(&dc) ; + + MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ; } -void wxWindow::MakeModal(bool modal) +int wxWindowMac::GetScrollPos(int orient) const { - // Disable all other windows - if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame))) - { - wxNode *node = wxTopLevelWindows.First(); - while (node) + if ( orient == wxHORIZONTAL ) { - wxWindow *win = (wxWindow *)node->Data(); - if (win != this) - win->Enable(!modal); - - node = node->Next(); + if ( m_hScrollBar ) + return m_hScrollBar->GetThumbPosition() ; } - } -} - -// 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) -{ - if (GetEventHandler()->ProcessEvent(event) ) - return; - if (m_windowParent) - m_windowParent->GetEventHandler()->OnCommand(win, event); + else + { + if ( m_vScrollBar ) + return m_vScrollBar->GetThumbPosition() ; + } + return 0; } -// ---------------------------------------------------------------------------- -// constraints and sizers -// ---------------------------------------------------------------------------- - -#if wxUSE_CONSTRAINTS - -void wxWindow::SetConstraints( wxLayoutConstraints *constraints ) +// This now returns the whole range, not just the number +// of positions that we can scroll. +int wxWindowMac::GetScrollRange(int orient) const { - if ( m_constraints ) + if ( orient == wxHORIZONTAL ) { - UnsetConstraints(m_constraints); - delete m_constraints; + if ( m_hScrollBar ) + return m_hScrollBar->GetRange() ; } - m_constraints = constraints; - if ( m_constraints ) + else { - // Make sure other windows know they're part of a 'meaningful relationship' - if ( m_constraints->left.GetOtherWindow() && (m_constraints->left.GetOtherWindow() != this) ) - m_constraints->left.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->top.GetOtherWindow() && (m_constraints->top.GetOtherWindow() != this) ) - m_constraints->top.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->right.GetOtherWindow() && (m_constraints->right.GetOtherWindow() != this) ) - m_constraints->right.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->bottom.GetOtherWindow() && (m_constraints->bottom.GetOtherWindow() != this) ) - m_constraints->bottom.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->width.GetOtherWindow() && (m_constraints->width.GetOtherWindow() != this) ) - m_constraints->width.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->height.GetOtherWindow() && (m_constraints->height.GetOtherWindow() != this) ) - m_constraints->height.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->centreX.GetOtherWindow() && (m_constraints->centreX.GetOtherWindow() != this) ) - m_constraints->centreX.GetOtherWindow()->AddConstraintReference(this); - if ( m_constraints->centreY.GetOtherWindow() && (m_constraints->centreY.GetOtherWindow() != this) ) - m_constraints->centreY.GetOtherWindow()->AddConstraintReference(this); + if ( m_vScrollBar ) + return m_vScrollBar->GetRange() ; } + return 0; } -// This removes any dangling pointers to this window in other windows' -// constraintsInvolvedIn lists. -void wxWindow::UnsetConstraints(wxLayoutConstraints *c) +int wxWindowMac::GetScrollThumb(int orient) const { - if ( c ) + if ( orient == wxHORIZONTAL ) { - if ( c->left.GetOtherWindow() && (c->top.GetOtherWindow() != this) ) - c->left.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->top.GetOtherWindow() && (c->top.GetOtherWindow() != this) ) - c->top.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->right.GetOtherWindow() && (c->right.GetOtherWindow() != this) ) - c->right.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->bottom.GetOtherWindow() && (c->bottom.GetOtherWindow() != this) ) - c->bottom.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->width.GetOtherWindow() && (c->width.GetOtherWindow() != this) ) - c->width.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->height.GetOtherWindow() && (c->height.GetOtherWindow() != this) ) - c->height.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->centreX.GetOtherWindow() && (c->centreX.GetOtherWindow() != this) ) - c->centreX.GetOtherWindow()->RemoveConstraintReference(this); - if ( c->centreY.GetOtherWindow() && (c->centreY.GetOtherWindow() != this) ) - c->centreY.GetOtherWindow()->RemoveConstraintReference(this); + if ( m_hScrollBar ) + return m_hScrollBar->GetThumbSize() ; } -} - -// Back-pointer to other windows we're involved with, so if we delete this -// window, we must delete any constraints we're involved with. -void wxWindow::AddConstraintReference(wxWindow *otherWin) -{ - if ( !m_constraintsInvolvedIn ) - m_constraintsInvolvedIn = new wxWindowList; - if ( !m_constraintsInvolvedIn->Find(otherWin) ) - m_constraintsInvolvedIn->Append(otherWin); -} - -// REMOVE back-pointer to other windows we're involved with. -void wxWindow::RemoveConstraintReference(wxWindow *otherWin) -{ - if ( m_constraintsInvolvedIn ) - m_constraintsInvolvedIn->DeleteObject(otherWin); -} - -// Reset any constraints that mention this window -void wxWindow::DeleteRelatedConstraints() -{ - if ( m_constraintsInvolvedIn ) + else { - wxWindowList::Node *node = m_constraintsInvolvedIn->GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - wxLayoutConstraints *constr = win->GetConstraints(); - - // Reset any constraints involving this window - if ( constr ) - { - constr->left.ResetIfWin(this); - constr->top.ResetIfWin(this); - constr->right.ResetIfWin(this); - constr->bottom.ResetIfWin(this); - constr->width.ResetIfWin(this); - constr->height.ResetIfWin(this); - constr->centreX.ResetIfWin(this); - constr->centreY.ResetIfWin(this); - } - - wxWindowList::Node *next = node->GetNext(); - delete node; - node = next; - } - - delete m_constraintsInvolvedIn; - m_constraintsInvolvedIn = (wxWindowList *) NULL; + if ( m_vScrollBar ) + return m_vScrollBar->GetThumbSize() ; } + return 0; } -void wxWindow::SetSizer(wxSizer *sizer) -{ - if (m_windowSizer) delete m_windowSizer; - - m_windowSizer = sizer; -} - -bool wxWindow::Layout() +void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) { - int w, h; - GetClientSize(&w, &h); - - // If there is a sizer, use it instead of the constraints - if ( GetSizer() ) + if ( orient == wxHORIZONTAL ) { - GetSizer()->SetDimension( 0, 0, w, h ); - return TRUE; + if ( m_hScrollBar ) + m_hScrollBar->SetThumbPosition( pos ) ; } - - if ( GetConstraints() ) + else { - GetConstraints()->width.SetValue(w); - GetConstraints()->height.SetValue(h); + if ( m_vScrollBar ) + m_vScrollBar->SetThumbPosition( pos ) ; } - - // Evaluate child constraints - ResetConstraints(); // Mark all constraints as unevaluated - DoPhase(1); // Just one phase need if no sizers involved - DoPhase(2); - SetConstraintSizes(); // Recursively set the real window sizes - - return TRUE; } - -// Do a phase of evaluating constraints: the default behaviour. wxSizers may -// do a similar thing, but also impose their own 'constraints' and order the -// evaluation differently. -bool wxWindow::LayoutPhase1(int *noChanges) +void wxWindowMac::MacPaintBorders( int left , int top ) { - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) + if( IsTopLevel() ) + return ; + + RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ; + RGBColor black = { 0x0000, 0x0000 , 0x0000 } ; + RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ; + RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ; + PenNormal() ; + + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { - return constr->SatisfyConstraints(this, noChanges); +#if wxMAC_USE_THEME_BORDER + Rect rect = { top , left , m_height + top , m_width + left } ; + SInt32 border = 0 ; + /* + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; + InsetRect( &rect , border , border ); + DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + */ + + DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; +#else + bool sunken = HasFlag( wxSUNKEN_BORDER ) ; + RGBForeColor( &face ); + MoveTo( left + 0 , top + m_height - 2 ); + LineTo( left + 0 , top + 0 ); + LineTo( left + m_width - 2 , top + 0 ); + + MoveTo( left + 2 , top + m_height - 3 ); + LineTo( left + m_width - 3 , top + m_height - 3 ); + LineTo( left + m_width - 3 , top + 2 ); + + RGBForeColor( sunken ? &face : &black ); + MoveTo( left + 0 , top + m_height - 1 ); + LineTo( left + m_width - 1 , top + m_height - 1 ); + LineTo( left + m_width - 1 , top + 0 ); + + RGBForeColor( sunken ? &shadow : &white ); + MoveTo( left + 1 , top + m_height - 3 ); + LineTo( left + 1, top + 1 ); + LineTo( left + m_width - 3 , top + 1 ); + + RGBForeColor( sunken ? &white : &shadow ); + MoveTo( left + 1 , top + m_height - 2 ); + LineTo( left + m_width - 2 , top + m_height - 2 ); + LineTo( left + m_width - 2 , top + 1 ); + + RGBForeColor( sunken ? &black : &face ); + MoveTo( left + 2 , top + m_height - 4 ); + LineTo( left + 2 , top + 2 ); + LineTo( left + m_width - 4 , top + 2 ); +#endif + } + else if (HasFlag(wxSIMPLE_BORDER)) + { + Rect rect = { top , left , m_height + top , m_width + left } ; + RGBForeColor( &black ) ; + FrameRect( &rect ) ; } - else - return TRUE; } -bool wxWindow::LayoutPhase2(int *noChanges) +void wxWindowMac::RemoveChild( wxWindowBase *child ) { - *noChanges = 0; - - // Layout children - DoPhase(1); - DoPhase(2); - return TRUE; + if ( child == m_hScrollBar ) + m_hScrollBar = NULL ; + if ( child == m_vScrollBar ) + m_vScrollBar = NULL ; + + wxWindowBase::RemoveChild( child ) ; } -// Do a phase of evaluating child constraints -bool wxWindow::DoPhase(int phase) +// New function that will replace some of the above. +void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, + int range, bool refresh) { - int noIterations = 0; - int maxIterations = 500; - int noChanges = 1; - int noFailures = 0; - wxWindowList succeeded; - while ((noChanges > 0) && (noIterations < maxIterations)) - { - noChanges = 0; - noFailures = 0; - wxWindowList::Node *node = GetChildren().GetFirst(); - while (node) + if ( orient == wxHORIZONTAL ) { - wxWindow *child = node->GetData(); - if ( !child->IsTopLevel() ) + if ( m_hScrollBar ) { - wxLayoutConstraints *constr = child->GetConstraints(); - if ( constr ) + if ( range == 0 || thumbVisible >= range ) { - if ( !succeeded.Find(child) ) - { - int tempNoChanges = 0; - bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ; - noChanges += tempNoChanges; - if ( success ) - { - succeeded.Append(child); - } - } + if ( m_hScrollBar->IsShown() ) + m_hScrollBar->Show(false) ; + } + else + { + if ( !m_hScrollBar->IsShown() ) + m_hScrollBar->Show(true) ; + m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } } - node = node->GetNext(); - } - - noIterations++; - } - - return TRUE; -} - -void wxWindow::ResetConstraints() -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - constr->left.SetDone(FALSE); - constr->top.SetDone(FALSE); - constr->right.SetDone(FALSE); - constr->bottom.SetDone(FALSE); - constr->width.SetDone(FALSE); - constr->height.SetDone(FALSE); - constr->centreX.SetDone(FALSE); - constr->centreY.SetDone(FALSE); - } - wxWindowList::Node *node = GetChildren().GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() ) - win->ResetConstraints(); - node = node->GetNext(); - } -} - -// Need to distinguish between setting the 'fake' size for windows and sizers, -// and setting the real values. -void wxWindow::SetConstraintSizes(bool recurse) -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr && constr->left.GetDone() && constr->right.GetDone( ) && - constr->width.GetDone() && constr->height.GetDone()) - { - int x = constr->left.GetValue(); - int y = constr->top.GetValue(); - int w = constr->width.GetValue(); - int h = constr->height.GetValue(); - - if ( (constr->width.GetRelationship() != wxAsIs ) || - (constr->height.GetRelationship() != wxAsIs) ) - { - SetSize(x, y, w, h); } else { - // If we don't want to resize this window, just move it... - Move(x, y); + if ( m_vScrollBar ) + { + if ( range == 0 || thumbVisible >= range ) + { + if ( m_vScrollBar->IsShown() ) + m_vScrollBar->Show(false) ; + } + else + { + if ( !m_vScrollBar->IsShown() ) + m_vScrollBar->Show(true) ; + m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; + } + } } - } - else if ( constr ) - { - char *windowClass = GetClassInfo()->GetClassName(); + MacRepositionScrollBars() ; +} - wxString winName; - if ( GetName() == _T("") ) - winName = _T("unnamed"); - else - winName = GetName(); - wxLogDebug( _T("Constraint(s) not satisfied for window of type %s, name %s:\n"), - (const char *)windowClass, - (const char *)winName); - if ( !constr->left.GetDone()) wxLogDebug( _T(" unsatisfied 'left' constraint.\n") ); - if ( !constr->right.GetDone()) wxLogDebug( _T(" unsatisfied 'right' constraint.\n") ); - if ( !constr->width.GetDone()) wxLogDebug( _T(" unsatisfied 'width' constraint.\n") ); - if ( !constr->height.GetDone()) wxLogDebug( _T(" unsatisfied 'height' constraint.\n") ); - wxLogDebug( _T("Please check constraints: try adding AsIs() constraints.\n") ); - } +// Does a physical scroll +void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) +{ + wxClientDC dc(this) ; + wxMacPortSetter helper(&dc) ; - if ( recurse ) { - wxWindowList::Node *node = GetChildren().GetFirst(); - while (node) + int width , height ; + GetClientSize( &width , &height ) ; + + Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ; + RgnHandle updateRgn = NewRgn() ; + ClipRect( &scrollrect ) ; + if ( rect ) { - wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() ) - win->SetConstraintSizes(); - node = node->GetNext(); + Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) , + dc.XLOG2DEVMAC(rect->x + rect->width) } ; + SectRect( &scrollrect , &r , &scrollrect ) ; } + ScrollRect( &scrollrect , dx , dy , updateRgn ) ; + InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ; + DisposeRgn( updateRgn ) ; } -} - -// Only set the size/position of the constraint (if any) -void wxWindow::SetSizeConstraint(int x, int y, int w, int h) -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) + + for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - if ( x != -1 ) - { - constr->left.SetValue(x); - constr->left.SetDone(TRUE); - } - if ( y != -1 ) - { - constr->top.SetValue(y); - constr->top.SetDone(TRUE); - } - if ( w != -1 ) - { - constr->width.SetValue(w); - constr->width.SetDone(TRUE); - } - if ( h != -1 ) - { - constr->height.SetValue(h); - constr->height.SetDone(TRUE); - } + wxWindowMac *child = (wxWindowMac*)node->Data(); + if (child == m_vScrollBar) continue; + if (child == m_hScrollBar) continue; + if (child->IsTopLevel()) continue; + int x,y; + child->GetPosition( &x, &y ); + int w,h; + child->GetSize( &w, &h ); + child->SetSize( x+dx, y+dy, w, h ); } + } -void wxWindow::MoveConstraint(int x, int y) +void wxWindowMac::MacOnScroll(wxScrollEvent &event ) { - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) + if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) { - if ( x != -1 ) - { - constr->left.SetValue(x); - constr->left.SetDone(TRUE); - } - if ( y != -1 ) - { - constr->top.SetValue(y); - constr->top.SetDone(TRUE); + wxScrollWinEvent wevent; + wevent.SetPosition(event.GetPosition()); + wevent.SetOrientation(event.GetOrientation()); + wevent.m_eventObject = this; + + if (event.m_eventType == wxEVT_SCROLL_TOP) { + wevent.m_eventType = wxEVT_SCROLLWIN_TOP; + } else + if (event.m_eventType == wxEVT_SCROLL_BOTTOM) { + wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; + } else + if (event.m_eventType == wxEVT_SCROLL_LINEUP) { + wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; + } else + if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) { + wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; + } else + if (event.m_eventType == wxEVT_SCROLL_PAGEUP) { + wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; + } else + if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) { + wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; + } else + if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) { + wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; } + + GetEventHandler()->ProcessEvent(wevent); } } -void wxWindow::GetSizeConstraint(int *w, int *h) const +// Get the window with the focus +wxWindowMac *wxWindowBase::FindFocus() { - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetSize(w, h); + return gFocusWindow ; } -void wxWindow::GetClientSizeConstraint(int *w, int *h) const +#if WXWIN_COMPATIBILITY +// 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 wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event) { - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetClientSize(w, h); + if ( GetEventHandler()->ProcessEvent(event) ) + return; + if ( m_parent ) + m_parent->GetEventHandler()->OnCommand(win, event); } +#endif // WXWIN_COMPATIBILITY_2 -void wxWindow::GetPositionConstraint(int *x, int *y) const +#if WXWIN_COMPATIBILITY +wxObject* wxWindowMac::GetChild(int number) const { - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) + // Return a pointer to the Nth object in the Panel + wxNode *node = GetChildren().First(); + int n = number; + while (node && n--) + node = node->Next(); + if ( node ) { - *x = constr->left.GetValue(); - *y = constr->top.GetValue(); + wxObject *obj = (wxObject *)node->Data(); + return(obj); } else - GetPosition(x, y); -} - -#endif // wxUSE_CONSTRAINTS - -bool wxWindow::Close(bool force) -{ - wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); - event.SetEventObject(this); -#if WXWIN_COMPATIBILITY - event.SetForce(force); -#endif - event.SetCanVeto(!force); - - return GetEventHandler()->ProcessEvent(event); + return NULL; } +#endif // WXWIN_COMPATIBILITY -wxObject* wxWindow::GetChild(int number) const +void wxWindowMac::OnSetFocus(wxFocusEvent& event) { - // Return a pointer to the Nth object in the window - wxNode *node = GetChildren().First(); - int n = number; - while (node && n--) - node = node->Next() ; - if (node) - { - wxObject *obj = (wxObject *)node->Data(); - return(obj) ; - } - else - return NULL ; -} + // 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 + + // CS:don't know if this is still needed: + //wxChildFocusEvent eventFocus(this); + //(void)GetEventHandler()->ProcessEvent(eventFocus); -void wxWindow::OnDefaultAction(wxControl *initiatingItem) -{ - // Obsolete function + event.Skip(); } -void wxWindow::Clear() +void wxWindowMac::Clear() { - if ( m_macWindowData ) - { - wxMacDrawingClientHelper helper ( this ) ; - int w ,h ; - wxPoint origin = GetClientAreaOrigin() ; - GetClientSize( &w , &h ) ; - UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ; - Rect r = { origin.y , origin.x, origin.y+h , origin.x+w } ; - EraseRect( &r ) ; - } - else - { - wxClientDC dc(this); + wxClientDC dc(this); wxBrush brush(GetBackgroundColour(), wxSOLID); dc.SetBackground(brush); dc.Clear(); - } -} - -// Fits the panel around the items -void wxWindow::Fit() -{ - int maxX = 0; - int maxY = 0; - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *win = (wxWindow *)node->Data(); - int wx, wy, ww, wh; - win->GetPosition(&wx, &wy); - win->GetSize(&ww, &wh); - if ( wx + ww > maxX ) - maxX = wx + ww; - if ( wy + wh > maxY ) - maxY = wy + wh; - - node = node->Next(); - } - SetClientSize(maxX + 5, maxY + 5); -} - -void wxWindow::SetValidator(const wxValidator& validator) -{ - if ( m_windowValidator ) - delete m_windowValidator; - m_windowValidator = validator.Clone(); - - if ( m_windowValidator ) - m_windowValidator->SetWindow(this) ; -} - -void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel) -{ - m_acceleratorTable = accel; -} - -// Find a window by id or name -wxWindow *wxWindow::FindWindow(long id) -{ - if ( GetId() == id) - return this; - - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(id); - if ( found ) - return found; - node = node->Next(); - } - return NULL; } -wxWindow *wxWindow::FindWindow(const wxString& name) +// Setup background and foreground colours correctly +void wxWindowMac::SetupColours() { - if ( GetName() == name) - return this; - - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(name); - if ( found ) - return found; - node = node->Next(); - } - return NULL; + if ( GetParent() ) + SetBackgroundColour(GetParent()->GetBackgroundColour()); } -void wxWindow::OnIdle(wxIdleEvent& event) +void wxWindowMac::OnIdle(wxIdleEvent& event) { /* // Check if we need to send a LEAVE event @@ -1740,870 +1284,577 @@ void wxWindow::OnIdle(wxIdleEvent& event) // This calls the UI-update mechanism (querying windows for // menu/toolbar/control state information) - UpdateWindowUI(); + UpdateWindowUI(); } // Raise the window to the top of the Z order -void wxWindow::Raise() +void wxWindowMac::Raise() { - // TODO } // Lower the window to the bottom of the Z order -void wxWindow::Lower() +void wxWindowMac::Lower() { - // TODO } -bool wxWindow::AcceptsFocus() const +void wxWindowMac::DoSetClientSize(int width, int height) { - return IsShown() && IsEnabled() && MacCanFocus() ; -} + if ( width != -1 || height != -1 ) + { + + if ( width != -1 && m_vScrollBar ) + width += MAC_SCROLLBAR_SIZE ; + if ( height != -1 && m_vScrollBar ) + height += MAC_SCROLLBAR_SIZE ; -// Update region access -wxRegion wxWindow::GetUpdateRegion() const -{ - return m_updateRegion; -} + width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; + height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; -bool wxWindow::IsExposed(int x, int y, int w, int h) const -{ - return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion); + DoSetSize( -1 , -1 , width , height ) ; + } } -bool wxWindow::IsExposed(const wxPoint& pt) const + +wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ; + +bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) { - return (m_updateRegion.Contains(pt) != wxOutRegion); + if ( IsTopLevel() ) + { + if ((point.x < 0) || (point.y < 0) || + (point.x > (m_width)) || (point.y > (m_height))) + return FALSE; + } + else + { + if ((point.x < m_x) || (point.y < m_y) || + (point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) + return FALSE; + } + + WindowRef window = (WindowRef) MacGetRootWindow() ; + + wxPoint newPoint( point ) ; + + if ( !IsTopLevel() ) + { + newPoint.x -= m_x; + newPoint.y -= m_y; + } + + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + // added the m_isShown test --dmazzoni + if ( child->MacGetRootWindow() == window && child->m_isShown ) + { + if (child->MacGetWindowFromPointSub(newPoint , outWin )) + return TRUE; + } + } + + *outWin = this ; + return TRUE; } -bool wxWindow::IsExposed(const wxRect& rect) const +bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) { - return (m_updateRegion.Contains(rect) != wxOutRegion); + WindowRef window ; + + Point pt = { screenpoint.y , screenpoint.x } ; + if ( ::FindWindow( pt , &window ) == 3 ) + { + + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win ) + { + // No, this yields the CLIENT are, we need the whole frame. RR. + // point = win->ScreenToClient( point ) ; + + GrafPtr port; + ::GetPort( &port ) ; + ::SetPort( UMAGetWindowPort( window ) ) ; + ::GlobalToLocal( &pt ) ; + ::SetPort( port ) ; + + wxPoint point( pt.h, pt.v ) ; + + return win->MacGetWindowFromPointSub( point , outWin ) ; + } + } + return FALSE ; } -/* - * Allocates control IDs - */ +extern int wxBusyCursorCount ; -int wxWindow::NewControlId() +bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event) { - static int s_controlId = 0; - s_controlId ++; - return s_controlId; -} + 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))) + return FALSE; + -void wxWindow::DoSetClientSize(int width, int height) -{ - if ( width != -1 || height != -1 ) - { - - if ( width != -1 && m_vScrollBar ) - width += MAC_SCROLLBAR_SIZE ; - if ( height != -1 && m_vScrollBar ) - height += MAC_SCROLLBAR_SIZE ; + if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) ) + return FALSE ; + + WindowRef window = (WindowRef) MacGetRootWindow() ; - DoSetSize( -1 , -1 , width , height ) ; - } -} + event.m_x -= m_x; + event.m_y -= m_y; + + int x = event.m_x ; + int y = event.m_y ; -// ------------------------ -wxList *wxWinMacWindowList = NULL; -wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef) -{ - wxNode *node = wxWinMacWindowList->Find((long)inWindowRef); - if (!node) - return NULL; - return (wxWindow *)node->Data(); -} + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() ) + { + if (child->MacDispatchMouseEvent(event)) + return TRUE; + } + } -void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindow *win) -{ - // adding NULL WindowRef is (first) surely a result of an error and - // (secondly) breaks menu command processing - wxCHECK_RET( inWindowRef != (WindowRef) NULL, "attempt to add a NULL WindowRef to window list" ); + event.m_x = x ; + event.m_y = y ; + + if ( wxBusyCursorCount == 0 ) + { + 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 + || event.GetEventType() == wxEVT_ENTER_WINDOW + || event.GetEventType() == wxEVT_LEAVE_WINDOW ) + wxToolTip::RelayEvent( this , event); +#endif // wxUSE_TOOLTIPS - if ( !wxWinMacWindowList->Find((long)inWindowRef) ) - wxWinMacWindowList->Append((long)inWindowRef, win); + GetEventHandler()->ProcessEvent( event ) ; + + return TRUE; } -void wxRemoveMacWindowAssociation(wxWindow *win) +wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) { - wxWinMacWindowList->DeleteObject(win); + if ( m_tooltip ) + { + return m_tooltip->GetTip() ; + } + return "" ; } -wxWindow* wxWindow::s_lastMouseWindow = NULL ; - -bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) +void wxWindowMac::Update() { - if ((point.x < m_x) || (point.y < m_y) || - (point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) - return FALSE; - - WindowRef window = GetMacRootWindow() ; - - wxPoint newPoint( point ) ; - - newPoint.x -= m_x; - newPoint.y -= m_y; - - if ( m_children ) - { - for (wxNode *node = m_children->First(); node; node = node->Next()) - { - wxWindow *child = (wxWindow*)node->Data(); - if ( child->GetMacRootWindow() == window ) - { - if (child->MacGetWindowFromPointSub(newPoint , outWin )) - return TRUE; - } - } - } - - *outWin = this ; - return TRUE; + wxTopLevelWindowMac* win = MacGetTopLevelWindow( ) ; + if ( win ) + { + win->MacUpdate( 0 ) ; +#if TARGET_API_MAC_CARBON + if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) ) + { + QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ; + } +#endif + } } -bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin ) +wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const { - WindowRef window ; - Point pt = { screenpoint.y , screenpoint.x } ; - if ( ::FindWindow( pt , &window ) == 3 ) - { - wxPoint point( screenpoint ) ; - wxWindow* win = wxFindWinFromMacWindow( window ) ; - win->ScreenToClient( point ) ; - return win->MacGetWindowFromPointSub( point , outWin ) ; - } - return FALSE ; + wxTopLevelWindowMac* win = NULL ; + WindowRef window = (WindowRef) MacGetRootWindow() ; + if ( window ) + { + win = wxFindWinFromMacWindow( window ) ; + } + return win ; } -extern int wxBusyCursorCount ; +const wxRegion& wxWindowMac::MacGetVisibleRegion() +{ + RgnHandle visRgn = NewRgn() ; + RgnHandle tempRgn = NewRgn() ; + + SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ; -bool wxWindow::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))) - return FALSE; - - if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) ) - return FALSE ; - - WindowRef window = GetMacRootWindow() ; - - event.m_x -= m_x; - event.m_y -= m_y; - - int x = event.m_x ; - int y = event.m_y ; - - if ( m_children ) - { - for (wxNode *node = m_children->First(); node; node = node->Next()) - { - wxWindow *child = (wxWindow*)node->Data(); - if ( child->GetMacRootWindow() == window && child->IsReallyShown() && child->IsReallyEnabled() ) - { - if (child->MacDispatchMouseEvent(event)) - return TRUE; - } - } - } - - event.m_x = x ; - event.m_y = y ; - - if ( wxBusyCursorCount == 0 ) - { - m_windowCursor.MacInstall() ; - } - GetEventHandler()->ProcessEvent( event ) ; - return TRUE; -} - -void wxWindow::MacFireMouseEvent( EventRecord *ev ) -{ - wxMouseEvent event(wxEVT_LEFT_DOWN); - bool isDown = !(ev->modifiers & btnState) ; // 1 is for up - bool controlDown = ev->modifiers & controlKey ; // for simulating right mouse - - event.m_leftDown = isDown && !controlDown; - event.m_middleDown = FALSE; - event.m_rightDown = isDown && controlDown; - - if ( ev->what == mouseDown ) - { - if ( controlDown ) - event.SetEventType(wxEVT_RIGHT_DOWN ) ; - else - event.SetEventType(wxEVT_LEFT_DOWN ) ; - } - else if ( ev->what == mouseUp ) - { - if ( controlDown ) - event.SetEventType(wxEVT_RIGHT_UP ) ; - else - event.SetEventType(wxEVT_LEFT_UP ) ; - } - else - { - event.SetEventType(wxEVT_MOTION ) ; - } - - event.m_shiftDown = ev->modifiers & shiftKey; - event.m_controlDown = ev->modifiers & controlKey; - event.m_altDown = ev->modifiers & optionKey; - event.m_metaDown = ev->modifiers & cmdKey; - - Point localwhere = ev->where ; - - GrafPtr port ; - ::GetPort( &port ) ; - ::SetPort( UMAGetWindowPort( m_macWindowData->m_macWindow ) ) ; - ::GlobalToLocal( &localwhere ) ; - ::SetPort( port ) ; - - event.m_x = localwhere.h; - event.m_y = localwhere.v; - event.m_x += m_x; - event.m_y += m_y; + //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox + if ( IsKindOf( CLASSINFO( wxStaticBox ) ) ) + { + int borderTop = 14 ; + int borderOther = 4 ; + + SetRectRgn( tempRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ; + DiffRgn( visRgn , tempRgn , visRgn ) ; + } -/* - wxPoint origin = GetClientAreaOrigin() ; + if ( !IsTopLevel() ) + { + wxWindow* parent = GetParent() ; + while( parent ) + { + wxSize size = parent->GetSize() ; + int x , y ; + x = y = 0 ; + parent->MacWindowToRootWindow( &x, &y ) ; + MacRootWindowToWindow( &x , &y ) ; + SetRectRgn( tempRgn , x , y , x + size.x , y + size.y ) ; + SectRgn( visRgn , tempRgn , visRgn ) ; + if ( parent->IsTopLevel() ) + break ; + parent = parent->GetParent() ; + } + } + if ( GetWindowStyle() & wxCLIP_CHILDREN ) + { + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); - event.m_x += origin.x ; - event.m_y += origin.y ; -*/ - - event.m_timeStamp = ev->when; - event.SetEventObject(this); - if ( wxTheApp->s_captureWindow ) - { - int x = event.m_x ; - int y = event.m_y ; - wxTheApp->s_captureWindow->ScreenToClient( &x , &y ) ; - event.m_x = x ; - event.m_y = y ; - wxTheApp->s_captureWindow->GetEventHandler()->ProcessEvent( event ) ; - if ( ev->what == mouseUp ) - { - wxTheApp->s_captureWindow = NULL ; - if ( wxBusyCursorCount == 0 ) - { - m_windowCursor.MacInstall() ; - } - } - } - else - { - MacDispatchMouseEvent( event ) ; - } -} - -void wxWindow::MacMouseDown( EventRecord *ev , short part) -{ - MacFireMouseEvent( ev ) ; -} - -void wxWindow::MacMouseUp( EventRecord *ev , short part) -{ - WindowPtr frontWindow ; - switch (part) - { - case inContent: - { - MacFireMouseEvent( ev ) ; - } - break ; - } -} - -void wxWindow::MacMouseMoved( EventRecord *ev , short part) -{ - WindowPtr frontWindow ; - switch (part) - { - case inContent: - { - MacFireMouseEvent( ev ) ; - } - break ; - } -} -void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating ) -{ - wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating); - event.m_timeStamp = ev->when ; - event.SetEventObject(this); - - GetEventHandler()->ProcessEvent(event); - - UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ; -} - -void wxWindow::MacRedraw( RgnHandle updatergn , long time) -{ - // updatergn is always already clipped to our boundaries - WindowRef window = GetMacRootWindow() ; - wxWindow* win = wxFindWinFromMacWindow( window ) ; - { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - WindowRef window = GetMacRootWindow() ; - if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) - { - UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ; - } - else if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether - // 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() ; - while( parent ) - { - if ( parent->GetMacRootWindow() != window ) - { - // we are in a different window on the mac system - parent = NULL ; - break ; - } - - if( parent->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)parent)->GetMacControl() ) - { - if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) - { - // if we have any other colours in the hierarchy - RGBBackColor( &parent->m_backgroundColour.GetPixel()) ; - break ; - } - // if we have the normal colours in the hierarchy but another control etc. -> use it's background - if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) )) - { - ApplyThemeBackground (kThemeBackgroundTabPane, &(**updatergn).rgnBBox , kThemeStateActive,8,true); - break ; - } - } - else - { - parent = NULL ; - break ; - } - parent = parent->GetParent() ; - } - if ( !parent ) - { - // if there is nothing special -> use default - UMASetThemeWindowBackground( window , kThemeBrushDialogBackgroundActive , false ) ; - } - } - else - { - RGBBackColor( &m_backgroundColour.GetPixel()) ; - } - SetClip( updatergn ) ; - EraseRgn( updatergn ) ; - } - } - - - m_updateRegion = updatergn ; - wxPaintEvent event; - event.m_timeStamp = time ; - event.SetEventObject(this); - - GetEventHandler()->ProcessEvent(event); - - RgnHandle childupdate = NewRgn() ; - - for (wxNode *node = m_children->First(); node; node = node->Next()) - { - wxWindow *child = (wxWindow*)node->Data(); - int width ; - int height ; - - child->GetClientSize( &width , &height ) ; - - SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x +width , child->m_y + height ) ; - SectRgn( childupdate , m_updateRegion.GetWXHRGN() , childupdate ) ; - OffsetRgn( childupdate , -child->m_x , -child->m_y ) ; - if ( child->GetMacRootWindow() == window && child->IsReallyShown() ) - { - // because dialogs may also be children - child->MacRedraw( childupdate , time ) ; - } - } - DisposeRgn( childupdate ) ; - // eventually a draw grow box here -} - -void wxWindow::MacUpdateImmediately() -{ - WindowRef window = GetMacRootWindow() ; - if ( window ) - { - wxWindow* win = wxFindWinFromMacWindow( window ) ; - BeginUpdate( window ) ; - if ( win ) - { - #if ! TARGET_CARBON - if ( !EmptyRgn( window->visRgn ) ) - #endif - { - win->MacRedraw( window->visRgn , wxTheApp->sm_lastMessageTime ) ; -/* - { - wxMacDrawingHelper help( win ) ; - SetOrigin( 0 , 0 ) ; - UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; - UMAUpdateControls( window , window->visRgn ) ; - UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ; - } -*/ - } - } - EndUpdate( window ) ; - } -} + if ( !child->IsTopLevel() && child->IsShown() ) + { + SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; + DiffRgn( visRgn , tempRgn , visRgn ) ; + } + } + } + + if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() ) + { + bool thisWindowThrough = false ; + for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *sibling = (wxWindowMac*)node->Data(); + if ( sibling == this ) + { + thisWindowThrough = true ; + continue ; + } + if( !thisWindowThrough ) + { + continue ; + } -void wxWindow::MacUpdate( EventRecord *ev ) -{ - WindowRef window = (WindowRef) ev->message ; - wxWindow * win = wxFindWinFromMacWindow( window ) ; - - BeginUpdate( window ) ; - if ( win ) - { - // if windowshade gives incompatibility , take the follwing out - #if ! TARGET_CARBON - if ( !EmptyRgn( window->visRgn ) ) - #endif - { - MacRedraw( window->visRgn , ev->when ) ; - /* - { - wxMacDrawingHelper help( this ) ; - SetOrigin( 0 , 0 ) ; - UMASetThemeWindowBackground( m_macWindowData->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ; - UMAUpdateControls( window , window->visRgn ) ; - UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ; - } - */ - } - } - EndUpdate( window ) ; + if ( !sibling->IsTopLevel() && sibling->IsShown() ) + { + SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ; + DiffRgn( visRgn , tempRgn , visRgn ) ; + } + } + } + m_macVisibleRegion = visRgn ; + DisposeRgn( visRgn ) ; + DisposeRgn( tempRgn ) ; + return m_macVisibleRegion ; } -WindowRef wxWindow::GetMacRootWindow() const +void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase) { - WindowRef window = NULL ; - wxWindow *iter = (wxWindow*)this ; - - while( iter ) - { - if ( iter->m_macWindowData ) - return iter->m_macWindowData->m_macWindow ; + RgnHandle updatergn = (RgnHandle) updatergnr ; + // updatergn is always already clipped to our boundaries + // it is in window coordinates, not in client coordinates + + WindowRef window = (WindowRef) MacGetRootWindow() ; - iter = iter->GetParent() ; - } - wxASSERT_MSG( 1 , "No valid mac root window" ) ; - return NULL ; + { + // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates + RgnHandle ownUpdateRgn = NewRgn() ; + CopyRgn( updatergn , ownUpdateRgn ) ; + + SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ; + + // newupdate is the update region in client coordinates + 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 , ownUpdateRgn , newupdate ) ; + OffsetRgn( newupdate , -origin.x , -origin.y ) ; + m_updateRegion = newupdate ; + DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion + + if ( erase && !EmptyRgn(ownUpdateRgn) ) + { + wxWindowDC dc(this); + dc.SetClippingRegion(wxRegion(ownUpdateRgn)); + wxEraseEvent eevent( GetId(), &dc ); + eevent.SetEventObject( this ); + GetEventHandler()->ProcessEvent( eevent ); + + wxNcPaintEvent eventNc( GetId() ); + eventNc.SetEventObject( this ); + GetEventHandler()->ProcessEvent( eventNc ); + } + DisposeRgn( ownUpdateRgn ) ; + if ( !m_updateRegion.Empty() ) + { + wxPaintEvent event; + event.m_timeStamp = time ; + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } + } + + // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively + + RgnHandle childupdate = NewRgn() ; + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + // calculate the update region for the child windows by intersecting the window rectangle with our own + // passed in update region and then offset it to be client-wise window coordinates again + 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 , updatergn , childupdate ) ; + OffsetRgn( childupdate , -child->m_x , -child->m_y ) ; + if ( child->MacGetRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) ) + { + // because dialogs may also be children + child->MacRedraw( childupdate , time , erase ) ; + } + } + DisposeRgn( childupdate ) ; + // eventually a draw grow box here + } -void wxWindow::MacCreateScrollBars( long style ) +WXHWND wxWindowMac::MacGetRootWindow() const { - wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ; - bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; - int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ; - - if ( style & wxVSCROLL ) - { - m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, wxPoint(m_width-MAC_SCROLLBAR_SIZE, 0), - wxSize(MAC_SCROLLBAR_SIZE, m_height - adjust), wxVERTICAL); - } - if ( style & wxHSCROLL ) - { - m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, wxPoint(0 , m_height-MAC_SCROLLBAR_SIZE ), - wxSize( m_width - adjust, MAC_SCROLLBAR_SIZE), wxHORIZONTAL); - } - // because the create does not take into account the client area origin - MacRepositionScrollBars() ; // we might have a real position shift + wxWindowMac *iter = (wxWindowMac*)this ; + + while( iter ) + { + if ( iter->IsTopLevel() ) + return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ; + + iter = iter->GetParent() ; + } + wxASSERT_MSG( 1 , "No valid mac root window" ) ; + return NULL ; } -void wxWindow::MacRepositionScrollBars() -{ - bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; - int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ; - - if ( m_vScrollBar ) - { - m_vScrollBar->SetSize( m_width-MAC_SCROLLBAR_SIZE, 0, MAC_SCROLLBAR_SIZE, m_height - adjust , wxSIZE_USE_EXISTING); - } - if ( m_hScrollBar ) - { - m_hScrollBar->SetSize( 0 , m_height-MAC_SCROLLBAR_SIZE ,m_width - adjust, MAC_SCROLLBAR_SIZE, wxSIZE_USE_EXISTING); - } -} - -void wxWindow::MacKeyDown( EventRecord *ev ) +void wxWindowMac::MacCreateScrollBars( long style ) { + wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ; + + bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ; + int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ; + int width, height ; + GetClientSize( &width , &height ) ; + + wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ; + wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ; + wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ; + wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ; + + m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint, + vSize , wxVERTICAL); + + if ( style & wxVSCROLL ) + { + + } + else + { + m_vScrollBar->Show(false) ; + } + m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, + hSize , wxHORIZONTAL); + if ( style & wxHSCROLL ) + { + } + else + { + m_hScrollBar->Show(false) ; + } + + // because the create does not take into account the client area origin + MacRepositionScrollBars() ; // we might have a real position shift } +void wxWindowMac::MacRepositionScrollBars() +{ + bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; + int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ; + + // get real client area + + int width = m_width ; + int height = m_height ; + + width -= MacGetLeftBorderSize() + MacGetRightBorderSize(); + height -= MacGetTopBorderSize() + MacGetBottomBorderSize(); + + wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ; + wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ; + wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ; + wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ; + + int x = 0 ; + int y = 0 ; + int w = m_width ; + int h = m_height ; + + MacClientToRootWindow( &x , &y ) ; + MacClientToRootWindow( &w , &h ) ; + + wxWindowMac *iter = (wxWindowMac*)this ; + + int totW = 10000 , totH = 10000; + while( iter ) + { + if ( iter->IsTopLevel() ) + { + totW = iter->m_width ; + totH = iter->m_height ; + break ; + } + + iter = iter->GetParent() ; + } + + if ( x == 0 ) + { + hPoint.x = -1 ; + hSize.x += 1 ; + } + if ( y == 0 ) + { + vPoint.y = -1 ; + vSize.y += 1 ; + } + + if ( w-x >= totW ) + { + hSize.x += 1 ; + vPoint.x += 1 ; + } + + if ( h-y >= totH ) + { + vSize.y += 1 ; + hPoint.y += 1 ; + } + if ( m_vScrollBar ) + { + m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE); + } + if ( m_hScrollBar ) + { + m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE); + } +} +bool wxWindowMac::AcceptsFocus() const +{ + return MacCanFocus() && wxWindowBase::AcceptsFocus(); +} -ControlHandle wxWindow::MacGetContainerForEmbedding() +WXWidget wxWindowMac::MacGetContainerForEmbedding() { - if ( m_macWindowData ) - return m_macWindowData->m_macRootControl ; - else - return GetParent()->MacGetContainerForEmbedding() ; + return GetParent()->MacGetContainerForEmbedding() ; } -void wxWindow::MacSuperChangedPosition() +void wxWindowMac::MacSuperChangedPosition() { - // only window-absolute structures have to be moved i.e. controls + // only window-absolute structures have to be moved i.e. controls - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - child->MacSuperChangedPosition() ; - node = node->Next(); - } + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + child->MacSuperChangedPosition() ; + node = node->Next(); + } } -bool wxWindow::IsReallyShown() const +void wxWindowMac::MacTopLevelWindowChangedPosition() { - if ( m_macWindowData ) - return m_macShown ; - else - return m_macShown && GetParent()->IsReallyShown() ; -} + // only screen-absolute structures have to be moved i.e. glcanvas -bool wxWindow::IsReallyEnabled() const + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + child->MacTopLevelWindowChangedPosition() ; + node = node->Next(); + } +} +long wxWindowMac::MacGetLeftBorderSize( ) const { - if ( m_macWindowData ) - return m_macEnabled ; - else - return m_macEnabled && GetParent()->IsReallyEnabled() ; + if( IsTopLevel() ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + SInt32 border = 3 ; +#if wxMAC_USE_THEME_BORDER +#if TARGET_CARBON + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; +#endif +#endif + return border ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + SInt32 border = 3 ; +#if wxMAC_USE_THEME_BORDER +#if TARGET_CARBON + GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ; +#endif +#endif + return border ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 1 ; + } + return 0 ; } -void wxWindow::MacSuperEnabled( bool enabled ) +long wxWindowMac::MacGetRightBorderSize( ) const { - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->m_macEnabled ) - child->MacSuperEnabled( enabled ) ; - node = node->Next(); - } + // they are all symmetric in mac themes + return MacGetLeftBorderSize() ; } -void wxWindow::MacSuperShown( bool show ) + +long wxWindowMac::MacGetTopBorderSize( ) const { - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->m_macShown ) - child->MacSuperShown( show ) ; - node = node->Next(); - } + // they are all symmetric in mac themes + return MacGetLeftBorderSize() ; } - -bool wxWindow::MacSetupFocusPort( ) + +long wxWindowMac::MacGetBottomBorderSize( ) const { - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; + // they are all symmetric in mac themes + return MacGetLeftBorderSize() ; } -bool wxWindow::MacSetupFocusClientPort( ) +long wxWindowMac::MacRemoveBordersFromStyle( long style ) { - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; + return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; } -bool wxWindow::MacSetupDrawingPort( ) +// Find the wxWindowMac at the current mouse position, returning the mouse +// position. +wxWindowMac* wxFindWindowAtPointer(wxPoint& pt) { - 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 ) -{ - if ( window == NULL ) - return false ; - - GrafPtr currPort; - GrafPtr port ; - - ::GetPort(&currPort); - port = UMAGetWindowPort( window) ; - if (currPort != port ) - ::SetPort(port); - - ::SetOrigin(-localOrigin.h, -localOrigin.v); - return true; -} - -bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) -{ - if ( window == NULL ) - return false ; - - GrafPtr currPort; - GrafPtr port ; - ::GetPort(&currPort); - port = UMAGetWindowPort( window) ; - if (currPort != port ) - ::SetPort(port); - - ::SetOrigin(-localOrigin.h, -localOrigin.v); - ::ClipRect(&clipRect); - - ::PenNormal() ; - ::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ; - ::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ; - ::BackPat( &qd.white ) ; - ::UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ; - return true; -} - -void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin) -{ - if ( m_macWindowData ) - { - localOrigin->h = 0; - localOrigin->v = 0; - clipRect->left = 0; - clipRect->top = 0; - clipRect->right = m_width; - clipRect->bottom = m_height; - *window = m_macWindowData->m_macWindow ; - *rootwin = this ; - } - else - { - wxASSERT( GetParent() != NULL ) ; - GetParent()->MacGetPortParams( localOrigin , clipRect , window, rootwin) ; - localOrigin->h += m_x; - localOrigin->v += m_y; - OffsetRect(clipRect, -m_x, -m_y); - - Rect myClip; - myClip.left = 0; - myClip.top = 0; - myClip.right = m_width; - myClip.bottom = m_height; - SectRect(clipRect, &myClip, clipRect); - } -} - -void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) -{ - int width , height ; - GetClientSize( &width , &height ) ; - - if ( m_macWindowData ) - { - localOrigin->h = 0; - localOrigin->v = 0; - clipRect->left = 0; - clipRect->top = 0; - clipRect->right = m_width ;//width; - clipRect->bottom = m_height ;// height; - *window = m_macWindowData->m_macWindow ; - *rootwin = this ; - } - else - { - wxASSERT( GetParent() != NULL ) ; - - GetParent()->MacGetPortClientParams( localOrigin , clipRect , window, rootwin) ; - - localOrigin->h += m_x; - localOrigin->v += m_y; - OffsetRect(clipRect, -m_x, -m_y); - - Rect myClip; - myClip.left = 0; - myClip.top = 0; - myClip.right = width; - myClip.bottom = height; - SectRect(clipRect, &myClip, clipRect); - } -} - -wxMacFocusHelper::wxMacFocusHelper( wxWindow * theWindow ) -{ - 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 ; - } -} - -wxMacFocusHelper::~wxMacFocusHelper() -{ - if ( m_ok ) - { - SetOrigin( 0 , 0 ) ; - } - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; -} - -wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) -{ - 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 ) ; - if ( m_formerPort != m_currentPort ) - SetPort( m_currentPort ) ; - GetPenState( &m_savedPenState ) ; - theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; - m_ok = true ; - } -} - -wxMacDrawingHelper::~wxMacDrawingHelper() -{ - if ( m_ok ) - { - SetPenState( &m_savedPenState ) ; - SetOrigin( 0 , 0 ) ; - ClipRect( &m_currentPort->portRect ) ; - } - - 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 ) - { - SetOrigin( 0 , 0 ) ; - } - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; -} - -wxMacDrawingClientHelper::wxMacDrawingClientHelper( 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 ) ; - if ( m_formerPort != m_currentPort ) - SetPort( m_currentPort ) ; - GetPenState( &m_savedPenState ) ; - theWindow->MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; - m_ok = true ; - } -} - -wxMacDrawingClientHelper::~wxMacDrawingClientHelper() -{ - if ( m_ok ) - { - SetPenState( &m_savedPenState ) ; - SetOrigin( 0 , 0 ) ; - ClipRect( &m_currentPort->portRect ) ; - } - - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; + pt = wxGetMousePosition(); + wxWindowMac* found = wxFindWindowAtPoint(pt); + return found; } -// ---------------------------------------------------------------------------- -// list classes implementation -// ---------------------------------------------------------------------------- - -void wxWindowListNode::DeleteData() +// Get the current mouse position. +wxPoint wxGetMousePosition() { - delete (wxWindow *)GetData(); + int x, y; + wxGetMousePosition(& x, & y); + return wxPoint(x, y); }