#endif
BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
- EVT_NC_PAINT(wxWindowMac::OnNcPaint)
- EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
- EVT_PAINT(wxWindowMac::OnPaint)
EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
END_EVENT_TABLE()
{
SendDestroyEvent();
- m_isBeingDeleted = true;
-
MacInvalidateBorders() ;
#ifndef __WXUNIVERSAL__
if ( frame )
{
if ( frame->GetLastFocus() == this )
- frame->SetLastFocus((wxWindow*)NULL);
+ frame->SetLastFocus(NULL);
break;
}
}
WXWidget wxWindowMac::GetHandle() const
{
- return (WXWidget) m_peer->GetWXWidget() ;
+ if ( m_peer )
+ return (WXWidget) m_peer->GetWXWidget() ;
+ return NULL;
}
-//
-// TODO END move to window_osx.cpp
-//
-
// ---------------------------------------------------------------------------
// Utility Routines to move between different coordinate systems
// ---------------------------------------------------------------------------
m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
#endif
-#if wxOSX_USE_COCOA_OR_CARBON
wxFont font ;
-#if wxOSX_USE_ATSU_TEXT
- ControlSize size ;
- ThemeFontID themeFont = kThemeSystemFont ;
-
- // we will get that from the settings later
- // and make this NORMAL later, but first
- // we have a few calculations that we must fix
+ wxOSXSystemFont systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
switch ( variant )
{
case wxWINDOW_VARIANT_NORMAL :
- size = kControlSizeNormal;
- themeFont = kThemeSystemFont ;
+ systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
break ;
case wxWINDOW_VARIANT_SMALL :
- size = kControlSizeSmall;
- themeFont = kThemeSmallSystemFont ;
+ systemFont = wxOSX_SYSTEM_FONT_SMALL ;
break ;
case wxWINDOW_VARIANT_MINI :
- // not always defined in the headers
- size = 3 ;
- themeFont = 109 ;
+ systemFont = wxOSX_SYSTEM_FONT_MINI ;
break ;
case wxWINDOW_VARIANT_LARGE :
- size = kControlSizeLarge;
- themeFont = kThemeSystemFont ;
+ systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
break ;
default:
break ;
}
- font.MacCreateFromThemeFont( themeFont ) ;
-#else
- CTFontUIFontType themeFont = kCTFontSystemFontType ;
- switch ( variant )
- {
- case wxWINDOW_VARIANT_NORMAL :
- themeFont = kCTFontSystemFontType;
- break ;
-
- case wxWINDOW_VARIANT_SMALL :
- themeFont = kCTFontSmallSystemFontType;
- break ;
-
- case wxWINDOW_VARIANT_MINI :
- themeFont = kCTFontMiniSystemFontType;
- break ;
-
- case wxWINDOW_VARIANT_LARGE :
- themeFont = kCTFontSystemFontType;
- break ;
-
- default:
- wxFAIL_MSG(_T("unexpected window variant"));
- break ;
- }
- font.MacCreateFromUIFont( themeFont ) ;
-#endif
+ font.CreateSystemFont( systemFont ) ;
SetFont( font ) ;
-#endif
}
void wxWindowMac::MacUpdateControlFont()
return true ;
}
+static bool wxIsWindowOrParentDisabled(wxWindow* w)
+{
+ while (w && !w->IsTopLevel())
+ {
+ if (!w->IsEnabled())
+ return true;
+ w = w->GetParent();
+ }
+ return false;
+}
+
void wxWindowMac::SetFocus()
{
if ( !AcceptsFocus() )
return ;
+ if (wxIsWindowOrParentDisabled((wxWindow*) this))
+ return;
+
wxWindow* former = FindFocus() ;
if ( former == this )
return ;
void wxWindowMac::DoCaptureMouse()
{
wxApp::s_captureWindow = (wxWindow*) this ;
+ m_peer->CaptureMouse() ;
}
wxWindow * wxWindowBase::GetCapture()
void wxWindowMac::DoReleaseMouse()
{
wxApp::s_captureWindow = NULL ;
+
+ m_peer->ReleaseMouse() ;
}
#if wxUSE_DRAG_AND_DROP
x = (int)pos.x;
y = (int)pos.y;
- w = WidthDefault( size.x );
- h = HeightDefault( size.y );
+ w = WidthDefault( size.x );
+ h = HeightDefault( size.y );
x += MacGetLeftBorderSize() ;
y += MacGetTopBorderSize() ;
void wxWindowMac::DoGetPosition(int *x, int *y) const
{
int x1, y1;
-
+
m_peer->GetPosition( x1, y1 ) ;
// get the wx window position from the native one
int innerwidth, innerheight;
int left, top;
int outerwidth, outerheight;
-
+
m_peer->GetContentArea( left, top, innerwidth, innerheight );
m_peer->GetSize( outerwidth, outerheight );
-
- sizeTotal.x += left + (outerwidth-innerwidth);
- sizeTotal.y += top + (outerheight-innerheight);
-
+
+ sizeTotal.x += outerwidth-innerwidth;
+ sizeTotal.y += outerheight-innerheight;
+
sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
int ww, hh;
int left, top;
-
+
m_peer->GetContentArea( left, top, ww, hh );
if (m_hScrollBar && m_hScrollBar->IsShown() )
wxASSERT_MSG( m_cursor.Ok(),
wxT("cursor must be valid after call to the base version"));
- wxWindowMac *mouseWin = 0 ;
-#if wxOSX_USE_CARBON
- {
- wxNonOwnedWindow *tlw = MacGetTopLevelWindow() ;
- WindowRef window = (WindowRef) ( tlw ? tlw->GetWXWindow() : 0 ) ;
-
- ControlPartCode part ;
- ControlRef control ;
- Point pt ;
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
- HIPoint hiPoint ;
- HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
- pt.h = hiPoint.x;
- pt.v = hiPoint.y;
- #else
- GetGlobalMouse( &pt );
- int x = pt.h;
- int y = pt.v;
- ScreenToClient(&x, &y);
- pt.h = x;
- pt.v = y;
-#endif
- control = FindControlUnderMouse( pt , window , &part ) ;
- if ( control )
- mouseWin = wxFindWindowFromWXWidget( (WXWidget) control ) ;
-
- }
-#endif
-
- if ( mouseWin == this && !wxIsBusy() )
- m_cursor.MacInstall() ;
+ if ( GetPeer() != NULL )
+ GetPeer()->SetCursor( m_cursor );
return true ;
}
return ;
int outerBorder = MacGetLeftBorderSize() ;
-#if wxOSX_USE_CARBON
- if ( m_peer->NeedsFocusRect() /* && m_peer->HasFocus() */ )
+
+ if ( m_peer->NeedsFocusRect() )
outerBorder += 4 ;
-#endif
if ( outerBorder == 0 )
return ;
// now we know that we have something to do at all
-
int tx,ty,tw,th;
-
+
m_peer->GetSize( tw, th );
m_peer->GetPosition( tx, ty );
wxRect rightupdate( tx+tw, ty, outerBorder, th );
wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
-
+
if (GetParent()) {
GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
GetParent()->m_peer->SetNeedsDisplay(&rightupdate);
int actualX = x;
int actualY = y;
+#if 0
+ // min and max sizes are only for sizers, not for explicit size setting
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;
+#endif
bool doMove = false, doResize = false ;
MacInvalidateBorders() ;
m_cachedClippedRectValid = false ;
-
+
m_peer->Move( bounds.x, bounds.y, bounds.width, bounds.height);
wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
else
{
wxRect r ;
-
+
m_peer->GetBestRect(&r);
if ( r.GetWidth() == 0 && r.GetHeight() == 0 )
}
}
- int bestWidth = r.width + MacGetLeftBorderSize() +
+ int bestWidth = r.width + MacGetLeftBorderSize() +
MacGetRightBorderSize();
- int bestHeight = r.height + MacGetTopBorderSize() +
+ int bestHeight = r.height + MacGetTopBorderSize() +
MacGetBottomBorderSize();
if ( bestHeight < 10 )
bestHeight = 13 ;
// TODO: REMOVE
MacRepositionScrollBars() ; // we might have a real position shift
+ if (sizeFlags & wxSIZE_FORCE_EVENT)
+ {
+ wxSizeEvent event( wxSize(width,height), GetId() );
+ event.SetEventObject( this );
+ HandleWindowEvent( event );
+ }
+
return;
}
void wxWindowMac::SetLabel(const wxString& title)
{
+ if ( title == m_label )
+ return;
+
m_label = title ;
+ InvalidateBestSize();
+
if ( m_peer && m_peer->IsOk() )
m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
return width;
}
-void wxWindowMac::GetTextExtent(const wxString& str, int *x, int *y,
- int *descent, int *externalLeading, const wxFont *theFont ) const
+void wxWindowMac::DoGetTextExtent(const wxString& str,
+ int *x, int *y,
+ int *descent,
+ int *externalLeading,
+ const wxFont *theFont) const
{
const wxFont *fontToUse = theFont;
wxFont tempFont;
wxDouble h , d , e , w;
ctx->GetTextExtent( str, &w, &h, &d, &e );
-
+
delete ctx;
-
+
if ( externalLeading )
*externalLeading = (wxCoord)(e+0.5);
if ( descent )
if ( !IsShownOnScreen() )
return ;
-
+
m_peer->SetNeedsDisplay( rect ) ;
}
// We really don't move the mouse programmatically under Mac.
}
-void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
-{
- if ( MacGetTopLevelWindow() == NULL )
- return ;
-/*
-#if TARGET_API_MAC_OSX
- if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
- {
- }
- else
-#endif
-*/
- if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )
- {
- event.GetDC()->Clear() ;
- }
- else if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
- {
- // don't skip the event here, custom background means that the app
- // is drawing it itself in its OnPaint(), so don't draw it at all
- // now to avoid flicker
- }
- else
- {
- event.Skip() ;
- }
-}
-
-void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
-{
- event.Skip() ;
-}
-
int wxWindowMac::GetScrollPos(int orient) const
{
if ( orient == wxHORIZONTAL )
wxASSERT( cgContext ) ;
int tx,ty,tw,th;
-
+
m_peer->GetSize( tw, th );
m_peer->GetPosition( tx, ty );
int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
- CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
CGContextSaveGState( cgContext );
if ( m_backgroundColour.Ok() )
// back to the surrounding frame rectangle
int tx,ty,tw,th;
-
+
m_peer->GetSize( tw, th );
m_peer->GetPosition( tx, ty );
CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
rect.bottom - rect.top ) ;
- HIThemeFrameDrawInfo info ;
- memset( &info, 0 , sizeof(info) ) ;
-
- info.version = 0 ;
- info.kind = 0 ;
- info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
- info.isFocused = hasFocus ;
-
CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
wxASSERT( cgContext ) ;
- if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
- {
- info.kind = kHIThemeFrameTextFieldSquare ;
- HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
- }
- else if ( HasFlag(wxSIMPLE_BORDER) )
+ if ( m_peer->NeedsFrame() )
{
- info.kind = kHIThemeFrameListBox ;
- HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+ HIThemeFrameDrawInfo info ;
+ memset( &info, 0 , sizeof(info) ) ;
+
+ info.version = 0 ;
+ info.kind = 0 ;
+ info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+ info.isFocused = hasFocus ;
+
+ if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+ {
+ info.kind = kHIThemeFrameTextFieldSquare ;
+ HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+ }
+ else if ( HasFlag(wxSIMPLE_BORDER) )
+ {
+ info.kind = kHIThemeFrameListBox ;
+ HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+ }
}
- else if ( hasFocus )
+
+ if ( hasFocus )
{
HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
}
-#if 0 // TODO REMOVE now done in a separate call earlier in drawing the window itself
- m_peer->GetRect( &rect ) ;
- if ( MacHasScrollBarCorner() )
- {
- int variant = (m_hScrollBar == NULL ? m_vScrollBar : m_hScrollBar ) ->GetWindowVariant();
- int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
- CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
- CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
- HIThemeGrowBoxDrawInfo info ;
- memset( &info, 0, sizeof(info) ) ;
- info.version = 0 ;
- info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
- info.kind = kHIThemeGrowBoxKindNone ;
- // contrary to the docs ...SizeSmall does not work
- info.size = kHIThemeGrowBoxSizeNormal ;
- info.direction = 0 ;
- HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
- }
-#endif
}
#endif // wxOSX_USE_COCOA_OR_CARBON
}
}
}
-// Get the window with the focus
wxWindow *wxWindowBase::DoFindFocus()
{
-#if wxOSX_USE_CARBON
- ControlRef control ;
- GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
- return wxFindWindowFromWXWidget( (WXWidget) control ) ;
-#else
- return NULL;
-#endif
+ return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());
}
void wxWindowMac::OnInternalIdle()
Rect rIncludingOuterStructures ;
int tx,ty,tw,th;
-
+
m_peer->GetSize( tw, th );
m_peer->GetPosition( tx, ty );
/*
This function must not change the updatergn !
*/
-bool wxWindowMac::MacDoRedraw( void* updatergnr , long time )
+bool wxWindowMac::MacDoRedraw( long time )
{
bool handled = false ;
-#if wxOSX_USE_CARBON
- Rect updatebounds ;
- RgnHandle updatergn = (RgnHandle) updatergnr ;
- GetRegionBounds( updatergn , &updatebounds ) ;
- // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+ wxRegion formerUpdateRgn = m_updateRegion;
+ wxRegion clientUpdateRgn = formerUpdateRgn;
- if ( !EmptyRgn(updatergn) )
+ const wxRect clientRect = GetClientRect();
+
+ clientUpdateRgn.Intersect(clientRect);
+
+ // first send an erase event to the entire update area
+ const wxBackgroundStyle bgStyle = GetBackgroundStyle();
+ switch ( bgStyle )
{
- 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 , updatergn , newupdate ) ;
+ case wxBG_STYLE_ERASE:
+ case wxBG_STYLE_SYSTEM:
+ {
+ // for the toplevel window this really is the entire area for
+ // all the others only their client area, otherwise they might
+ // be drawing with full alpha and eg put blue into the grow-box
+ // area of a scrolled window (scroll sample)
+ wxWindowDC dc(this);
+ if ( IsTopLevel() )
+ dc.SetDeviceClippingRegion(formerUpdateRgn);
+ else
+ dc.SetDeviceClippingRegion(clientUpdateRgn);
- // first send an erase event to the entire update area
- {
- // for the toplevel window this really is the entire area
- // for all the others only their client area, otherwise they
- // might be drawing with full alpha and eg put blue into
- // the grow-box area of a scrolled window (scroll sample)
- wxDC* dc = new wxWindowDC(this);
- if ( IsTopLevel() )
- dc->SetDeviceClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));
- else
- dc->SetDeviceClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));
+ if ( bgStyle == wxBG_STYLE_ERASE )
+ {
+ wxEraseEvent eevent( GetId(), &dc );
+ eevent.SetEventObject( this );
+ if ( ProcessWindowEvent( eevent ) )
+ break;
+ }
- wxEraseEvent eevent( GetId(), dc );
- eevent.SetEventObject( this );
- HandleWindowEvent( eevent );
- delete dc ;
- }
+ if ( UseBgCol() )
+ {
+ dc.SetBackground(GetBackgroundColour());
+ dc.Clear();
+ }
+ }
+ break;
- MacPaintGrowBox();
+ case wxBG_STYLE_PAINT:
+ // nothing to do, user-defined EVT_PAINT handler will overwrite the
+ // entire window client area
+ break;
- // calculate a client-origin version of the update rgn and set m_updateRegion to that
- OffsetRgn( newupdate , -origin.x , -origin.y ) ;
- m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;
- DisposeRgn( newupdate ) ;
+ default:
+ wxFAIL_MSG( "unsupported background style" );
+ }
- if ( !m_updateRegion.Empty() )
- {
- // paint the window itself
+ MacPaintGrowBox();
- wxPaintEvent event;
- event.SetTimestamp(time);
- event.SetEventObject(this);
- HandleWindowEvent(event);
- handled = true ;
- }
+ // calculate a client-origin version of the update rgn and set
+ // m_updateRegion to that
+ clientUpdateRgn.Offset(-clientRect.GetPosition());
+ m_updateRegion = clientUpdateRgn ;
- // now we cannot rely on having its borders drawn by a window itself, as it does not
- // get the updateRgn wide enough to always do so, so we do it from the parent
- // this would also be the place to draw any custom backgrounds for native controls
- // in Composited windowing
- wxPoint clientOrigin = GetClientAreaOrigin() ;
+ if ( !m_updateRegion.Empty() )
+ {
+ // paint the window itself
+
+ wxPaintEvent event(GetId());
+ event.SetTimestamp(time);
+ event.SetEventObject(this);
+ handled = HandleWindowEvent(event);
+ }
- wxWindowMac *child;
- int x, y, w, h;
- for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+ m_updateRegion = formerUpdateRgn;
+ return handled;
+}
+
+void wxWindowMac::MacPaintChildrenBorders()
+{
+ // now we cannot rely on having its borders drawn by a window itself, as it does not
+ // get the updateRgn wide enough to always do so, so we do it from the parent
+ // this would also be the place to draw any custom backgrounds for native controls
+ // in Composited windowing
+ wxPoint clientOrigin = GetClientAreaOrigin() ;
+
+ wxWindowMac *child;
+ int x, y, w, h;
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+ {
+ child = node->GetData();
+ if (child == NULL)
+ continue;
+ if (child == m_vScrollBar)
+ continue;
+ if (child == m_hScrollBar)
+ continue;
+ if (child->IsTopLevel())
+ continue;
+ if (!child->IsShown())
+ continue;
+
+ // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
+
+ child->GetPosition( &x, &y );
+ child->GetSize( &w, &h );
+
+ if ( m_updateRegion.Contains(clientOrigin.x+x-10, clientOrigin.y+y-10, w+20, h+20) )
{
- child = node->GetData();
- if (child == NULL)
- continue;
- if (child == m_vScrollBar)
- continue;
- if (child == m_hScrollBar)
- continue;
- if (child->IsTopLevel())
- continue;
- if (!child->IsShown())
- continue;
-
- // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
-
- child->GetPosition( &x, &y );
- child->GetSize( &w, &h );
- Rect childRect = { y , x , y + h , x + w } ;
- OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
- InsetRect( &childRect , -10 , -10) ;
-
- if ( RectInRgn( &childRect , updatergn ) )
+ // paint custom borders
+ wxNcPaintEvent eventNc( child->GetId() );
+ eventNc.SetEventObject( child );
+ if ( !child->HandleWindowEvent( eventNc ) )
{
- // paint custom borders
- wxNcPaintEvent eventNc( child->GetId() );
- eventNc.SetEventObject( child );
- if ( !child->HandleWindowEvent( eventNc ) )
- {
- child->MacPaintBorders(0, 0) ;
- }
+ child->MacPaintBorders(0, 0) ;
}
}
}
-#endif
- return handled ;
}
WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
{
- wxNonOwnedWindow* tlw = MacGetTopLevelWindow();
+ wxNonOwnedWindow* tlw = MacGetTopLevelWindow();
return tlw ? tlw->GetWXWindow() : NULL ;
}
bool wxWindowMac::AcceptsFocus() const
{
- return m_peer->CanFocus() && wxWindowBase::AcceptsFocus();
+ if ( MacIsUserPane() )
+ return wxWindowBase::AcceptsFocus();
+ else
+ return m_peer->CanFocus();
}
void wxWindowMac::MacSuperChangedPosition()
SInt32 border = 0 ;
- if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
+ if ( m_peer && m_peer->NeedsFrame() )
{
+ if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
+ {
#if wxOSX_USE_COCOA_OR_CARBON
- // this metric is only the 'outset' outside the simple frame rect
- GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
- border += 1;
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+ border += 1;
#else
- border += 2;
+ border += 2;
#endif
- }
- else if (HasFlag(wxSIMPLE_BORDER))
- {
+ }
+ else if (HasFlag(wxSIMPLE_BORDER))
+ {
#if wxOSX_USE_COCOA_OR_CARBON
- // this metric is only the 'outset' outside the simple frame rect
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
- border += 1;
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+ border += 1;
#else
- border += 1;
+ border += 1;
#endif
+ }
}
return border ;
}
}
-void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )
-{
-#if wxOSX_USE_COCOA_OR_CARBON
- // for native controls: call their native paint method
- if ( !MacIsUserPane() || ( IsTopLevel() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) )
- {
- if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
- && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
- CallNextEventHandler(
- (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
- (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
- }
-#endif
-}
-
-void wxWindowMac::MacHandleControlClick(WXWidget WXUNUSED(control),
- wxInt16 WXUNUSED(controlpart),
- bool WXUNUSED(mouseStillDown))
+void wxWindowMac::TriggerScrollEvent( wxEventType WXUNUSED(scrollEvent) )
{
}
return bounds ;
}
-bool wxWindowMac::HandleClicked( double timestampsec )
+bool wxWindowMac::OSXHandleClicked( double WXUNUSED(timestampsec) )
{
return false;
}
wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
{
#if wxOSX_USE_COCOA_OR_CARBON
- if ( HandleClicked( GetEventTime((EventRef)event) ) )
+ if ( OSXHandleClicked( GetEventTime((EventRef)event) ) )
return noErr;
-
+
return eventNotHandledErr ;
#else
return 0;
return wxWindowBase::IsShownOnScreen();
}
+bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
+{
+ bool handled = HandleWindowEvent( event ) ;
+ if ( handled && event.GetSkipped() )
+ handled = false ;
+
+#if wxUSE_ACCEL
+ if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)
+ {
+ wxWindow *ancestor = this;
+ while (ancestor)
+ {
+ int command = ancestor->GetAcceleratorTable()->GetCommand( event );
+ if (command != -1)
+ {
+ wxEvtHandler * const handler = ancestor->GetEventHandler();
+
+ wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+ handled = handler->ProcessEvent( command_event );
+
+ if ( !handled )
+ {
+ // accelerators can also be used with buttons, try them too
+ command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+ handled = handler->ProcessEvent( command_event );
+ }
+
+ break;
+ }
+
+ if (ancestor->IsTopLevel())
+ break;
+
+ ancestor = ancestor->GetParent();
+ }
+ }
+#endif // wxUSE_ACCEL
+
+ return handled ;
+}
+
//
-// wxWidgetImpl
+// wxWidgetImpl
//
WX_DECLARE_HASH_MAP(WXWidget, wxWidgetImpl*, wxPointerHash, wxPointerEqual, MacControlMap);
wxWidgetImpl* impl = wxWidgetImpl::FindFromWXWidget( inControl );
if ( impl )
return impl->GetWXPeer();
-
+
return NULL;
}
m_isRootControl = false;
m_wxPeer = NULL;
m_needsFocusRect = false;
+ m_needsFrame = true;
}
void wxWidgetImpl::SetNeedsFocusRect( bool needs )
return m_needsFocusRect;
}
+void wxWidgetImpl::SetNeedsFrame( bool needs )
+{
+ m_needsFrame = needs;
+}
+
+bool wxWidgetImpl::NeedsFrame() const
+{
+ return m_needsFrame;
+}
projects / wxWidgets.git / blobdiff