- if ( m_macControl == NULL )
- {
- wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
- return ;
- }
-
- WindowRef rootwindow = GetMacRootWindow() ;
- wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
- UMASetThemeWindowBackground( rootwindow , kThemeBrushDialogBackgroundActive , false ) ;
-
- int former_x = m_x ;
- int former_y = m_y ;
- int former_w = m_width ;
- int former_h = m_height ;
-
- Rect contrlRect ;
- GetControlBounds( m_macControl , &contrlRect ) ;
- int former_mac_x = contrlRect.left ;
- int former_mac_y = contrlRect.top ;
-
- 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)
- return ;
-
- AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
- WindowRef macrootwindow = GetMacRootWindow() ;
- wxMacDrawingHelper focus( wxFindWinFromMacWindow( macrootwindow ) ) ;
-
- int mac_x = actualX ;
- int mac_y = actualY ;
- GetParent()->MacClientToRootWindow( & mac_x , & mac_y ) ;
-
- if ( mac_x != former_mac_x || mac_y != former_mac_y )
- {
- {
- Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
- InvalWindowRect( macrootwindow, &inval ) ;
- }
- UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
- {
- Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
- InvalWindowRect(macrootwindow, &inval ) ;
- }
- }
-
- if ( actualX != former_x || actualY != former_y )
- {
- m_x = actualX ;
- m_y = actualY ;
-
- MacRepositionScrollBars() ;
- // To consider -> should the parameters be the effective or the virtual coordinates (AdjustForParent..)
- wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
- }
- if ( actualWidth != former_w || actualHeight != former_h )
- {
- {
- Rect inval = { mac_y , mac_x , mac_y + former_h , mac_x + former_w } ;
- InvalWindowRect( macrootwindow, &inval ) ;
- }
- m_width = actualWidth ;
- m_height = actualHeight ;
-
- UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
- {
- Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
- InvalWindowRect( macrootwindow , &inval ) ;
- }
-
- MacRepositionScrollBars() ;
- wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
- }
- if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
- {
- }
- else
- {
- UMASetThemeWindowBackground( rootwindow , kThemeBrushDocumentWindowBackground , false ) ;
- }
+ if ( (ControlHandle) m_macControl == NULL )
+ {
+ wxWindow::DoSetSize( x , y ,width , height ,sizeFlags ) ;
+ return ;
+ }
+
+ Rect oldbounds;
+ int new_x, new_y, new_width, new_height;
+ int mac_x, mac_y;
+
+ new_x = m_x;
+ new_y = m_y;
+ new_width = m_width;
+ new_height = m_height;
+
+ if (sizeFlags & wxSIZE_ALLOW_MINUS_ONE)
+ {
+ new_x = x;
+ new_y = y;
+ new_width = width;
+ new_height = height;
+ }
+ else
+ {
+ if (x != -1) new_x = x;
+ if (y != -1) new_y = y;
+ if (width != -1) new_width = width;
+ if (height != -1) new_height = height;
+ }
+
+ if(sizeFlags & wxSIZE_AUTO)
+ {
+ wxSize size = GetBestSize();
+ if (sizeFlags & wxSIZE_AUTO_WIDTH)
+ {
+ if (width == -1) new_width = size.x;
+ }
+ if (sizeFlags & wxSIZE_AUTO_HEIGHT)
+ {
+ if (height == -1) new_height = size.y;
+ }
+ }
+ AdjustForParentClientOrigin(new_x, new_y, sizeFlags);
+
+ mac_x = new_x;
+ mac_y = new_y;
+ if(GetParent()) {
+ GetParent()->MacWindowToRootWindow(&mac_x, &mac_y);
+ }
+ GetControlBounds( (ControlHandle) m_macControl, &oldbounds);
+ oldbounds.right = oldbounds.left + m_width;
+ oldbounds.bottom = oldbounds.top + m_height;
+
+ bool doMove = false;
+ bool doResize = false;
+
+ if ( mac_x != (oldbounds.left - m_macHorizontalBorder) ||
+ mac_y != (oldbounds.top - m_macVerticalBorder) )
+ {
+ doMove = true ;
+ }
+ if ( new_width != oldbounds.right - oldbounds.left - 2 * m_macHorizontalBorder ||
+ new_height != oldbounds.bottom - oldbounds.top - 2 * m_macVerticalBorder)
+ {
+ doResize = true ;
+ }
+
+ if ( doMove || doResize )
+ {
+ Refresh() ;
+
+ // Ensure resize is within constraints
+ if ((m_minWidth != -1) && (new_width < m_minWidth)) {
+ new_width = m_minWidth;
+ }
+ if ((m_minHeight != -1) && (new_height < m_minHeight)) {
+ new_height = m_minHeight;
+ }
+ if ((m_maxWidth != -1) && (new_width > m_maxWidth)) {
+ new_width = m_maxWidth;
+ }
+ if ((m_maxHeight != -1) && (new_height > m_maxHeight)) {
+ new_height = m_maxHeight;
+ }
+
+ if ( doMove )
+ {
+ m_x = new_x;
+ m_y = new_y;
+
+ UMAMoveControl( (ControlHandle) m_macControl,
+ mac_x + m_macHorizontalBorder, mac_y + m_macVerticalBorder);
+
+ wxMoveEvent event(wxPoint(m_x, m_y), m_windowId);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event) ;
+ }
+ if ( doResize )
+ {
+ m_width = new_width;
+ m_height = new_height;
+
+ UMASizeControl( (ControlHandle) m_macControl,
+ m_width - 2 * m_macHorizontalBorder,
+ m_height - 2 * m_macVerticalBorder ) ;
+
+
+ wxSizeEvent event(wxSize(m_width, m_height), m_windowId);
+ event.SetEventObject(this);
+ GetEventHandler()->ProcessEvent(event);
+ }
+
+ Refresh() ;
+ }
projects / wxWidgets.git / blobdiff