X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..ee6b1d97e741fda8d579fa21cbc89f0c91615cef:/src/mac/carbon/window.cpp?ds=sidebyside diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index e8015acc3b..3dd198b369 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -29,12 +29,17 @@ #include "wx/frame.h" #include "wx/notebook.h" #include "wx/tabctrl.h" +#include "wx/tooltip.h" // TODO remove the line below, just for lookup-up convenience CS #include "wx/mac/window.h" #include "wx/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 @@ -52,61 +57,86 @@ wxWindow* gFocusWindow = NULL ; #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) +// EVT_SCROLL(wxWindow::OnScroll) END_EVENT_TABLE() #endif -// Constructor -wxWindow::wxWindow() + +// =========================================================================== +// implementation +// =========================================================================== + +// --------------------------------------------------------------------------- +// wxWindow utility functions +// --------------------------------------------------------------------------- + +// Find an item given the Macintosh Window Reference + +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) { - Init() ; + wxWinMacWindowList->DeleteObject(win); } +// ---------------------------------------------------------------------------- +// constructors and such +// ---------------------------------------------------------------------------- + void wxWindow::Init() { + // generic + InitBase(); + + // 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_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; @@ -116,69 +146,30 @@ void wxWindow::Init() // Destructor wxWindow::~wxWindow() { + 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 @@ -188,66 +179,23 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, 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 wxWindow 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; + AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING); + m_width = WidthDefault( size.x ); + m_height = HeightDefault( size.y ) ; - MacCreateScrollBars( style ) ; + if ( ! IsKindOf( CLASSINFO ( wxControl ) ) ) + { + MacCreateScrollBars( style ) ; + } return TRUE; } @@ -258,39 +206,66 @@ void wxWindow::SetFocus() { if (gFocusWindow ) { + #if wxUSE_CARET + // Deal with caret + if ( gFocusWindow->m_caret ) + { + gFocusWindow->m_caret->OnKillFocus(); + } + #endif // wxUSE_CARET 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); + 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 + wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); + if ( panel ) + { + panel->SetLastFocus(this); + } wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) { UMASetKeyboardFocus( gFocusWindow->GetMacRootWindow() , control->GetMacControl() , kControlEditTextPart ) ; } - wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); - event.SetEventObject(this); + wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId); + event.SetEventObject(this); GetEventHandler()->ProcessEvent(event) ; } } } -void wxWindow::Enable(bool enable) +bool wxWindow::Enable(bool enable) { - if ( m_macEnabled == enable ) - return ; - - m_macEnabled = enable ; - - MacSuperEnabled( enable ) ; - return; + if ( !wxWindowBase::Enable(enable) ) + return FALSE; + + wxWindowList::Node *node = GetChildren().GetFirst(); + while ( node ) + { + wxWindow *child = node->GetData(); + child->Enable(enable); + + node = node->GetNext(); + } + + return TRUE; } void wxWindow::CaptureMouse() @@ -303,34 +278,6 @@ void wxWindow::ReleaseMouse() wxTheApp->s_captureWindow = NULL ; } -// Push/pop event handler (i.e. allow a chain of event handlers -// be searched) -void wxWindow::PushEventHandler(wxEvtHandler *handler) -{ - handler->SetNextHandler(GetEventHandler()); - SetEventHandler(handler); -} - -wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler) -{ - 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; -} - #if wxUSE_DRAG_AND_DROP void wxWindow::SetDropTarget(wxDropTarget *pDropTarget) @@ -355,13 +302,13 @@ void wxWindow::DragAcceptFiles(bool accept) } // Get total size -void wxWindow::GetSize(int *x, int *y) const +void wxWindow::DoGetSize(int *x, int *y) const { *x = m_width ; *y = m_height ; } -void wxWindow::GetPosition(int *x, int *y) const +void wxWindow::DoGetPosition(int *x, int *y) const { *x = m_x ; *y = m_y ; @@ -373,7 +320,23 @@ void wxWindow::GetPosition(int *x, int *y) const } } -void wxWindow::ScreenToClient(int *x, int *y) const + +bool wxWindow::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; +} + +void wxWindow::DoScreenToClient(int *x, int *y) const { WindowRef window = GetMacRootWindow() ; @@ -393,7 +356,7 @@ void wxWindow::ScreenToClient(int *x, int *y) const MacRootWindowToClient( x , y ) ; } -void wxWindow::ClientToScreen(int *x, int *y) const +void wxWindow::DoClientToScreen(int *x, int *y) const { WindowRef window = GetMacRootWindow() ; @@ -406,6 +369,7 @@ void wxWindow::ClientToScreen(int *x, int *y) const GrafPtr port ; ::GetPort( &port ) ; ::SetPort( UMAGetWindowPort( window ) ) ; + ::SetOrigin( 0 , 0 ) ; ::LocalToGlobal( &localwhere ) ; ::SetPort( port ) ; *x = localwhere.h ; @@ -438,32 +402,114 @@ void wxWindow::MacRootWindowToClient( int *x , int *y ) const } } -void wxWindow::SetCursor(const wxCursor& cursor) +bool wxWindow::SetCursor(const wxCursor& cursor) { - m_windowCursor = cursor; - if (m_windowCursor.Ok()) + if ( !wxWindowBase::SetCursor(cursor) ) + { + // no change + return FALSE; + } + + wxASSERT_MSG( m_cursor.Ok(), + wxT("cursor must be valid after call to the base version")); + + Point pt ; + wxWindow *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() ) + { + cursor.MacInstall() ; + } } + + return TRUE ; } // Get size *available for subwindows* i.e. excluding menu bar etc. -void wxWindow::GetClientSize(int *x, int *y) const +void wxWindow::DoGetClientSize(int *x, int *y) const { *x = m_width ; *y = m_height ; - if (m_vScrollBar && m_vScrollBar->IsShown() ) - (*x) -= MAC_SCROLLBAR_SIZE; - if (m_hScrollBar && m_hScrollBar->IsShown() ) - (*y) -= MAC_SCROLLBAR_SIZE; + *x -= 2 * MacGetBorderSize( ) ; + *y -= 2 * MacGetBorderSize( ) ; + + 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 ) ; + + WindowRef window = NULL ; + wxWindow *iter = (wxWindow*)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() ) + { + (*y) -= MAC_SCROLLBAR_SIZE; + if ( h-y1 >= totH ) + { + (*y)+= 1 ; + } + } + if (m_vScrollBar && m_vScrollBar->IsShown() ) + { + (*x) -= MAC_SCROLLBAR_SIZE; + if ( w-x1 >= totW ) + { + (*x) += 1 ; + } + } + } +} + + +// ---------------------------------------------------------------------------- +// tooltips +// ---------------------------------------------------------------------------- + +#if wxUSE_TOOLTIPS + +void wxWindow::DoSetToolTip(wxToolTip *tooltip) +{ + wxWindowBase::DoSetToolTip(tooltip); + + if ( m_tooltip ) + m_tooltip->SetWindow(this); +} + +#endif // wxUSE_TOOLTIPS + +void wxWindow::DoMoveWindow(int x, int y, int width, int height) +{ + DoSetSize( x,y, width, height ) ; } void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) { + int former_x = m_x ; int former_y = m_y ; int former_w = m_width ; @@ -478,9 +524,9 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) int actualHeight = height; int actualX = x; int actualY = y; - if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) actualX = currentX; - if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) + if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE)) actualY = currentY; if (width == -1) actualWidth = currentW ; @@ -521,7 +567,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) if ( focus.Ok() ) { Rect clientrect = { 0 , 0 , m_height , m_width } ; - InvalRect( &clientrect ) ; + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } } } @@ -532,18 +578,18 @@ 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 if ( IsKindOf( CLASSINFO( wxFrame ) ) ) { wxFrame* frame = (wxFrame*) this ; - frame->PositionStatusBar(); - frame->PositionToolBar(); + frame->PositionStatusBar(); + frame->PositionToolBar(); } } else @@ -553,8 +599,8 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) wxMacDrawingClientHelper focus( this ) ; if ( focus.Ok() ) { - Rect clientrect = { 0 , 0 , m_height , m_width } ; - InvalRect( &clientrect ) ; + Rect clientrect = { 0 , 0 , m_height , m_width } ; + InvalWindowRect( GetMacRootWindow() , &clientrect ) ; } } if ( doMove ) @@ -563,17 +609,17 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) MacRepositionScrollBars() ; if ( doMove ) { - wxMoveEvent event(wxPoint(m_x, m_y), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event) ; - } - if ( doResize ) - { + wxMoveEvent event(wxPoint(m_x, m_y), m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event) ; + } + if ( doResize ) + { MacRepositionScrollBars() ; - wxSizeEvent event(wxSize(m_width, m_height), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); - } + wxSizeEvent event(wxSize(m_width, m_height), m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); + } } } // For implementation purposes - sometimes decorations make the client area @@ -581,7 +627,7 @@ void wxWindow::DoSetSize(int x, int y, int width, int height, int sizeFlags) wxPoint wxWindow::GetClientAreaOrigin() const { - return wxPoint(0, 0); + return wxPoint(MacGetBorderSize( ) , MacGetBorderSize( ) ); } // Makes an adjustment to the window position (for example, a frame that has @@ -600,6 +646,8 @@ void wxWindow::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) void wxWindow::SetTitle(const wxString& title) { + m_label = title ; + wxString label ; if( wxApp::s_macDefaultEncodingIsPC ) @@ -613,64 +661,22 @@ void wxWindow::SetTitle(const wxString& title) wxString wxWindow::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 ; -} - -void wxWindow::Centre(int direction) -{ - int x_offset,y_offset ; - int display_width, display_height; - int width, height, x, y; - wxWindow *parent = GetParent(); - if ((direction & wxCENTER_FRAME) && parent) - { - parent->GetPosition(&x_offset,&y_offset) ; - parent->GetSize(&display_width,&display_height) ; - } - else - { - 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); + return m_label ; } - bool wxWindow::Show(bool show) { - if ( m_macShown == show ) - return TRUE ; - - m_macShown = show ; + if ( !wxWindowBase::Show(show) ) + return FALSE; + 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 + // no need to generate events here, they will get them triggered by macos + // actually they should be , but apparently they are not wxSizeEvent event(wxSize(m_width, m_height), m_windowId); event.SetEventObject(this); GetEventHandler()->ProcessEvent(event); @@ -680,14 +686,24 @@ bool wxWindow::Show(bool show) UMAHideWindow( m_macWindowData->m_macWindow ) ; } } - Refresh() ; MacSuperShown( show ) ; - return TRUE; + Refresh() ; + if(m_macWindowData) + MacUpdateImmediately() ; + + return TRUE; } -bool wxWindow::IsShown() const +void wxWindow::MacSuperShown( bool show ) { - return m_macShown; + wxNode *node = GetChildren().First(); + while ( node ) + { + wxWindow *child = (wxWindow *)node->Data(); + if ( child->m_isShown ) + child->MacSuperShown( show ) ; + node = node->Next(); + } } int wxWindow::GetCharHeight() const @@ -703,13 +719,23 @@ int wxWindow::GetCharWidth() const } void wxWindow::GetTextExtent(const wxString& string, int *x, int *y, - int *descent, int *externalLeading, const wxFont *theFont, bool) const -{ - wxFont *fontToUse = (wxFont *)theFont; - if (!fontToUse) - fontToUse = (wxFont *) & m_windowFont; - - // TODO + int *descent, int *externalLeading, const wxFont *theFont ) const +{ + const wxFont *fontToUse = theFont; + if ( !fontToUse ) + fontToUse = &m_font; + + wxClientDC dc( this ) ; + long lx,ly,ld,le ; + dc.GetTextExtent( string , &lx , &ly , &ld, &le, fontToUse ) ; + if ( externalLeading ) + *externalLeading = le ; + if ( descent ) + *descent = ld ; + if ( x ) + *x = lx ; + if ( y ) + *y = ly ; } void wxWindow::MacEraseBackground( Rect *rect ) @@ -739,7 +765,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 +790,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 ) ; 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() ) @@ -789,26 +811,18 @@ void wxWindow::MacEraseBackground( Rect *rect ) void wxWindow::Refresh(bool eraseBack, const wxRect *rect) { - wxMacDrawingClientHelper focus( this ) ; + wxMacDrawingHelper focus( this ) ; if ( focus.Ok() ) { - int width , height ; - GetClientSize( &width , &height ) ; - Rect clientrect = { 0 , 0 , height , width } ; - ClipRect( &clientrect ) ; + Rect clientrect = { 0 , 0 , m_height , m_width } ; + 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 ) ; } } @@ -831,60 +845,47 @@ 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; -} - -void wxWindow::InitDialog() -{ - wxInitDialogEvent event(GetId()); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -} - -// Default init dialog behaviour is to transfer data to window -void wxWindow::OnInitDialog(wxInitDialogEvent& event) -{ - TransferDataToWindow(); -} - +#if wxUSE_CARET && WXWIN_COMPATIBILITY +// --------------------------------------------------------------------------- // Caret manipulation +// --------------------------------------------------------------------------- + void wxWindow::CreateCaret(int w, int h) { - m_caretWidth = w; - m_caretHeight = h; - m_caretEnabled = TRUE; + SetCaret(new wxCaret(this, w, h)); } void wxWindow::CreateCaret(const wxBitmap *WXUNUSED(bitmap)) { - // TODO + wxFAIL_MSG("not implemented"); } void wxWindow::ShowCaret(bool show) { - // TODO + wxCHECK_RET( m_caret, "no caret to show" ); + + m_caret->Show(show); } void wxWindow::DestroyCaret() { - // TODO - m_caretEnabled = FALSE; + SetCaret(NULL); } void wxWindow::SetCaretPos(int x, int y) { - // TODO + wxCHECK_RET( m_caret, "no caret to move" ); + + m_caret->Move(x, y); } void wxWindow::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() { @@ -892,15 +893,6 @@ wxWindow *wxGetActiveWindow() 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) { @@ -910,7 +902,6 @@ void wxWindow::WarpPointer (int x_pos, int y_pos) void wxWindow::OnEraseBackground(wxEraseEvent& event) { // TODO : probably we would adopt the EraseEvent structure - Default(); } int wxWindow::GetScrollPos(int orient) const @@ -974,659 +965,381 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) } } -// New function that will replace some of the above. -void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, - int range, bool refresh) +void wxWindow::MacCreateRealWindow( const wxString& title, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) { - if ( orient == wxHORIZONTAL ) + 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 ; + WindowAttributes attr ; + + if ( HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT) ) + { + wclass = kFloatingWindowClass ; + if ( HasFlag(wxTINY_CAPTION_VERT) ) { - if ( m_hScrollBar ) - { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_hScrollBar->IsShown() ) - m_hScrollBar->Show(false) ; - } - else - { - if ( !m_hScrollBar->IsShown() ) - m_hScrollBar->Show(true) ; - m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; - } - } + attr |= kWindowSideTitlebarAttribute ; } - else + } + else if ( HasFlag( wxTHICK_FRAME ) ) + { + if ( HasFlag( wxDIALOG_MODAL ) ) { - if ( m_vScrollBar ) + wclass = kMovableModalWindowClass ; + } + else if ( HasFlag( wxDIALOG_MODELESS ) ) + { + wclass = kDocumentWindowClass ; + } + else + { + if ( HasFlag( wxCAPTION ) ) { - if ( range == 0 || thumbVisible >= range ) - { - if ( m_vScrollBar->IsShown() ) - m_vScrollBar->Show(false) ; - } - else - { - if ( !m_vScrollBar->IsShown() ) - m_vScrollBar->Show(true) ; - m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; - } + wclass = kDocumentWindowClass ; + } + else + { + wclass = kModalWindowClass ; } } - MacRepositionScrollBars() ; -} - -// Does a physical scroll -void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) -{ - wxMacDrawingClientHelper focus( this ) ; - if ( focus.Ok() ) - { - int width , height ; - GetClientSize( &width , &height ) ; - Rect scrollrect = { 0 , 0 , height , width } ; - - RgnHandle updateRgn = NewRgn() ; - ClipRect( &scrollrect ) ; - if ( rect ) - { - Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; - SectRect( &scrollrect , &r , &scrollrect ) ; - } - ScrollRect( &scrollrect , dx , dy , updateRgn ) ; - InvalRgn( updateRgn ) ; - DisposeRgn( updateRgn ) ; - } -} - -void wxWindow::SetFont(const wxFont& font) -{ - m_windowFont = font; - - if (!m_windowFont.Ok()) - return; - // TODO -} - -void wxWindow::OnChar(wxKeyEvent& event) -{ - if ( event.KeyCode() == WXK_TAB ) { - // propagate the TABs to the parent - it's up to it to decide what - // to do with it - if ( GetParent() ) { - if ( GetParent()->ProcessEvent(event) ) - return; - } - } -} - -void wxWindow::OnPaint(wxPaintEvent& event) -{ -/* - if ( m_macWindowData ) - { - wxMacDrawingClientHelper helper ( this ) ; - long x ,y ,w ,h ; - GetUpdateRegion().GetBox( x , y , w , h ) ; - UMASetThemeWindowBackground( m_macWindowData->m_macWindow , m_macWindowData->m_macWindowBackgroundTheme , false ) ; - Rect r = { y , x, y+h , x+w } ; - EraseRect( &r ) ; } else { - wxMacDrawingClientHelper helper ( this ) ; - long x ,y ,w ,h ; - GetUpdateRegion().GetBox( x , y , w , h ) ; - RGBBackColor( &m_backgroundColour.GetPixel() ) ; - Rect r = { y , x, y+h , x+w } ; - EraseRect( &r ) ; + wclass = kModalWindowClass ; } -*/ -} - -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 ) + + attr = kWindowNoAttributes ; + + if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ) { - 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(); + attr |= kWindowFullZoomAttribute ; + attr |= kWindowCollapseBoxAttribute ; } - return TRUE; -} - -// Transfer values from controls. If returns FALSE, -// validation failed: don't quit -bool wxWindow::TransferDataFromWindow() -{ - wxNode *node = GetChildren().First(); - while ( node ) + if ( HasFlag( wxRESIZE_BORDER ) ) { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && !child->GetValidator()->TransferFromWindow() ) - { - return FALSE; - } - - node = node->Next(); + attr |= kWindowResizableAttribute ; } - return TRUE; -} - -bool wxWindow::Validate() -{ - wxNode *node = GetChildren().First(); - while ( node ) + if ( HasFlag( wxSYSTEM_MENU ) ) { - wxWindow *child = (wxWindow *)node->Data(); - if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this) ) - { - return FALSE; - } - - node = node->Next(); + attr |= kWindowCloseBoxAttribute ; } - 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; -} + + 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 ) ; -void wxWindow::RemoveChild(wxWindow *child) -{ - GetChildren().DeleteObject(child); - child->m_windowParent = NULL; + m_macWindowData->m_macFocus = NULL ; } -void wxWindow::DestroyChildren() +void wxWindow::MacPaint( wxPaintEvent &event ) { - wxNode *node; - while ((node = GetChildren().First()) != (wxNode *)NULL) { - wxWindow *child; - if ((child = (wxWindow *)node->Data()) != (wxWindow *)NULL) { - delete child; - if ( GetChildren().Find(child) ) - delete node; - } - } /* while */ } -void wxWindow::MakeModal(bool modal) +void wxWindow::MacPaintBorders( ) { - // 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 + 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() ; -void wxWindow::SetConstraints( wxLayoutConstraints *constraints ) -{ - if ( m_constraints ) + if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) ) { - UnsetConstraints(m_constraints); - delete m_constraints; + 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 ) ; + } } - m_constraints = constraints; - if ( m_constraints ) + else if (HasFlag(wxSIMPLE_BORDER)) { - // 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); + Rect rect = { 0 , 0 , m_height , m_width } ; + RGBForeColor( &black ) ; + FrameRect( &rect ) ; } -} - -// 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); +/* + 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); + } } + */ } -// 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() +// New function that will replace some of the above. +void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, + int range, bool refresh) { - 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; - } + if ( orient == wxHORIZONTAL ) + { + if ( m_hScrollBar ) + { + if ( range == 0 || thumbVisible >= range ) + { + if ( m_hScrollBar->IsShown() ) + m_hScrollBar->Show(false) ; + } + else + { + if ( !m_hScrollBar->IsShown() ) + m_hScrollBar->Show(true) ; + m_hScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; + } + } + } + else + { + if ( m_vScrollBar ) + { + if ( range == 0 || thumbVisible >= range ) + { + if ( m_vScrollBar->IsShown() ) + m_vScrollBar->Show(false) ; + } + else + { + if ( !m_vScrollBar->IsShown() ) + m_vScrollBar->Show(true) ; + m_vScrollBar->SetScrollbar( pos , thumbVisible , range , refresh ) ; + } + } + } + MacRepositionScrollBars() ; } -void wxWindow::SetSizer(wxSizer *sizer) +// Does a physical scroll +void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) { - if (m_windowSizer) delete m_windowSizer; + wxMacDrawingClientHelper focus( this ) ; + if ( focus.Ok() ) + { + int width , height ; + GetClientSize( &width , &height ) ; - m_windowSizer = sizer; + Rect scrollrect = { 0 , 0 , height , width } ; + + RgnHandle updateRgn = NewRgn() ; + ClipRect( &scrollrect ) ; + if ( rect ) + { + Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ; + SectRect( &scrollrect , &r , &scrollrect ) ; + } + ScrollRect( &scrollrect , dx , dy , updateRgn ) ; + InvalWindowRgn( GetMacRootWindow() , updateRgn ) ; + DisposeRgn( updateRgn ) ; + } } -bool wxWindow::Layout() +void wxWindow::MacOnScroll(wxScrollEvent &event ) { - 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); - } + if ( event.m_eventObject == m_vScrollBar || event.m_eventObject == m_hScrollBar ) + { + 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); + switch ( event.m_eventType ) + { + case wxEVT_SCROLL_TOP: + wevent.m_eventType = wxEVT_SCROLLWIN_TOP; + break; + + case wxEVT_SCROLL_BOTTOM: + wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM; + break; + + case wxEVT_SCROLL_LINEUP: + wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP; + break; + + case wxEVT_SCROLL_LINEDOWN: + wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN; + break; + + case wxEVT_SCROLL_PAGEUP: + wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP; + break; + + case wxEVT_SCROLL_PAGEDOWN: + wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN; + break; + + case wxEVT_SCROLL_THUMBTRACK: + wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK; + break; + + } + + GetEventHandler()->ProcessEvent(wevent); } - else - return TRUE; -} - -bool wxWindow::LayoutPhase2(int *noChanges) -{ - *noChanges = 0; - - // Layout children - DoPhase(1); - DoPhase(2); - return TRUE; } -// Do a phase of evaluating child constraints -bool wxWindow::DoPhase(int phase) +bool wxWindow::SetFont(const wxFont& font) { - 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 -{ - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetSize(w, h); -} - -void wxWindow::GetClientSizeConstraint(int *w, int *h) const +// Get the window with the focus +wxWindow *wxWindowBase::FindFocus() { - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *w = constr->width.GetValue(); - *h = constr->height.GetValue(); - } - else - GetClientSize(w, h); + return gFocusWindow ; } -void wxWindow::GetPositionConstraint(int *x, int *y) 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 wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event) { - wxLayoutConstraints *constr = GetConstraints(); - if ( constr ) - { - *x = constr->left.GetValue(); - *y = constr->top.GetValue(); - } - else - GetPosition(x, y); + if ( GetEventHandler()->ProcessEvent(event) ) + return; + if ( m_parent ) + m_parent->GetEventHandler()->OnCommand(win, event); } +#endif // WXWIN_COMPATIBILITY_2 -#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); -} - wxObject* wxWindow::GetChild(int number) const { - // 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 ; -} - -void wxWindow::OnDefaultAction(wxControl *initiatingItem) -{ - // Obsolete function + // 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 ) + { + wxObject *obj = (wxObject *)node->Data(); + return(obj); + } + else + return NULL; } +#endif // WXWIN_COMPATIBILITY void wxWindow::Clear() { @@ -1643,82 +1356,17 @@ void wxWindow::Clear() else { wxClientDC dc(this); - wxBrush brush(GetBackgroundColour(), wxSOLID); - dc.SetBackground(brush); - dc.Clear(); - } -} - -// Fits the panel around the items -void wxWindow::Fit() -{ - int maxX = 0; - int maxY = 0; - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *win = (wxWindow *)node->Data(); - int wx, wy, ww, wh; - win->GetPosition(&wx, &wy); - win->GetSize(&ww, &wh); - if ( wx + ww > maxX ) - maxX = wx + ww; - if ( wy + wh > maxY ) - maxY = wy + wh; - - node = node->Next(); - } - SetClientSize(maxX + 5, maxY + 5); -} - -void wxWindow::SetValidator(const wxValidator& validator) -{ - if ( m_windowValidator ) - delete m_windowValidator; - m_windowValidator = validator.Clone(); - - if ( m_windowValidator ) - m_windowValidator->SetWindow(this) ; -} - -void wxWindow::SetAcceleratorTable(const wxAcceleratorTable& accel) -{ - m_acceleratorTable = accel; -} - -// Find a window by id or name -wxWindow *wxWindow::FindWindow(long id) -{ - if ( GetId() == id) - return this; - - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(id); - if ( found ) - return found; - node = node->Next(); + wxBrush brush(GetBackgroundColour(), wxSOLID); + dc.SetBackground(brush); + dc.Clear(); } - return NULL; } -wxWindow *wxWindow::FindWindow(const wxString& name) +// Setup background and foreground colours correctly +void wxWindow::SetupColours() { - if ( GetName() == name) - return this; - - wxNode *node = GetChildren().First(); - while ( node ) - { - wxWindow *child = (wxWindow *)node->Data(); - wxWindow *found = child->FindWindow(name); - if ( found ) - return found; - node = node->Next(); - } - return NULL; + if ( GetParent() ) + SetBackgroundColour(GetParent()->GetBackgroundColour()); } void wxWindow::OnIdle(wxIdleEvent& event) @@ -1755,43 +1403,6 @@ 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 -{ - 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; -} - void wxWindow::DoSetClientSize(int width, int height) { if ( width != -1 || height != -1 ) @@ -1802,34 +1413,13 @@ void wxWindow::DoSetClientSize(int width, int height) if ( height != -1 && m_vScrollBar ) height += MAC_SCROLLBAR_SIZE ; + width += 2 * MacGetBorderSize( ) ; + height += 2 * MacGetBorderSize( ) ; + 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); -} wxWindow* wxWindow::s_lastMouseWindow = NULL ; @@ -1846,16 +1436,13 @@ 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()) + wxWindow *child = (wxWindow*)node->Data(); + if ( child->GetMacRootWindow() == window ) { - wxWindow *child = (wxWindow*)node->Data(); - if ( child->GetMacRootWindow() == window ) - { - if (child->MacGetWindowFromPointSub(newPoint , outWin )) - return TRUE; - } + if (child->MacGetWindowFromPointSub(newPoint , outWin )) + return TRUE; } } @@ -1885,6 +1472,7 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height))) return FALSE; + if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) ) return FALSE ; @@ -1896,16 +1484,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->IsShown() && child->IsEnabled() ) { - wxWindow *child = (wxWindow*)node->Data(); - if ( child->GetMacRootWindow() == window && child->IsReallyShown() && child->IsReallyEnabled() ) - { - if (child->MacDispatchMouseEvent(event)) - return TRUE; - } + if (child->MacDispatchMouseEvent(event)) + return TRUE; } } @@ -1914,12 +1499,30 @@ bool wxWindow::MacDispatchMouseEvent(wxMouseEvent& event) if ( wxBusyCursorCount == 0 ) { - m_windowCursor.MacInstall() ; + m_cursor.MacInstall() ; } + +#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; } +Point lastWhere ; +long lastWhen = 0 ; + +wxString wxWindow::MacGetToolTipString( wxPoint &pt ) +{ + if ( m_tooltip ) + { + return m_tooltip->GetTip() ; + } + return "" ; +} void wxWindow::MacFireMouseEvent( EventRecord *ev ) { wxMouseEvent event(wxEVT_LEFT_DOWN); @@ -1962,6 +1565,22 @@ 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 = ev->when ; + lastWhere = localwhere ; + } + event.m_x = localwhere.h; event.m_y = localwhere.v; event.m_x += m_x; @@ -1989,7 +1608,7 @@ void wxWindow::MacFireMouseEvent( EventRecord *ev ) wxTheApp->s_captureWindow = NULL ; if ( wxBusyCursorCount == 0 ) { - m_windowCursor.MacInstall() ; + m_cursor.MacInstall() ; } } } @@ -2046,10 +1665,13 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) WindowRef window = GetMacRootWindow() ; wxWindow* win = wxFindWinFromMacWindow( window ) ; { - 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 ) ; @@ -2076,13 +1698,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 +1727,47 @@ void wxWindow::MacRedraw( RgnHandle updatergn , long time) { RGBBackColor( &m_backgroundColour.GetPixel()) ; } + if ( GetParent() && m_backgroundColour != GetParent()->GetBackgroundColour() ) + eraseBackground = true ; SetClip( updatergn ) ; - EraseRgn( updatergn ) ; + if ( eraseBackground ) + { + EraseRgn( updatergn ) ; + } + } + + m_macUpdateRgn = updatergn ; + { + RgnHandle newupdate = NewRgn() ; + wxSize point = GetClientSize() ; + wxPoint origin = GetClientAreaOrigin() ; + SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ; + SectRgn( newupdate , m_macUpdateRgn , newupdate ) ; + 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 ) ; + SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; + SectRgn( childupdate , m_macUpdateRgn , childupdate ) ; 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 ) ; @@ -2145,24 +1783,28 @@ void wxWindow::MacUpdateImmediately() if ( window ) { wxWindow* 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->MacRedraw( region , wxTheApp->sm_lastMessageTime ) ; + } + DisposeRgn( region ); + } } EndUpdate( window ) ; } @@ -2172,26 +1814,28 @@ void wxWindow::MacUpdate( EventRecord *ev ) { WindowRef window = (WindowRef) ev->message ; wxWindow * 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 ) ) + { + MacRedraw( region , ev->when ) ; + } + DisposeRgn( region ); + } } EndUpdate( window ) ; } @@ -2215,19 +1859,38 @@ WindowRef wxWindow::GetMacRootWindow() const void wxWindow::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 } @@ -2237,22 +1900,86 @@ void wxWindow::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 -= 2 * MacGetBorderSize() ; + height -= 2 * MacGetBorderSize() ; + + 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 ) ; + + WindowRef window = NULL ; + wxWindow *iter = (wxWindow*)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 ) { -} +} +bool wxWindow::AcceptsFocus() const +{ + return MacCanFocus() && wxWindowBase::AcceptsFocus(); +} ControlHandle wxWindow::MacGetContainerForEmbedding() { @@ -2274,46 +2001,8 @@ void wxWindow::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 ; @@ -2361,7 +2050,7 @@ bool wxWindow::MacSetupDrawingClientPort( ) MacGetPortClientParams( &localOrigin , &clipRect , &window , &rootwin) ; return MacSetPortDrawingParams( localOrigin, clipRect, window , rootwin ) ; } - +*/ bool wxWindow::MacSetPortFocusParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindow* win ) { @@ -2376,6 +2065,7 @@ 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; } @@ -2391,14 +2081,16 @@ 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; } @@ -2433,10 +2125,10 @@ void wxWindow::MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *w } } -void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) +void wxWindow::MacDoGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) { - int width , height ; - GetClientSize( &width , &height ) ; +// int width , height ; +// GetClientSize( &width , &height ) ; if ( m_macWindowData ) { @@ -2453,7 +2145,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,12 +2154,58 @@ 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); } } +void wxWindow::MacGetPortClientParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindow** rootwin ) +{ + MacDoGetPortClientParams( localOrigin , clipRect , window , rootwin ) ; + + int width , height ; + GetClientSize( &width , &height ) ; + wxPoint client ; + client = GetClientAreaOrigin( ) ; + + 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); +} + +long wxWindow::MacGetBorderSize( ) 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 wxWindow::MacRemoveBordersFromStyle( long style ) +{ + return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ; +} +/* wxMacFocusHelper::wxMacFocusHelper( wxWindow * theWindow ) { m_ok = false ; @@ -2491,12 +2229,13 @@ wxMacFocusHelper::~wxMacFocusHelper() { if ( m_ok ) { + SetPort( m_currentPort ) ; SetOrigin( 0 , 0 ) ; } if ( m_formerPort != m_currentPort ) SetPort( m_formerPort ) ; } - +*/ wxMacDrawingHelper::wxMacDrawingHelper( wxWindow * theWindow ) { m_ok = false ; @@ -2523,15 +2262,18 @@ 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 ; @@ -2556,11 +2298,13 @@ wxMacFocusClientHelper::~wxMacFocusClientHelper() { if ( m_ok ) { + SetPort( m_currentPort ) ; SetOrigin( 0 , 0 ) ; } if ( m_formerPort != m_currentPort ) SetPort( m_formerPort ) ; } +*/ wxMacDrawingClientHelper::wxMacDrawingClientHelper( wxWindow * theWindow ) { @@ -2589,21 +2333,14 @@ 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 -// ---------------------------------------------------------------------------- - -void wxWindowListNode::DeleteData() -{ - delete (wxWindow *)GetData(); -} -