// 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...
if ( m_dropTarget != 0 ) {
delete m_dropTarget;
}
-
+
m_dropTarget = pDropTarget;
if ( m_dropTarget != 0 )
{
menu->UpdateUI();
ClientToScreen( &x , &y ) ;
- wxArrayPtrVoid submenus ;
- wxMenuItemList::Node *node;
- wxMenuItem *item;
- int pos ;
- for (pos = 0, node = menu->GetMenuItems().GetFirst(); node; node = node->GetNext(), pos++)
- {
- item = (wxMenuItem *)node->GetData();
- wxMenu* subMenu = item->GetSubMenu() ;
- if (subMenu)
- {
- submenus.Add(subMenu) ;
- }
- }
-
- ::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ;
-
- for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
- {
- wxMenu* submenu = (wxMenu*) submenus[i] ;
- wxMenuItemList::Node *subnode;
- wxMenuItem *subitem;
- int subpos ;
- for ( subpos = 0 , subnode = submenu->GetMenuItems().GetFirst(); subnode; subnode = subnode->GetNext(), subpos++)
- {
- subitem = (wxMenuItem *)subnode->GetData();
- wxMenu* itsSubMenu = subitem->GetSubMenu() ;
- if (itsSubMenu)
- {
- submenus.Add(itsSubMenu) ;
- }
- }
- ::InsertMenu( MAC_WXHMENU(submenu->GetHMenu()) , -1 ) ;
- }
-
+ menu->MacBeforeDisplay( true ) ;
long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
if ( HiWord(menuResult) != 0 )
{
if (item->IsCheckable())
{
item->Check( !item->IsChecked() ) ;
- }
+ }
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
- ::DeleteMenu( menu->MacGetMenuId() ) ;
- for ( size_t i = 0 ; i < submenus.GetCount() ; ++i )
- {
- wxMenu* submenu = (wxMenu*) submenus[i] ;
- ::DeleteMenu( submenu->MacGetMenuId() ) ;
- }
+ menu->MacAfterDisplay( true ) ;
menu->SetInvokingWindow(NULL);
if(x) *x = localwhere.h ;
if(y) *y = localwhere.v ;
-
+
MacRootWindowToWindow( x , y ) ;
if ( x )
*x -= MacGetLeftBorderSize() ;
{
if (m_cursor == cursor)
return FALSE;
-
+
if (wxNullCursor == cursor)
{
if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
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 ) )
{
if ( mouseWin == this && !wxIsBusy() )
m_cursor.MacInstall() ;
}
}
-
+
return TRUE ;
}
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 )
{
totH = iter->m_height ;
break ;
}
-
+
iter = iter->GetParent() ;
}
-
+
if (m_hScrollBar && m_hScrollBar->IsShown() )
{
hh -= MAC_SCROLLBAR_SIZE;
void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
{
wxWindowBase::DoSetToolTip(tooltip);
-
+
if ( m_tooltip )
m_tooltip->SetWindow(this);
}
int former_y = m_y ;
int former_w = m_width ;
int former_h = m_height ;
-
+
int actualWidth = width;
int actualHeight = height;
int actualX = x;
int actualY = y;
-
+
if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth;
if ((m_minHeight != -1) && (actualHeight < m_minHeight))
actualWidth = m_maxWidth;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight;
-
+
bool doMove = false ;
bool doResize = false ;
-
+
if ( actualX != former_x || actualY != former_y )
{
doMove = true ;
{
doResize = true ;
}
-
+
if ( doMove || doResize )
{
// erase former position
-
+
bool partialRepaint = false ;
-
+
if ( HasFlag(wxNO_FULL_REPAINT_ON_RESIZE) )
{
wxPoint oldPos( m_x , m_y ) ;
DisposeRgn(diffRgn) ;
}
}
-
+
if ( !partialRepaint )
Refresh() ;
-
+
m_x = actualX ;
m_y = actualY ;
m_width = actualWidth ;
m_height = actualHeight ;
-
+
// update any low-level frame-relative positions
-
+
MacUpdateDimensions() ;
// erase new position
-
+
if ( !partialRepaint )
Refresh() ;
if ( doMove )
wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
-
+
MacRepositionScrollBars() ;
if ( doMove )
{
GetEventHandler()->ProcessEvent(event);
}
}
-
+
}
// set the size of the window: if the dimensions are positive, just use them,
// 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 ( 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 )
{
width = currentW;
}
}
-
+
if ( height == -1 )
{
if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
size = DoGetBestSize();
}
//else: already called DoGetBestSize() above
-
+
height = size.y;
}
else
height = currentH;
}
}
-
+
DoMoveWindow(x, y, width, height);
-
+
}
// For implementation purposes - sometimes decorations make the client area
// smaller
if ( !wxWindowBase::Show(show) )
return FALSE;
-/*
- WindowRef window = (WindowRef) MacGetRootWindow() ;
- wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
- if ( win == NULL && win->m_isBeingDeleted )
- return FALSE ;
-*/
MacSuperShown( show ) ;
Refresh() ;
-/*
- if ( !show )
- {
- if ( win && !win->m_isBeingDeleted )
- Refresh() ;
- }
- else
- {
- Refresh() ;
- }
-*/
+
return TRUE;
}
wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->GetData();
+ wxWindowMac *child = node->GetData();
if ( child->m_isShown )
child->MacSuperShown( show ) ;
node = node->GetNext();
// on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
// it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
// either a non gray background color or a non control window
-
+
WindowRef window = (WindowRef) MacGetRootWindow() ;
-
+
wxWindowMac* parent = GetParent() ;
while( parent )
{
parent = NULL ;
break ;
}
-
+
{
if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
&& parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
{
m_macBackgroundBrush.SetColour( m_backgroundColour ) ;
}
-
- return m_macBackgroundBrush ;
+
+ return m_macBackgroundBrush ;
}
void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ;
-
+
{
int width , height ;
GetClientSize( &width , &height ) ;
-
+
Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
RgnHandle updateRgn = NewRgn() ;
ClipRect( &scrollrect ) ;
InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ;
DisposeRgn( updateRgn ) ;
}
-
+
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *child = (wxWindowMac*)node->GetData();
+ wxWindowMac *child = node->GetData();
if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue;
-
+
int x,y;
child->GetPosition( &x, &y );
int w,h;
child->GetSize( &w, &h );
child->SetSize( x+dx, y+dy, w, h );
}
-
+
}
void wxWindowMac::MacOnScroll(wxScrollEvent &event )
wevent.SetPosition(event.GetPosition());
wevent.SetOrientation(event.GetOrientation());
wevent.m_eventObject = this;
-
- if (event.m_eventType == wxEVT_SCROLL_TOP) {
+
+ 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 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;
+ else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
+ wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+
+ GetEventHandler()->ProcessEvent(wevent);
}
}
// 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 wxWindowMac::OnIdle(wxIdleEvent& event)
{
-/*
- // Check if we need to send a LEAVE event
- if (m_mouseInWindow)
- {
- POINT pt;
- ::GetCursorPos(&pt);
- if (::WindowFromPoint(pt) != (HWND) GetHWND())
- {
- // Generate a LEAVE event
- m_mouseInWindow = FALSE;
- MSWOnMouseLeave(pt.x, pt.y, 0);
- }
- }
-*/
-
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
UpdateWindowUI();
(point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
return FALSE;
}
-
+
WindowRef window = (WindowRef) MacGetRootWindow() ;
-
+
wxPoint newPoint( point ) ;
-
+
if ( !IsTopLevel() )
{
newPoint.x -= m_x;
newPoint.y -= m_y;
}
-
+
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *child = (wxWindowMac*)node->GetData();
+ wxWindowMac *child = node->GetData();
// added the m_isShown test --dmazzoni
if ( child->MacGetRootWindow() == window && child->m_isShown )
{
return TRUE;
}
}
-
+
*outWin = this ;
return TRUE;
}
bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
{
WindowRef window ;
-
+
Point pt = { screenpoint.y , screenpoint.x } ;
if ( ::FindWindow( pt , &window ) == 3 )
{
-
+
wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
if ( win )
{
// No, this yields the CLIENT are, we need the whole frame. RR.
// point = win->ScreenToClient( point ) ;
-
+
GrafPtr port;
::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( window ) ) ;
::GlobalToLocal( &pt ) ;
::SetPort( port ) ;
-
+
wxPoint point( pt.h, pt.v ) ;
-
+
return win->MacGetWindowFromPointSub( point , outWin ) ;
}
}
bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
{
// first trigger a set cursor event
-
+
wxPoint clientorigin = GetClientAreaOrigin() ;
wxSize clientsize = GetClientSize() ;
wxCursor cursor ;
if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
{
wxSetCursorEvent event( pt.x , pt.y );
-
+
bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
if ( processedEvtSetCursor && event.HasCursor() )
{
}
else
{
-
+
// the test for processedEvtSetCursor is here to prevent using m_cursor
// if the user code caught EVT_SET_CURSOR() and returned nothing from
// it - this is a way to say that our cursor shouldn't be used for this
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 ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
return FALSE ;
-
+
WindowRef window = (WindowRef) MacGetRootWindow() ;
-
+
event.m_x -= m_x;
event.m_y -= m_y;
-
+
int x = event.m_x ;
int y = event.m_y ;
-
+
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *child = (wxWindowMac*)node->GetData();
+ wxWindowMac *child = node->GetData();
if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
{
if (child->MacDispatchMouseEvent(event))
return TRUE;
}
}
-
+
wxWindow* cursorTarget = this ;
wxPoint cursorPoint( x , y ) ;
-
+
while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
{
cursorTarget = cursorTarget->GetParent() ;
event.m_x = x ;
event.m_y = y ;
event.SetEventObject( this ) ;
-
+
if ( event.GetEventType() == wxEVT_LEFT_DOWN )
{
// set focus to this window
if (AcceptsFocus() && FindFocus()!=this)
SetFocus();
}
-
+
#if wxUSE_TOOLTIPS
if ( event.GetEventType() == wxEVT_MOTION
|| event.GetEventType() == wxEVT_ENTER_WINDOW
|| event.GetEventType() == wxEVT_LEAVE_WINDOW )
wxToolTip::RelayEvent( this , event);
#endif // wxUSE_TOOLTIPS
-
+
if (gs_lastWhich != this)
{
gs_lastWhich = this;
-
+
// Double clicks must always occur on the same window
if (event.GetEventType() == wxEVT_LEFT_DCLICK)
event.SetEventType( wxEVT_LEFT_DOWN );
if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
event.SetEventType( wxEVT_RIGHT_DOWN );
-
+
// Same for mouse up events
if (event.GetEventType() == wxEVT_LEFT_UP)
return TRUE;
if (event.GetEventType() == wxEVT_RIGHT_UP)
return TRUE;
}
-
+
GetEventHandler()->ProcessEvent( event ) ;
-
+
return TRUE;
}
{
return m_tooltip->GetTip() ;
}
- return "" ;
+ return wxEmptyString ;
}
void wxWindowMac::Update()
RgnHandle visRgn = NewRgn() ;
RgnHandle tempRgn = NewRgn() ;
RgnHandle tempStaticBoxRgn = NewRgn() ;
-
+
SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
-
+
//TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
{
int borderTop = 14 ;
int borderOther = 4 ;
-
+
SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;
}
-
+
if ( !IsTopLevel() )
{
wxWindow* parent = GetParent() ;
x = y = 0 ;
parent->MacWindowToRootWindow( &x, &y ) ;
MacRootWindowToWindow( &x , &y ) ;
-
+
SetRectRgn( tempRgn ,
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
x + size.x - parent->MacGetRightBorderSize(),
y + size.y - parent->MacGetBottomBorderSize()) ;
-
+
SectRgn( visRgn , tempRgn , visRgn ) ;
if ( parent->IsTopLevel() )
break ;
{
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *child = (wxWindowMac*)node->GetData();
-
+ wxWindowMac *child = node->GetData();
+
if ( !child->IsTopLevel() && child->IsShown() )
{
SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
{
int borderTop = 14 ;
int borderOther = 4 ;
-
+
SetRectRgn( tempStaticBoxRgn , child->m_x + borderOther , child->m_y + borderTop , child->m_x + child->m_width - borderOther , child->m_y + child->m_height - borderOther ) ;
DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
}
}
}
}
-
+
if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
{
bool thisWindowThrough = false ;
for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *sibling = (wxWindowMac*)node->GetData();
+ wxWindowMac *sibling = node->GetData();
if ( sibling == this )
{
thisWindowThrough = true ;
{
continue ;
}
-
+
if ( !sibling->IsTopLevel() && sibling->IsShown() )
{
SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ;
{
int borderTop = 14 ;
int borderOther = 4 ;
-
+
SetRectRgn( tempStaticBoxRgn , sibling->m_x - m_x + borderOther , sibling->m_y - m_y + borderTop , sibling->m_x + sibling->m_width - m_x - borderOther , sibling->m_y + sibling->m_height - m_y - borderOther ) ;
DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
}
RgnHandle updatergn = (RgnHandle) updatergnr ;
// updatergn is always already clipped to our boundaries
// it is in window coordinates, not in client coordinates
-
+
WindowRef window = (WindowRef) MacGetRootWindow() ;
-
+
{
// ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
RgnHandle ownUpdateRgn = NewRgn() ;
CopyRgn( updatergn , ownUpdateRgn ) ;
-
+
SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ;
-
+
// newupdate is the update region in client coordinates
RgnHandle newupdate = NewRgn() ;
wxSize point = GetClientSize() ;
OffsetRgn( newupdate , -origin.x , -origin.y ) ;
m_updateRegion = newupdate ;
DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
-
+
if ( erase && !EmptyRgn(ownUpdateRgn) )
{
wxWindowDC dc(this);
wxEraseEvent eevent( GetId(), &dc );
eevent.SetEventObject( this );
GetEventHandler()->ProcessEvent( eevent );
-
+
wxNcPaintEvent eventNc( GetId() );
eventNc.SetEventObject( this );
GetEventHandler()->ProcessEvent( eventNc );
GetEventHandler()->ProcessEvent(event);
}
}
-
+
// now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
-
+
RgnHandle childupdate = NewRgn() ;
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
// calculate the update region for the child windows by intersecting the window rectangle with our own
// passed in update region and then offset it to be client-wise window coordinates again
- wxWindowMac *child = (wxWindowMac*)node->GetData();
+ wxWindowMac *child = node->GetData();
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 ) ;
}
DisposeRgn( childupdate ) ;
// eventually a draw grow box here
-
+
}
WXHWND wxWindowMac::MacGetRootWindow() const
iter = iter->GetParent() ;
}
- wxASSERT_MSG( 1 , "No valid mac root window" ) ;
+ wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
return NULL ;
}
void wxWindowMac::MacCreateScrollBars( long style )
{
- wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
+ wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->GetData();
+ wxWindowMac *child = node->GetData();
child->MacSuperChangedPosition() ;
node = node->GetNext();
}
wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->GetData();
+ wxWindowMac *child = node->GetData();
child->MacTopLevelWindowChangedPosition() ;
node = node->GetNext();
}
return wxPoint(x, y);
}
-void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
+void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
{
if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
{
// copied from wxGTK : CS
- // generate a "context menu" event: this is similar to wxEVT_RIGHT_UP
+ // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
// except that:
//
// (a) it's a command event and so is propagated to the parent
wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
this->GetId(),
this->ClientToScreen(event.GetPosition()));
- this->GetEventHandler()->ProcessEvent(evtCtx);
+ if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
+ event.Skip() ;
}
else
{
projects / wxWidgets.git / blobdiff