X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..bcd3d8d9e26e41615d26d457ba0e2b84b80a0356:/src/mac/window.cpp?ds=sidebyside diff --git a/src/mac/window.cpp b/src/mac/window.cpp index e8015acc3b..3f12059d91 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: windows.cpp -// Purpose: wxWindow +// Purpose: wxWindowMac // Author: AUTHOR // Modified by: // Created: ??/??/98 @@ -15,6 +15,7 @@ #include "wx/setup.h" #include "wx/menu.h" +#include "wx/window.h" #include "wx/dc.h" #include "wx/dcclient.h" #include "wx/utils.h" @@ -23,18 +24,23 @@ #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 @@ -48,65 +54,101 @@ #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_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 -// Constructor -wxWindow::wxWindow() + +// =========================================================================== +// implementation +// =========================================================================== + +// --------------------------------------------------------------------------- +// wxWindowMac utility functions +// --------------------------------------------------------------------------- + +// Find an item given the Macintosh Window Reference + +wxList *wxWinMacWindowList = NULL; +wxWindowMac *wxFindWinFromMacWindow(WindowRef inWindowRef) +{ + wxNode *node = wxWinMacWindowList->Find((long)inWindowRef); + if (!node) + return NULL; + return (wxWindowMac *)node->Data(); +} + +void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxWindowMac *win) { - Init() ; + // 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" ); + + if ( !wxWinMacWindowList->Find((long)inWindowRef) ) + wxWinMacWindowList->Append((long)inWindowRef, win); +} + +void wxRemoveMacWindowAssociation(wxWindowMac *win) +{ + wxWinMacWindowList->DeleteObject(win); } -void wxWindow::Init() +// ---------------------------------------------------------------------------- +// constructors and such +// ---------------------------------------------------------------------------- + +WindowRef wxWindowMac::s_macWindowInUpdate = NULL; + +void wxWindowMac::Init() { + // generic + InitBase(); + + m_macEraseOnRedraw = true ; + + // 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; + + // as all windows are created with WS_VISIBLE style... + m_isShown = TRUE; + m_macWindowData = NULL ; - m_isWindow = TRUE; + m_macEraseOnRedraw = 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; #if wxUSE_DRAG_AND_DROP m_pDropTarget = NULL; @@ -114,226 +156,166 @@ void wxWindow::Init() } // Destructor -wxWindow::~wxWindow() +wxWindowMac::~wxWindowMac() { + // deleting a window while it is shown invalidates the region + if ( IsShown() ) { + wxWindowMac* iter = this ; + while( iter ) { + if ( iter->m_macWindowData ) + { + Refresh() ; + break ; + } + iter = iter->GetParent() ; + + } + } + + m_isBeingDeleted = TRUE; + if ( s_lastMouseWindow == this ) { 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) + + if ( gFocusWindow == this ) { - delete m_windowSizer; - m_windowSizer = NULL; + gFocusWindow = NULL ; } - // If this is a child of a sizer, remove self from parent - if (m_sizerParent) - m_sizerParent->RemoveChild((wxWindow *)this); -#endif - - 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); + if ( m_parent ) + m_parent->RemoveChild(this); DestroyChildren(); - if ( m_macWindowData ) - { + if ( m_macWindowData ) + { + wxToolTip::NotifyWindowDelete(m_macWindowData->m_macWindow) ; UMADisposeWindow( m_macWindowData->m_macWindow ) ; delete m_macWindowData ; wxRemoveMacWindowAssociation( this ) ; } - - delete m_children; - m_children = NULL; - - // Just in case the window has been Closed, but - // we're then deleting immediately: don't leave - // dangling pointers. - wxPendingDelete.DeleteObject(this); - - if ( m_windowValidator ) - delete m_windowValidator; -} - -// Destroy the window (delayed, if a managed window) -bool wxWindow::Destroy() -{ - delete this; - return TRUE; } // 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; - - m_windowStyle = style; - - if ( id == -1 ) - m_windowId = (int)NewControlId(); - else - m_windowId = id; + parent->AddChild(this); 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; - - MacCreateScrollBars( style ) ; - + 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; } -void wxWindow::SetFocus() +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( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlFocusNoPart ) ; + control->MacRedrawControl() ; } - wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId); - event.SetEventObject(gFocusWindow); + #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); + (void)GetEventHandler()->ProcessEvent(eventFocus); + + #ifndef __WXUNIVERSAL__ 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); + #endif + wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); + event.SetEventObject(this); GetEventHandler()->ProcessEvent(event) ; } } } -void wxWindow::Enable(bool enable) +bool wxWindowMac::Enable(bool enable) { - if ( m_macEnabled == enable ) - return ; - - m_macEnabled = enable ; - - MacSuperEnabled( enable ) ; - return; -} + if ( !wxWindowBase::Enable(enable) ) + return FALSE; -void wxWindow::CaptureMouse() -{ - wxTheApp->s_captureWindow = this ; + wxWindowList::Node *node = GetChildren().GetFirst(); + while ( node ) + { + wxWindowMac *child = node->GetData(); + child->Enable(enable); + + node = node->GetNext(); + } + + return TRUE; } -void wxWindow::ReleaseMouse() +void wxWindowMac::CaptureMouse() { - wxTheApp->s_captureWindow = NULL ; + wxTheApp->s_captureWindow = this ; } -// 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::ReleaseMouse() { - 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; @@ -349,37 +331,59 @@ 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 ; + int xx,yy; + + xx = m_x ; + yy = m_y ; if (GetParent()) { wxPoint pt(GetParent()->GetClientAreaOrigin()); - *x -= pt.x; - *y -= pt.y; + xx -= pt.x; + yy -= pt.y; } + if(x) *x = xx; + if(y) *y = yy; +} + +#if wxUSE_MENUS +bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y) +{ + menu->SetInvokingWindow(this); + menu->UpdateUI(); + ClientToScreen( &x , &y ) ; + + ::InsertMenu( menu->GetHMenu() , -1 ) ; + long menuResult = ::PopUpMenuSelect(menu->GetHMenu() ,y,x, 0) ; + menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ; + ::DeleteMenu( menu->MacGetMenuId() ) ; + menu->SetInvokingWindow(NULL); + + return TRUE; } +#endif -void wxWindow::ScreenToClient(int *x, int *y) const +void wxWindowMac::DoScreenToClient(int *x, int *y) const { WindowRef window = GetMacRootWindow() ; - Point localwhere ; - localwhere.h = * x ; - localwhere.v = * y ; + Point localwhere = {0,0} ; + + if(x) localwhere.h = * x ; + if(y) localwhere.v = * y ; GrafPtr port ; ::GetPort( &port ) ; @@ -387,115 +391,183 @@ void wxWindow::ScreenToClient(int *x, int *y) const ::GlobalToLocal( &localwhere ) ; ::SetPort( port ) ; - *x = localwhere.h ; - *y = localwhere.v ; + if(x) *x = localwhere.h ; + if(y) *y = localwhere.v ; MacRootWindowToClient( x , y ) ; } -void wxWindow::ClientToScreen(int *x, int *y) const +void wxWindowMac::DoClientToScreen(int *x, int *y) const { WindowRef window = GetMacRootWindow() ; MacClientToRootWindow( x , y ) ; - Point localwhere ; - localwhere.h = * x ; - localwhere.v = * y ; + Point localwhere = { 0,0 }; + if(x) localwhere.h = * x ; + if(y) localwhere.v = * y ; GrafPtr port ; ::GetPort( &port ) ; ::SetPort( UMAGetWindowPort( window ) ) ; + ::SetOrigin( 0 , 0 ) ; ::LocalToGlobal( &localwhere ) ; ::SetPort( port ) ; - *x = localwhere.h ; - *y = localwhere.v ; + if(x) *x = localwhere.h ; + if(y) *y = localwhere.v ; } -void wxWindow::MacClientToRootWindow( int *x , int *y ) const +void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const { - if ( m_macWindowData ) - { - } - else + if ( m_macWindowData == NULL) { - *x += m_x ; - *y += m_y ; + if(x) *x += m_x ; + if(y) *y += m_y ; GetParent()->MacClientToRootWindow( x , y ) ; } } -void wxWindow::MacRootWindowToClient( int *x , int *y ) const +void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const { - if ( m_macWindowData ) - { - } - else + if ( m_macWindowData == NULL) { - *x -= m_x ; - *y -= m_y ; + if(x) *x -= m_x ; + if(y) *y -= m_y ; GetParent()->MacRootWindowToClient( x , y ) ; } } -void wxWindow::SetCursor(const wxCursor& cursor) +bool wxWindowMac::SetCursor(const wxCursor& cursor) { - m_windowCursor = cursor; - if (m_windowCursor.Ok()) + 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 ) ; + + // Change the cursor NOW if we're within the correct window + + if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) ) { - // 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 + if ( mouseWin == this && !wxIsBusy() ) + { + m_cursor.MacInstall() ; + } } + + return TRUE ; } // Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindow::GetClientSize(int *x, int *y) const +void wxWindowMac::DoGetClientSize(int *x, int *y) const +{ + int ww, hh; + ww = m_width ; + hh = m_height ; + + 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->m_macWindowData ) + { + 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; +} + + +// ---------------------------------------------------------------------------- +// tooltips +// ---------------------------------------------------------------------------- + +#if wxUSE_TOOLTIPS + +void wxWindowMac::DoSetToolTip(wxToolTip *tooltip) { - *x = m_width ; - *y = m_height ; + wxWindowBase::DoSetToolTip(tooltip); - if (m_vScrollBar && m_vScrollBar->IsShown() ) - (*x) -= MAC_SCROLLBAR_SIZE; - if (m_hScrollBar && m_hScrollBar->IsShown() ) - (*y) -= MAC_SCROLLBAR_SIZE; + if ( m_tooltip ) + m_tooltip->SetWindow(this); } -void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) +#endif // wxUSE_TOOLTIPS + +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 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 ; - } + + 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; - AdjustForParentClientOrigin(actualX, actualY, sizeFlags); - - bool doMove = false ; bool doResize = false ; @@ -516,13 +588,12 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) else { // erase former position + wxMacDrawingHelper focus( this ) ; + if ( focus.Ok() ) { - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - InvalRect( &clientrect ) ; - } + Rect clientrect = { 0 , 0 , m_height , m_width } ; + // ClipRect( &clientrect ) ; + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } } m_x = actualX ; @@ -532,61 +603,137 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) if ( m_macWindowData ) { if ( doMove ) - ::MoveWindow(m_macWindowData->m_macWindow, m_x, m_y, false); // don't make frontmost + ::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); + ::SizeWindow(m_macWindowData->m_macWindow, m_width, m_height , true); - // the OS takes care of invalidating and erasing + // the OS takes care of invalidating and erasing the new area + // we have erased the old one if ( IsKindOf( CLASSINFO( wxFrame ) ) ) { wxFrame* frame = (wxFrame*) this ; - frame->PositionStatusBar(); - frame->PositionToolBar(); + frame->PositionStatusBar(); + frame->PositionToolBar(); } } else { // erase new position + { - wxMacDrawingClientHelper focus( this ) ; + wxMacDrawingHelper focus( this ) ; if ( focus.Ok() ) { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - InvalRect( &clientrect ) ; + Rect clientrect = { 0 , 0 , m_height , m_width } ; + // ClipRect( &clientrect ) ; + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } } + if ( doMove ) - wxWindow::MacSuperChangedPosition() ; // like this only children will be notified + wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified } MacRepositionScrollBars() ; if ( doMove ) { - wxMoveEvent event(wxPoint(m_x, m_y), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event) ; + 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); + } + } + +} + +// 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) +{ + // 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 ) + { + MacRepositionScrollBars() ; // we might have a real position shift + return; } - if ( doResize ) + + 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 ) { - MacRepositionScrollBars() ; - wxSizeEvent event(wxSize(m_width, m_height), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + if ( sizeFlags & wxSIZE_AUTO_WIDTH ) + { + size = DoGetBestSize(); + width = size.x; + } + else + { + // just take the current one + width = currentW; + } } - } + + 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 -wxPoint wxWindow::GetClientAreaOrigin() const +wxPoint wxWindowMac::GetClientAreaOrigin() const { - return wxPoint(0, 0); + return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) ); } // Makes an adjustment to the window position (for example, a frame that has // a toolbar that it manages itself). -void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) +void wxWindowMac::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) { if( !m_macWindowData ) { @@ -598,8 +745,10 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) } } -void wxWindow::SetTitle(const wxString& title) +void wxWindowMac::SetTitle(const wxString& title) { + m_label = title ; + wxString label ; if( wxApp::s_macDefaultEncodingIsPC ) @@ -611,67 +760,26 @@ void wxWindow::SetTitle(const wxString& title) UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; } -wxString wxWindow::GetTitle() const +wxString wxWindowMac::GetTitle() const { - 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; - } - - return wxEmptyString ; + return m_label ; } -void wxWindow::Centre(int direction) +bool wxWindowMac::Show(bool show) { - 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 - { - wxDisplaySize(&display_width, &display_height); - x_offset = 0 ; - y_offset = LMGetMBarHeight() + LMGetMBarHeight() / 2 ; // approx. the window title height - } - - 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); -} - + if ( !wxWindowBase::Show(show) ) + return FALSE; -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); + // no need to generate events here, they will get them triggered by macos + // actually they should be , but apparently they are not + wxSize size(m_width, m_height); + wxSizeEvent event(size, m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); } @@ -680,40 +788,87 @@ bool wxWindow::Show(bool show) UMAHideWindow( m_macWindowData->m_macWindow ) ; } } - Refresh() ; MacSuperShown( show ) ; - return TRUE; + if ( !show ) + { + WindowRef window = GetMacRootWindow() ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win && !win->m_isBeingDeleted ) + Refresh() ; + } + else + { + Refresh() ; + } + + return TRUE; +} + +void wxWindowMac::MacSuperShown( bool show ) +{ + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindowMac *child = (wxWindowMac *)node->Data(); + if ( child->m_isShown ) + child->MacSuperShown( show ) ; + node = node->Next(); + } } -bool wxWindow::IsShown() const +bool wxWindowMac::MacIsReallyShown() const { - return m_macShown; + if ( m_isShown && (m_parent != NULL) ) { + return m_parent->MacIsReallyShown(); + } + return m_isShown; +/* + bool status = m_isShown ; + wxWindowMac * win = this ; + while ( status && win->m_parent != NULL ) + { + win = win->m_parent ; + status = win->m_isShown ; + } + return status ; +*/ } -int wxWindow::GetCharHeight() const +int wxWindowMac::GetCharHeight() const { - wxClientDC dc ( (wxWindow*)this ) ; + wxClientDC dc ( (wxWindowMac*)this ) ; return dc.GetCharHeight() ; } -int wxWindow::GetCharWidth() const +int wxWindowMac::GetCharWidth() const { - wxClientDC dc ( (wxWindow*)this ) ; + wxClientDC dc ( (wxWindowMac*)this ) ; return dc.GetCharWidth() ; } -void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, - int *descent, int *externalLeading, const wxFont *theFont, bool) const +void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y, + int *descent, int *externalLeading, const wxFont *theFont ) const { - wxFont *fontToUse = (wxFont *)theFont; - if (!fontToUse) - fontToUse = (wxFont *) & m_windowFont; - - // TODO + 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::MacEraseBackground( Rect *rect ) +void wxWindowMac::MacEraseBackground( Rect *rect ) { +/* WindowRef window = GetMacRootWindow() ; if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) { @@ -725,7 +880,7 @@ void wxWindow::MacEraseBackground( Rect *rect ) // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have // either a non gray background color or a non control window - wxWindow* parent = GetParent() ; + wxWindowMac* parent = GetParent() ; while( parent ) { if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) @@ -739,7 +894,7 @@ void wxWindow::MacEraseBackground( Rect *rect ) // 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); + UMAApplyThemeBackground(kThemeBackgroundTabPane, rect, kThemeStateActive,8,true); break ; } } @@ -764,19 +919,15 @@ void wxWindow::MacEraseBackground( Rect *rect ) EraseRect( rect ) ; - for (wxNode *node = m_children->First(); node; node = node->Next()) + for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - wxWindow *child = (wxWindow*)node->Data(); -// int width ; -// int height ; - -// child->GetClientSize( &width , &height ) ; + wxWindowMac *child = (wxWindowMac*)node->Data(); Rect clientrect = { child->m_x , child->m_y , child->m_x +child->m_width , child->m_y + child->m_height } ; SectRect( &clientrect , rect , &clientrect ) ; OffsetRect( &clientrect , -child->m_x , -child->m_y ) ; - if ( child->GetMacRootWindow() == window && child->IsReallyShown() ) + if ( child->GetMacRootWindow() == window && child->IsShown() ) { wxMacDrawingClientHelper focus( this ) ; if ( focus.Ok() ) @@ -785,41 +936,43 @@ void wxWindow::MacEraseBackground( Rect *rect ) } } } +*/ } -void wxWindow::Refresh(bool eraseBack, const wxRect *rect) +void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect) { +// if ( !IsShown() ) +// return ; + wxMacDrawingClientHelper focus( this ) ; if ( focus.Ok() ) { - int width , height ; - GetClientSize( &width , &height ) ; - Rect clientrect = { 0 , 0 , height , width } ; - ClipRect( &clientrect ) ; + wxPoint client ; + client = GetClientAreaOrigin( ) ; + Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ; + // ClipRect( &clientrect ) ; - if ( rect ) - { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; + if ( rect ) + { + Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; SectRect( &clientrect , &r , &clientrect ) ; - } - InvalRect( &clientrect ) ; - /* - if ( eraseBack ) - { - MacEraseBackground( &clientrect ) ; - } - */ + } + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } + if ( !eraseBack ) + m_macEraseOnRedraw = false ; + else + m_macEraseOnRedraw = true ; } // Responds to colour changes: passes event on to children. -void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxWindowMac::OnSysColourChanged(wxSysColourChangedEvent& event) { wxNode *node = GetChildren().First(); while ( node ) { // Only propagate to non-top-level windows - wxWindow *win = (wxWindow *)node->Data(); + wxWindowMac *win = (wxWindowMac *)node->Data(); if ( win->GetParent() ) { wxSysColourChangedEvent event2; @@ -831,89 +984,66 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event) } } -// 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() -{ - // TODO - return 0; -} +#if wxUSE_CARET && WXWIN_COMPATIBILITY +// --------------------------------------------------------------------------- +// Caret manipulation +// --------------------------------------------------------------------------- -void wxWindow::InitDialog() +void wxWindowMac::CreateCaret(int w, int h) { - wxInitDialogEvent event(GetId()); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); + SetCaret(new wxCaret(this, w, h)); } -// Default init dialog behaviour is to transfer data to window -void wxWindow::OnInitDialog(wxInitDialogEvent& event) +void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) { - TransferDataToWindow(); + wxFAIL_MSG("not implemented"); } -// Caret manipulation -void wxWindow::CreateCaret(int w, int h) +void wxWindowMac::ShowCaret(bool show) { - m_caretWidth = w; - m_caretHeight = h; - m_caretEnabled = TRUE; -} + wxCHECK_RET( m_caret, "no caret to show" ); -void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) -{ - // TODO + m_caret->Show(show); } -void wxWindow::ShowCaret(bool show) +void wxWindowMac::DestroyCaret() { - // TODO + SetCaret(NULL); } -void wxWindow::DestroyCaret() +void wxWindowMac::SetCaretPos(int x, int y) { - // TODO - m_caretEnabled = FALSE; -} + wxCHECK_RET( m_caret, "no caret to move" ); -void wxWindow::SetCaretPos(int x, int y) -{ - // TODO + m_caret->Move(x, y); } -void wxWindow::GetCaretPos(int *x, int *y) const +void wxWindowMac::GetCaretPos(int *x, int *y) const { - // TODO + wxCHECK_RET( m_caret, "no caret to get position of" ); + + m_caret->GetPosition(x, y); } +#endif // wxUSE_CARET -wxWindow *wxGetActiveWindow() +wxWindowMac *wxGetActiveWindow() { // actually this is a windows-only concept return NULL; } -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; -} - - // Coordinates relative to the window -void wxWindow::WarpPointer (int x_pos, int y_pos) +void wxWindowMac::WarpPointer (int x_pos, int y_pos) { // We really dont move the mouse programmatically under mac } -void wxWindow::OnEraseBackground(wxEraseEvent& event) +void wxWindowMac::OnEraseBackground(wxEraseEvent& event) { // TODO : probably we would adopt the EraseEvent structure - Default(); } -int wxWindow::GetScrollPos(int orient) const +int wxWindowMac::GetScrollPos(int orient) const { if ( orient == wxHORIZONTAL ) { @@ -930,7 +1060,7 @@ int wxWindow::GetScrollPos(int orient) const // This now returns the whole range, not just the number // of positions that we can scroll. -int wxWindow::GetScrollRange(int orient) const +int wxWindowMac::GetScrollRange(int orient) const { if ( orient == wxHORIZONTAL ) { @@ -945,7 +1075,7 @@ int wxWindow::GetScrollRange(int orient) const return 0; } -int wxWindow::GetScrollThumb(int orient) const +int wxWindowMac::GetScrollThumb(int orient) const { if ( orient == wxHORIZONTAL ) { @@ -960,7 +1090,7 @@ int wxWindow::GetScrollThumb(int orient) const return 0; } -void wxWindow::SetScrollPos(int orient, int pos, bool refresh) +void wxWindowMac::SetScrollPos(int orient, int pos, bool refresh) { if ( orient == wxHORIZONTAL ) { @@ -974,8 +1104,214 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) } } +void wxWindowMac::MacCreateRealWindow( const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) +{ + SetName(name); + m_windowStyle = style; + m_isShown = FALSE; + + // create frame. + + Rect theBoundsRect; + + m_x = (int)pos.x; + m_y = (int)pos.y; + if ( m_y < 50 ) + m_y = 50 ; + if ( m_x < 20 ) + m_x = 20 ; + + m_width = size.x; + if (m_width == -1) + m_width = 20; + m_height = size.y; + if (m_height == -1) + m_height = 20; + + m_macWindowData = new MacWindowData() ; + + ::SetRect(&theBoundsRect, m_x, m_y , m_x + m_width, m_y + m_height); + + // translate the window attributes in the appropriate window class and attributes + + WindowClass wclass = 0; + WindowAttributes attr = kWindowNoAttributes ; + + if ( HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) ) + { + wclass = kFloatingWindowClass ; + if ( HasFlag(wxTINY_CAPTION_VERT) ) + { + attr |= kWindowSideTitlebarAttribute ; + } + } + else if ( HasFlag( wxCAPTION ) ) + { + if ( HasFlag( wxDIALOG_MODAL ) ) + { + wclass = kMovableModalWindowClass ; + } + else + { + wclass = kDocumentWindowClass ; + } + } + else + { + wclass = kModalWindowClass ; + } + + if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) + { + attr |= kWindowFullZoomAttribute ; + attr |= kWindowCollapseBoxAttribute ; + } + if ( HasFlag( wxRESIZE_BORDER ) ) + { + attr |= kWindowResizableAttribute ; + } + if ( HasFlag( wxSYSTEM_MENU ) ) + { + attr |= kWindowCloseBoxAttribute ; + } + + UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ; + wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ; + wxString label ; + if( wxApp::s_macDefaultEncodingIsPC ) + label = wxMacMakeMacStringFromPC( title ) ; + else + label = title ; + UMASetWTitleC( m_macWindowData->m_macWindow , label ) ; + UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ; + + m_macWindowData->m_macFocus = NULL ; + m_macWindowData->m_macHasReceivedFirstActivate = true ; +} + +void wxWindowMac::MacPaint( wxPaintEvent &event ) +{ +} + +void wxWindowMac::MacPaintBorders( ) +{ + if( m_macWindowData ) + 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) ) + { + bool sunken = HasFlag( wxSUNKEN_BORDER ) ; + RGBColor pen1 = sunken ? white : black ; + RGBColor pen2 = sunken ? shadow : face ; + RGBColor pen3 = sunken ? face : shadow ; + RGBColor pen4 = sunken ? black : white ; + + RGBForeColor( &pen1 ) ; + { + Rect rect = { 0 , 0 , m_height , m_width } ; + FrameRect( &rect ) ; + } + RGBForeColor( &pen2 ) ; + { + Rect rect = { 1 , 1 , m_height -1 , m_width -1} ; + FrameRect( &rect ) ; + } + RGBForeColor( &pen3 ) ; + { + Rect rect = { 0 , 0 , m_height -2 , m_width -2} ; + FrameRect( &rect ) ; + } + RGBForeColor( &pen4 ) ; + { + MoveTo( 0 , 0 ) ; + LineTo( m_width - 3 , 0 ) ; + MoveTo( 0 , 0 ) ; + LineTo( 0 , m_height - 3 ) ; + } + } + else if (HasFlag(wxSIMPLE_BORDER)) + { + Rect rect = { 0 , 0 , m_height , m_width } ; + RGBForeColor( &black ) ; + FrameRect( &rect ) ; + } +/* + if ( this->GetParent() ) + { + wxPaintDC dc(GetParent()); + GetParent()->PrepareDC(dc); + + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) ) + { + bool sunken = HasFlag( wxSUNKEN_BORDER ) ; + + wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ; + wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ; + + wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN; + wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow; + wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow; + wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN; + + dc.SetPen(wxPen1); + dc.DrawRectangle(m_x, m_y, m_width, m_height); // outer - right and button + + dc.SetPen(wxPen2); + dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1); // outer - left and top + + dc.SetPen(wxPen3); + dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2); // inner - right and button + + dc.SetPen(wxPen4); + dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y); // inner - left and top + dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3); + } + else if (HasFlag(wxDOUBLE_BORDER)) + { + bool sunken = HasFlag( wxSUNKEN_BORDER ) ; + + wxPen m_penButton3DShadow( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DSHADOW ), 1, wxSOLID ) ; + wxPen m_penButton3DFace( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_3DFACE ), 1, wxSOLID ) ; + + wxPen wxPen1 = sunken ? *wxWHITE_PEN : *wxBLACK_PEN; + wxPen wxPen2 = sunken ? m_penButton3DShadow : m_penButton3DShadow; + wxPen wxPen3 = sunken ? m_penButton3DFace : m_penButton3DShadow; + wxPen wxPen4 = sunken ? *wxBLACK_PEN : *wxWHITE_PEN; + + dc.SetPen(wxPen1); + dc.DrawRectangle(m_x, m_y, m_width, m_height); // outer - right and button + + dc.SetPen(wxPen2); + dc.DrawRectangle(m_x+1, m_y+1, m_width-1, m_height-1); // outer - left and top + + dc.SetPen(wxPen3); + dc.DrawRectangle(m_x, m_y, m_width-2, m_height-2); // inner - right and button + + dc.SetPen(wxPen4); + dc.DrawLine(m_x, m_y, m_x + m_width-3, m_y); // inner - left and top + dc.DrawLine(m_x, m_y, m_x, m_y + m_height-3); + } + else if (HasFlag(wxSIMPLE_BORDER)) + { + dc.SetPen(*wxBLACK_PEN); + dc.DrawRectangle(m_x, m_y, m_width, m_height); + } + } + */ +} + // New function that will replace some of the above. -void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, +void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) { if ( orient == wxHORIZONTAL ) @@ -991,7 +1327,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, { if ( !m_hScrollBar->IsShown() ) m_hScrollBar->Show(true) ; - m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; + m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } } } @@ -1008,7 +1344,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, { if ( !m_vScrollBar->IsShown() ) m_vScrollBar->Show(true) ; - m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; + m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ; } } } @@ -1016,619 +1352,143 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, } // Does a physical scroll -void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) +void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) { wxMacDrawingClientHelper focus( this ) ; if ( focus.Ok() ) { - int width , height ; - GetClientSize( &width , &height ) ; - Rect scrollrect = { 0 , 0 , height , width } ; + 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 } ; + 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 ) ; + } + ScrollRect( &scrollrect , dx , dy , updateRgn ) ; + InvalWindowRgn( GetMacRootWindow() , 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. - -// 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; -} - -// Transfer values from controls. If returns FALSE, -// validation failed: don't quit -bool wxWindow::TransferDataFromWindow() -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() ) - { - return FALSE; - } - - node = node->Next(); + + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + 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 ); } - return TRUE; + } -bool wxWindow::Validate() +void wxWindowMac::MacOnScroll(wxScrollEvent &event ) { - wxNode *node = GetChildren().First(); - while ( node ) + if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) ) - { - return FALSE; - } - - node = node->Next(); - } - return TRUE; -} - -// Get the window with the focus -wxWindow *wxWindow::FindFocus() -{ - return gFocusWindow ; -} - -// ---------------------------------------------------------------------------- -// RTTI -// ---------------------------------------------------------------------------- - -bool wxWindow::IsTopLevel() const -{ - return wxDynamicCast(this, wxFrame) || wxDynamicCast(this, wxDialog); -} - -void wxWindow::AddChild(wxWindow *child) -{ - GetChildren().Append(child); - child->m_windowParent = this; -} - -void wxWindow::RemoveChild(wxWindow *child) -{ - GetChildren().DeleteObject(child); - child->m_windowParent = NULL; -} - -void wxWindow::DestroyChildren() -{ - 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 */ -} - -void wxWindow::MakeModal(bool modal) -{ - // Disable all other windows - if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame))) - { - wxNode *node = wxTopLevelWindows.First(); - while (node) - { - wxWindow *win = (wxWindow *)node->Data(); - if (win != this) - win->Enable(!modal); - - node = node->Next(); - } - } -} - -// 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); -} - -// ---------------------------------------------------------------------------- -// constraints and sizers -// ---------------------------------------------------------------------------- - -#if wxUSE_CONSTRAINTS - -void wxWindow::SetConstraints( wxLayoutConstraints *constraints ) -{ - if ( m_constraints ) - { - UnsetConstraints(m_constraints); - delete m_constraints; - } - m_constraints = constraints; - if ( m_constraints ) - { - // 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); - } -} - -// This removes any dangling pointers to this window in other windows' -// constraintsInvolvedIn lists. -void wxWindow::UnsetConstraints(wxLayoutConstraints *c) -{ - if ( c ) - { - 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); - } -} - -// 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 ) - { - 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; - } -} - -void wxWindow::SetSizer(wxSizer *sizer) -{ - if (m_windowSizer) delete m_windowSizer; - - m_windowSizer = sizer; -} - -bool wxWindow::Layout() -{ - int w, h; - GetClientSize(&w, &h); - - // If there is a sizer, use it instead of the constraints - if ( GetSizer() ) - { - GetSizer()->SetDimension( 0, 0, w, h ); - return TRUE; - } - - if ( GetConstraints() ) - { - GetConstraints()->width.SetValue(w); - GetConstraints()->height.SetValue(h); - } + wxScrollWinEvent wevent; + wevent.SetPosition(event.GetPosition()); + wevent.SetOrientation(event.GetOrientation()); + wevent.m_eventObject = this; - // 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) -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - return constr->SatisfyConstraints(this, noChanges); + 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); } - else - return TRUE; } -bool wxWindow::LayoutPhase2(int *noChanges) +bool wxWindowMac::SetFont(const wxFont& font) { - *noChanges = 0; - - // Layout children - DoPhase(1); - DoPhase(2); - return TRUE; -} - -// Do a phase of evaluating child constraints -bool wxWindow::DoPhase(int phase) -{ - int noIterations = 0; - int maxIterations = 500; - int noChanges = 1; - int noFailures = 0; - wxWindowList succeeded; - while ((noChanges > 0) && (noIterations < maxIterations)) + if ( !wxWindowBase::SetFont(font) ) { - noChanges = 0; - noFailures = 0; - wxWindowList::Node *node = GetChildren().GetFirst(); - while (node) - { - wxWindow *child = node->GetData(); - if ( !child->IsTopLevel() ) - { - wxLayoutConstraints *constr = child->GetConstraints(); - if ( constr ) - { - if ( !succeeded.Find(child) ) - { - int tempNoChanges = 0; - bool success = ( (phase == 1) ? child->LayoutPhase1(&tempNoChanges) : child->LayoutPhase2(&tempNoChanges) ) ; - noChanges += tempNoChanges; - if ( success ) - { - succeeded.Append(child); - } - } - } - } - node = node->GetNext(); - } - - noIterations++; + // nothing to do + return FALSE; } 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); - } - } - else if ( constr ) - { - char *windowClass = GetClassInfo()->GetClassName(); - - 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") ); - } - - if ( recurse ) - { - wxWindowList::Node *node = GetChildren().GetFirst(); - while (node) - { - wxWindow *win = node->GetData(); - if ( !win->IsTopLevel() ) - win->SetConstraintSizes(); - node = node->GetNext(); - } - } -} - -// 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 ) - { - 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); - } - } -} - -void wxWindow::MoveConstraint(int x, int y) -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - if ( x != -1 ) - { - constr->left.SetValue(x); - constr->left.SetDone(TRUE); - } - if ( y != -1 ) - { - constr->top.SetValue(y); - constr->top.SetDone(TRUE); - } - } -} - -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 ) { @@ -1643,85 +1503,20 @@ void wxWindow::Clear() else { wxClientDC dc(this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); + wxBrush brush(GetBackgroundColour(), wxSOLID); + dc.SetBackground(brush); + dc.Clear(); } } -// Fits the panel around the items -void wxWindow::Fit() +// Setup background and foreground colours correctly +void wxWindowMac::SetupColours() { - 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); + if ( GetParent() ) + SetBackgroundColour(GetParent()->GetBackgroundColour()); } -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) -{ - 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; -} - -void wxWindow::OnIdle(wxIdleEvent& event) +void wxWindowMac::OnIdle(wxIdleEvent& event) { /* // Check if we need to send a LEAVE event @@ -1744,55 +1539,24 @@ void wxWindow::OnIdle(wxIdleEvent& event) } // Raise the window to the top of the Z order -void wxWindow::Raise() +void wxWindowMac::Raise() { - // TODO + if ( m_macWindowData ) + { + UMABringToFront( m_macWindowData->m_macWindow ) ; + } } // Lower the window to the bottom of the Z order -void wxWindow::Lower() -{ - // TODO -} - -bool wxWindow::AcceptsFocus() const -{ - return IsShown() && IsEnabled() && MacCanFocus() ; -} - -// Update region access -wxRegion wxWindow::GetUpdateRegion() const -{ - return m_updateRegion; -} - -bool wxWindow::IsExposed(int x, int y, int w, int h) const -{ - return (m_updateRegion.Contains(x, y, w, h) != wxOutRegion); -} - -bool wxWindow::IsExposed(const wxPoint& pt) const +void wxWindowMac::Lower() { - return (m_updateRegion.Contains(pt) != wxOutRegion); -} - -bool wxWindow::IsExposed(const wxRect& rect) const -{ - return (m_updateRegion.Contains(rect) != wxOutRegion); -} - -/* - * Allocates control IDs - */ - -int wxWindow::NewControlId() -{ - static int s_controlId = 0; - s_controlId ++; - return s_controlId; + if ( m_macWindowData ) + { + UMASendBehind( m_macWindowData->m_macWindow , NULL ) ; + } } -void wxWindow::DoSetClientSize(int width, int height) +void wxWindowMac::DoSetClientSize(int width, int height) { if ( width != -1 || height != -1 ) { @@ -1802,38 +1566,17 @@ void wxWindow::DoSetClientSize(int width, int height) if ( height != -1 && m_vScrollBar ) height += MAC_SCROLLBAR_SIZE ; + width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ; + height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ; + DoSetSize( -1 , -1 , width , height ) ; } } -// ------------------------ -wxList *wxWinMacWindowList = NULL; -wxWindow *wxFindWinFromMacWindow(WindowRef inWindowRef) -{ - wxNode *node = wxWinMacWindowList->Find((long)inWindowRef); - if (!node) - return NULL; - return (wxWindow *)node->Data(); -} - -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" ); - - if ( !wxWinMacWindowList->Find((long)inWindowRef) ) - wxWinMacWindowList->Append((long)inWindowRef, win); -} -void wxRemoveMacWindowAssociation(wxWindow *win) -{ - wxWinMacWindowList->DeleteObject(win); -} +wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ; -wxWindow* wxWindow::s_lastMouseWindow = NULL ; - -bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWin ) +bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin ) { if ((point.x < m_x) || (point.y < m_y) || (point.x > (m_x + m_width)) || (point.y > (m_y + m_height))) @@ -1846,16 +1589,14 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi newPoint.x -= m_x; newPoint.y -= m_y; - if ( m_children ) + for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - for (wxNode *node = m_children->First(); node; node = node->Next()) + wxWindowMac *child = (wxWindowMac*)node->Data(); + // added the m_isShown test --dmazzoni + if ( child->GetMacRootWindow() == window && child->m_isShown ) { - wxWindow *child = (wxWindow*)node->Data(); - if ( child->GetMacRootWindow() == window ) - { - if (child->MacGetWindowFromPointSub(newPoint , outWin )) - return TRUE; - } + if (child->MacGetWindowFromPointSub(newPoint , outWin )) + return TRUE; } } @@ -1863,28 +1604,32 @@ bool wxWindow::MacGetWindowFromPointSub( const wxPoint &point , wxWindow** outWi return TRUE; } -bool wxWindow::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindow** outWin ) +bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin ) { WindowRef window ; Point pt = { screenpoint.y , screenpoint.x } ; if ( ::FindWindow( pt , &window ) == 3 ) { wxPoint point( screenpoint ) ; - wxWindow* win = wxFindWinFromMacWindow( window ) ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + if ( win ) + { win->ScreenToClient( point ) ; return win->MacGetWindowFromPointSub( point , outWin ) ; } + } return FALSE ; } extern int wxBusyCursorCount ; -bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) +bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event) { if ((event.m_x < m_x) || (event.m_y < m_y) || (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height))) return FALSE; + if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) ) return FALSE ; @@ -1896,16 +1641,13 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) int x = event.m_x ; int y = event.m_y ; - if ( m_children ) + for (wxNode *node = GetChildren().First(); node; node = node->Next()) { - 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; - } + wxWindowMac *child = (wxWindowMac*)node->Data(); + if ( child->GetMacRootWindow() == window && child->IsShown() && child->IsEnabled() ) + { + if (child->MacDispatchMouseEvent(event)) + return TRUE; } } @@ -1914,13 +1656,38 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) if ( wxBusyCursorCount == 0 ) { - m_windowCursor.MacInstall() ; + 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 GetEventHandler()->ProcessEvent( event ) ; return TRUE; } -void wxWindow::MacFireMouseEvent( EventRecord *ev ) +Point lastWhere ; +long lastWhen = 0 ; + +wxString wxWindowMac::MacGetToolTipString( wxPoint &pt ) +{ + if ( m_tooltip ) + { + return m_tooltip->GetTip() ; + } + return "" ; +} +void wxWindowMac::MacFireMouseEvent( EventRecord *ev ) { wxMouseEvent event(wxEVT_LEFT_DOWN); bool isDown = !(ev->modifiers & btnState) ; // 1 is for up @@ -1962,6 +1729,26 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev ) ::GlobalToLocal( &localwhere ) ; ::SetPort( port ) ; + if ( ev->what == mouseDown ) + { + if ( ev->when - lastWhen <= GetDblTime() ) + { + if ( abs( localwhere.h - lastWhere.h ) < 3 || abs( localwhere.v - lastWhere.v ) < 3 ) + { + if ( controlDown ) + event.SetEventType(wxEVT_RIGHT_DCLICK ) ; + else + event.SetEventType(wxEVT_LEFT_DCLICK ) ; + } + lastWhen = 0 ; + } + else + { + lastWhen = ev->when ; + } + lastWhere = localwhere ; + } + event.m_x = localwhere.h; event.m_y = localwhere.v; event.m_x += m_x; @@ -1989,7 +1776,7 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev ) wxTheApp->s_captureWindow = NULL ; if ( wxBusyCursorCount == 0 ) { - m_windowCursor.MacInstall() ; + m_cursor.MacInstall() ; } } } @@ -1999,14 +1786,13 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev ) } } -void wxWindow::MacMouseDown( EventRecord *ev , short part) +void wxWindowMac::MacMouseDown( EventRecord *ev , short part) { MacFireMouseEvent( ev ) ; } -void wxWindow::MacMouseUp( EventRecord *ev , short part) +void wxWindowMac::MacMouseUp( EventRecord *ev , short part) { - WindowPtr frontWindow ; switch (part) { case inContent: @@ -2017,9 +1803,8 @@ void wxWindow::MacMouseUp( EventRecord *ev , short part) } } -void wxWindow::MacMouseMoved( EventRecord *ev , short part) +void wxWindowMac::MacMouseMoved( EventRecord *ev , short part) { - WindowPtr frontWindow ; switch (part) { case inContent: @@ -2029,27 +1814,38 @@ void wxWindow::MacMouseMoved( EventRecord *ev , short part) break ; } } -void wxWindow::MacActivate( EventRecord *ev , bool inIsActivating ) +void wxWindowMac::MacActivate( EventRecord *ev , bool inIsActivating ) { - wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating); + if ( !m_macWindowData->m_macHasReceivedFirstActivate ) + m_macWindowData->m_macHasReceivedFirstActivate = true ; + + wxActivateEvent event(wxEVT_ACTIVATE, inIsActivating , m_windowId); event.m_timeStamp = ev->when ; event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); + Refresh(false) ; UMAHighlightAndActivateWindow( m_macWindowData->m_macWindow , inIsActivating ) ; +// MacUpdateImmediately() ; } -void wxWindow::MacRedraw( RgnHandle updatergn , long time) +void wxWindowMac::MacRedraw( RgnHandle updatergn , long time) { // updatergn is always already clipped to our boundaries WindowRef window = GetMacRootWindow() ; - wxWindow* win = wxFindWinFromMacWindow( window ) ; + // ownUpdateRgn is the area that this window has to invalidate i.e. its own area without its children + RgnHandle ownUpdateRgn = NewRgn() ; + CopyRgn( updatergn , ownUpdateRgn ) ; + { - wxMacDrawingClientHelper focus( this ) ; + wxMacDrawingHelper focus( this ) ; // was client if ( focus.Ok() ) { WindowRef window = GetMacRootWindow() ; + bool eraseBackground = false ; + if ( m_macWindowData ) + eraseBackground = true ; if ( m_backgroundColour == wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE) ) { UMASetThemeWindowBackground( window , kThemeBrushDocumentWindowBackground , false ) ; @@ -2061,7 +1857,7 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) // either a non gray background color or a non control window - wxWindow* parent = GetParent() ; + wxWindowMac* parent = GetParent() ; while( parent ) { if ( parent->GetMacRootWindow() != window ) @@ -2076,13 +1872,15 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) if ( parent->m_backgroundColour != wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE ) ) { // if we have any other colours in the hierarchy - RGBBackColor( &parent->m_backgroundColour.GetPixel()) ; - break ; + 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); + Rect box ; + GetRegionBounds( updatergn , &box) ; + UMAApplyThemeBackground(kThemeBackgroundTabPane, &box , kThemeStateActive,8,true); break ; } } @@ -2103,33 +1901,67 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) { RGBBackColor( &m_backgroundColour.GetPixel()) ; } - SetClip( updatergn ) ; - EraseRgn( updatergn ) ; + // subtract all non transparent children from updatergn + + RgnHandle childarea = NewRgn() ; + for (wxNode *node = GetChildren().First(); node; node = node->Next()) + { + wxWindowMac *child = (wxWindowMac*)node->Data(); + // eventually test for transparent windows + if ( child->GetMacRootWindow() == window && child->IsShown() ) + { + if ( child->GetBackgroundColour() != m_backgroundColour && !child->IsKindOf( CLASSINFO( wxControl ) ) && ((wxControl*)child)->GetMacControl() ) + { + SetRectRgn( childarea , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; + DiffRgn( ownUpdateRgn , childarea , ownUpdateRgn ) ; + } + } + } + DisposeRgn( childarea ) ; + + if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() ) + eraseBackground = true ; + SetClip( ownUpdateRgn ) ; + if ( m_macEraseOnRedraw ) { + if ( eraseBackground ) + { + EraseRgn( ownUpdateRgn ) ; + } + } + else { + m_macEraseOnRedraw = true ; + } } - } + { + 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 ) ; + } + + MacPaintBorders() ; + wxPaintEvent event; + event.m_timeStamp = time ; + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } - 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()) + + for (wxNode *node = GetChildren().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 ) ; + 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->GetMacRootWindow() == window && child->IsReallyShown() ) + if ( child->GetMacRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) ) { // because dialogs may also be children child->MacRedraw( childupdate , time ) ; @@ -2139,67 +1971,72 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) // eventually a draw grow box here } -void wxWindow::MacUpdateImmediately() +void wxWindowMac::MacUpdateImmediately() { WindowRef window = GetMacRootWindow() ; if ( window ) { - wxWindow* win = wxFindWinFromMacWindow( window ) ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + #if TARGET_CARBON + AGAPortHelper help( GetWindowPort(window) ) ; + #else + AGAPortHelper help( (window) ) ; + #endif + SetOrigin( 0 , 0 ) ; BeginUpdate( window ) ; if ( win ) { - #if ! TARGET_CARBON - if ( !EmptyRgn( window->visRgn ) ) - #endif + RgnHandle region = NewRgn(); + + if ( region ) { - 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 ) ; - } -*/ - } + GetPortVisibleRegion( GetWindowPort( window ), region ); + + // if windowshade gives incompatibility , take the follwing out + if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate ) + { + win->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ; + } + DisposeRgn( region ); + } } EndUpdate( window ) ; } } -void wxWindow::MacUpdate( EventRecord *ev ) +void wxWindowMac::MacUpdate( EventRecord *ev ) { WindowRef window = (WindowRef) ev->message ; - wxWindow * win = wxFindWinFromMacWindow( window ) ; - + wxWindowMac * win = wxFindWinFromMacWindow( window ) ; + #if TARGET_CARBON + AGAPortHelper help( GetWindowPort(window) ) ; + #else + AGAPortHelper help( (window) ) ; + #endif + SetOrigin( 0 , 0 ) ; BeginUpdate( window ) ; if ( win ) { - // if windowshade gives incompatibility , take the follwing out - #if ! TARGET_CARBON - if ( !EmptyRgn( window->visRgn ) ) - #endif + RgnHandle region = NewRgn(); + + if ( region ) { - 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 ) ; - } - */ - } + GetPortVisibleRegion( GetWindowPort( window ), region ); + + // if windowshade gives incompatibility , take the follwing out + if ( !EmptyRgn( region ) && win->m_macWindowData->m_macHasReceivedFirstActivate ) + { + MacRedraw( region , ev->when ) ; + } + DisposeRgn( region ); + } } EndUpdate( window ) ; } -WindowRef wxWindow::GetMacRootWindow() const +WindowRef wxWindowMac::GetMacRootWindow() const { - WindowRef window = NULL ; - wxWindow *iter = (wxWindow*)this ; + wxWindowMac *iter = (wxWindowMac*)this ; while( iter ) { @@ -2212,49 +2049,131 @@ WindowRef wxWindow::GetMacRootWindow() const return NULL ; } -void wxWindow::MacCreateScrollBars( long style ) +void wxWindowMac::MacCreateScrollBars( long style ) { wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ; + 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 ) { - m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, wxPoint(m_width-MAC_SCROLLBAR_SIZE, 0), - wxSize(MAC_SCROLLBAR_SIZE, m_height - adjust), wxVERTICAL); + + } + else + { + m_vScrollBar->Show(false) ; } + m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint, + hSize , wxHORIZONTAL); 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); } + 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 wxWindow::MacRepositionScrollBars() +void wxWindowMac::MacRepositionScrollBars() { bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ; int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ; + // 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->m_macWindowData ) + { + 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( m_width-MAC_SCROLLBAR_SIZE, 0, MAC_SCROLLBAR_SIZE, m_height - adjust , wxSIZE_USE_EXISTING); + m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE); } if ( m_hScrollBar ) { - m_hScrollBar->SetSize( 0 , m_height-MAC_SCROLLBAR_SIZE ,m_width - adjust, MAC_SCROLLBAR_SIZE, wxSIZE_USE_EXISTING); + m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE); } } -void wxWindow::MacKeyDown( EventRecord *ev ) +void wxWindowMac::MacKeyDown( EventRecord *ev ) { -} +} +bool wxWindowMac::AcceptsFocus() const +{ + return MacCanFocus() && wxWindowBase::AcceptsFocus(); +} -ControlHandle wxWindow::MacGetContainerForEmbedding() +ControlHandle wxWindowMac::MacGetContainerForEmbedding() { if ( m_macWindowData ) return m_macWindowData->m_macRootControl ; @@ -2262,108 +2181,20 @@ ControlHandle wxWindow::MacGetContainerForEmbedding() return GetParent()->MacGetContainerForEmbedding() ; } -void wxWindow::MacSuperChangedPosition() +void wxWindowMac::MacSuperChangedPosition() { // only window-absolute structures have to be moved i.e. controls wxNode *node = GetChildren().First(); while ( node ) { - wxWindow *child = (wxWindow *)node->Data(); + wxWindowMac *child = (wxWindowMac *)node->Data(); child->MacSuperChangedPosition() ; node = node->Next(); } } -bool wxWindow::IsReallyShown() const -{ - if ( m_macWindowData ) - return m_macShown ; - else - return m_macShown && GetParent()->IsReallyShown() ; -} - -bool wxWindow::IsReallyEnabled() const -{ - if ( m_macWindowData ) - return m_macEnabled ; - else - return m_macEnabled && GetParent()->IsReallyEnabled() ; -} - -void wxWindow::MacSuperEnabled( bool enabled ) -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->m_macEnabled ) - child->MacSuperEnabled( enabled ) ; - node = node->Next(); - } -} -void wxWindow::MacSuperShown( bool show ) -{ - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->m_macShown ) - child->MacSuperShown( show ) ; - node = node->Next(); - } -} - -bool wxWindow::MacSetupFocusPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; -} - -bool wxWindow::MacSetupFocusClientPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; -} - -bool wxWindow::MacSetupDrawingPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; -} - -bool wxWindow::MacSetupDrawingClientPort( ) -{ - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - GrafPtr port ; - - MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; - return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; -} - - -bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) +bool wxWindowMac::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) { if ( window == NULL ) return false ; @@ -2376,11 +2207,12 @@ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & cl if (currPort != port ) ::SetPort(port); +// wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; ::SetOrigin(-localOrigin.h, -localOrigin.v); return true; } -bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) +bool wxWindowMac::MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* win ) { if ( window == NULL ) return false ; @@ -2391,19 +2223,21 @@ bool wxWindow::MacSetPortDrawingParams( const Point & localOrigin, const Rect & port = UMAGetWindowPort( window) ; if (currPort != port ) ::SetPort(port); - +// wxASSERT( port->portRect.left == 0 && port->portRect.top == 0 ) ; ::SetOrigin(-localOrigin.h, -localOrigin.v); ::ClipRect(&clipRect); ::PenNormal() ; ::RGBBackColor(& win->GetBackgroundColour().GetPixel() ) ; ::RGBForeColor(& win->GetForegroundColour().GetPixel() ) ; - ::BackPat( &qd.white ) ; + Pattern whiteColor ; + + ::BackPat( GetQDGlobalsWhite( &whiteColor) ) ; ::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) +void wxWindowMac::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin) { if ( m_macWindowData ) { @@ -2433,10 +2267,10 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w } } -void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) +void wxWindowMac::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) { - int width , height ; - GetClientSize( &width , &height ) ; +// int width , height ; +// GetClientSize( &width , &height ) ; if ( m_macWindowData ) { @@ -2453,7 +2287,7 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window { wxASSERT( GetParent() != NULL ) ; - GetParent()->MacGetPortClientParams( localOrigin , clipRect , window, rootwin) ; + GetParent()->MacDoGetPortClientParams( localOrigin , clipRect , window, rootwin) ; localOrigin->h += m_x; localOrigin->v += m_y; @@ -2462,48 +2296,126 @@ void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, Window Rect myClip; myClip.left = 0; myClip.top = 0; - myClip.right = width; - myClip.bottom = height; + myClip.right = m_width ;//width; + myClip.bottom = m_height ;// height; SectRect(clipRect, &myClip, clipRect); } } -wxMacFocusHelper::wxMacFocusHelper( wxWindow * theWindow ) +void wxWindowMac::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) { - m_ok = false ; - Point localOrigin ; - Rect clipRect ; - WindowRef window ; - wxWindow *rootwin ; - m_currentPort = NULL ; - GetPort( &m_formerPort ) ; - if ( theWindow ) - { + MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ; + + int width , height ; + GetClientSize( &width , &height ) ; + wxPoint client ; + client = GetClientAreaOrigin( ) ; - theWindow->MacGetPortParams( &localOrigin , &clipRect , &window , &rootwin) ; - m_currentPort = UMAGetWindowPort( window ) ; - theWindow->MacSetPortFocusParams( localOrigin, clipRect, window , rootwin ) ; - m_ok = true ; - } + localOrigin->h += client.x; + localOrigin->v += client.y; + OffsetRect(clipRect, -client.x, -client.y); + + Rect myClip; + myClip.left = 0; + myClip.top = 0; + myClip.right = width; + myClip.bottom = height; + SectRect(clipRect, &myClip, clipRect); } - -wxMacFocusHelper::~wxMacFocusHelper() + +long wxWindowMac::MacGetLeftBorderSize( ) const { - if ( m_ok ) - { - SetOrigin( 0 , 0 ) ; - } - if ( m_formerPort != m_currentPort ) - SetPort( m_formerPort ) ; + if( m_macWindowData ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + return 2 ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + return 2 ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 1 ; + } + return 0 ; } -wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) +long wxWindowMac::MacGetRightBorderSize( ) const +{ + if( m_macWindowData ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + return 3 ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + return 3 ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 3 ; + } + return 0 ; +} + +long wxWindowMac::MacGetTopBorderSize( ) const +{ + if( m_macWindowData ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + return 2 ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + return 2 ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 1 ; + } + return 0 ; +} + +long wxWindowMac::MacGetBottomBorderSize( ) const +{ + if( m_macWindowData ) + return 0 ; + + if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER ) + { + return 3 ; + } + else if ( m_windowStyle &wxDOUBLE_BORDER) + { + return 3 ; + } + else if (m_windowStyle &wxSIMPLE_BORDER) + { + return 3 ; + } + return 0 ; +} + +long wxWindowMac::MacRemoveBordersFromStyle( long style ) +{ + return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; +} + + +wxMacDrawingHelper::wxMacDrawingHelper( wxWindowMac * theWindow ) { m_ok = false ; Point localOrigin ; Rect clipRect ; WindowRef window ; - wxWindow *rootwin ; + wxWindowMac *rootwin ; m_currentPort = NULL ; GetPort( &m_formerPort ) ; @@ -2523,52 +2435,25 @@ wxMacDrawingHelper::~wxMacDrawingHelper() { if ( m_ok ) { + SetPort( m_currentPort ) ; SetPenState( &m_savedPenState ) ; SetOrigin( 0 , 0 ) ; - ClipRect( &m_currentPort->portRect ) ; + Rect portRect ; + GetPortBounds( m_currentPort , &portRect ) ; + ClipRect( &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 ) +wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindowMac * theWindow ) { m_ok = false ; Point localOrigin ; Rect clipRect ; WindowRef window ; - wxWindow *rootwin ; + wxWindowMac *rootwin ; m_currentPort = NULL ; GetPort( &m_formerPort ) ; @@ -2589,21 +2474,32 @@ wxMacDrawingClientHelper::~wxMacDrawingClientHelper() { if ( m_ok ) { + SetPort( m_currentPort ) ; SetPenState( &m_savedPenState ) ; SetOrigin( 0 , 0 ) ; - ClipRect( &m_currentPort->portRect ) ; + Rect portRect ; + GetPortBounds( m_currentPort , &portRect ) ; + ClipRect( &portRect ) ; } if ( m_formerPort != m_currentPort ) SetPort( m_formerPort ) ; } -// ---------------------------------------------------------------------------- -// list classes implementation -// ---------------------------------------------------------------------------- +// Find the wxWindowMac at the current mouse position, returning the mouse +// position. +wxWindowMac* wxFindWindowAtPointer(wxPoint& pt) +{ + pt = wxGetMousePosition(); + wxWindowMac* found = wxFindWindowAtPoint(pt); + return found; +} -void wxWindowListNode::DeleteData() +// Get the current mouse position. +wxPoint wxGetMousePosition() { - delete (wxWindow *)GetData(); + int x, y; + wxGetMousePosition(& x, & y); + return wxPoint(x, y); }