/////////////////////////////////////////////////////////////////////////////
-// Name: windows.cpp
+// Name: src/mac/carbon/window.cpp
// Purpose: wxWindowMac
// Author: Stefan Csomor
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "window.h"
-#endif
-
#include "wx/wxprec.h"
#include "wx/menu.h"
#if wxUSE_CARET
#include "wx/caret.h"
-#endif // wxUSE_CARET
+#endif
#define MAC_SCROLLBAR_SIZE 15
#define MAC_SMALL_SCROLLBAR_SIZE 11
#include "wx/mac/uma.h"
+
#ifndef __DARWIN__
#include <Windows.h>
#include <ToolUtils.h>
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
-#else // __WXMAC__
+#else
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif // __WXUNIVERSAL__/__WXMAC__
-
-#if !USE_SHARED_LIBRARY
+#endif
BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
EVT_NC_PAINT(wxWindowMac::OnNcPaint)
EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
END_EVENT_TABLE()
-#endif
-
#define wxMAC_DEBUG_REDRAW 0
#ifndef wxMAC_DEBUG_REDRAW
#define wxMAC_DEBUG_REDRAW 0
OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ;
}
-
// ---------------------------------------------------------------------------
// Carbon Events
// ---------------------------------------------------------------------------
#if TARGET_API_MAC_OSX
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3
-enum {
- kEventControlVisibilityChanged = 157
+enum
+{
+ kEventControlVisibilityChanged = 157
};
#endif
static const EventTypeSpec eventList[] =
{
{ kEventClassControl , kEventControlHit } ,
+
#if TARGET_API_MAC_OSX
{ kEventClassControl , kEventControlDraw } ,
{ kEventClassControl , kEventControlVisibilityChanged } ,
{ kEventClassService , kEventServiceCopy },
{ kEventClassService , kEventServicePaste },
- // { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
-// { kEventClassControl , kEventControlBoundsChanged } ,
+// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
+// { kEventClassControl , kEventControlBoundsChanged } ,
#endif
} ;
cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
- switch( GetEventKind( event ) )
+ switch ( GetEventKind( event ) )
{
#if TARGET_API_MAC_OSX
case kEventControlDraw :
RgnHandle updateRgn = NULL ;
RgnHandle allocatedRgn = NULL ;
wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+ Rect controlBounds ;
+
+ if ( ! thisWindow->GetPeer()->IsCompositing() )
+ {
+ if ( thisWindow->GetPeer()->IsRootControl() )
+ thisWindow->GetPeer()->GetRect( &controlBounds ) ;
+ else
+ GetControlBounds( thisWindow->GetPeer()->GetControlRef() , &controlBounds ) ;
+ }
+
if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
{
updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
}
else
{
- if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
+ if ( ! thisWindow->GetPeer()->IsCompositing() )
{
allocatedRgn = NewRgn() ;
CopyRgn( updateRgn , allocatedRgn ) ;
+ OffsetRgn( allocatedRgn , -controlBounds.left , -controlBounds.top ) ;
+
// hide the given region by the new region that must be shifted
wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
updateRgn = allocatedRgn ;
}
+ else
+ {
+ if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
+ {
+ // as this update region is in native window locals we must adapt it to wx window local
+ allocatedRgn = NewRgn() ;
+ CopyRgn( updateRgn , allocatedRgn ) ;
+
+ // hide the given region by the new region that must be shifted
+ wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
+ updateRgn = allocatedRgn ;
+ }
+ }
}
-#if 0
- // in case we would need a coregraphics compliant background erase first
- // now usable to track redraws
+ Rect rgnBounds ;
+ GetRegionBounds( updateRgn , &rgnBounds ) ;
+
+#if wxMAC_DEBUG_REDRAW
if ( thisWindow->MacIsUserPane() )
{
- CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
static float color = 0.5 ;
static channel = 0 ;
- HIRect bounds;
- HIViewGetBounds( controlRef, &bounds );
+ HIRect bounds;
+ CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+
+ HIViewGetBounds( controlRef, &bounds );
CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 ,
channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 );
CGContextFillRect( cgContext, bounds );
}
}
#endif
+
{
#if wxMAC_USE_CORE_GRAPHICS
- CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+ bool created = false ;
+ CGContextRef cgContext = NULL ;
+ if ( cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) != noErr )
+ {
+ wxASSERT( thisWindow->GetPeer()->IsCompositing() == false ) ;
+
+ // this parameter is not provided on non-composited windows
+ created = true ;
+
+ // rest of the code expects this to be already transformed and clipped for local
+ CGrafPtr port = GetWindowPort( (WindowRef) thisWindow->MacGetTopLevelWindowRef() ) ;
+ Rect bounds ;
+ GetPortBounds( port , &bounds ) ;
+ CreateCGContextForPort( port , &cgContext ) ;
+
+ wxMacWindowToNative( thisWindow , updateRgn ) ;
+ OffsetRgn( updateRgn , controlBounds.left , controlBounds.top ) ;
+ ClipCGContextToRegion( cgContext , &bounds , updateRgn ) ;
+ wxMacNativeToWindow( thisWindow , updateRgn ) ;
+ OffsetRgn( updateRgn , -controlBounds.left , -controlBounds.top ) ;
+
+ CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ;
+ CGContextScaleCTM( cgContext , 1 , -1 ) ;
+
+ CGContextTranslateCTM( cgContext , controlBounds.left , controlBounds.top ) ;
+
+#if 0
+ CGContextSetRGBFillColor( cgContext , 1.0 , 1.0 , 1.0 , 1.0 ) ;
+ CGContextFillRect( cgContext ,
+ CGRectMake( 0 , 0 ,
+ controlBounds.right - controlBounds.left ,
+ controlBounds.bottom - controlBounds.top ) );
+#endif
+ }
+
thisWindow->MacSetCGContextRef( cgContext ) ;
- wxMacCGContextStateSaver sg( cgContext ) ;
+
+ {
+ wxMacCGContextStateSaver sg( cgContext ) ;
#endif
- if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
- result = noErr ;
+ if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
+ result = noErr ;
+
#if wxMAC_USE_CORE_GRAPHICS
- thisWindow->MacSetCGContextRef( NULL ) ;
+ thisWindow->MacSetCGContextRef( NULL ) ;
+ }
+
+ if ( created )
+ CGContextRelease( cgContext ) ;
#endif
}
+
if ( allocatedRgn )
DisposeRgn( allocatedRgn ) ;
}
break ;
+
case kEventControlVisibilityChanged :
- thisWindow->MacVisibilityChanged() ;
+ thisWindow->MacVisibilityChanged() ;
break ;
+
case kEventControlEnabledStateChanged :
- thisWindow->MacEnabledStateChanged() ;
+ thisWindow->MacEnabledStateChanged() ;
break ;
+
case kEventControlHiliteChanged :
- thisWindow->MacHiliteChanged() ;
+ thisWindow->MacHiliteChanged() ;
break ;
#endif
+
// we emulate this event under Carbon CFM
case kEventControlSetFocusPart :
{
Boolean focusEverything = false ;
ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+
#ifdef __WXMAC_OSX__
if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
{
}
#endif
+
if ( controlPart == kControlFocusNoPart )
{
- #if wxUSE_CARET
+#if wxUSE_CARET
if ( thisWindow->GetCaret() )
- {
thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+ static bool inKillFocusEvent = false ;
+
+ if ( !inKillFocusEvent )
+ {
+ inKillFocusEvent = true ;
+ wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->GetEventHandler()->ProcessEvent(event) ;
+ inKillFocusEvent = false ;
}
- #endif // wxUSE_CARET
- wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
- event.SetEventObject(thisWindow);
- thisWindow->GetEventHandler()->ProcessEvent(event) ;
}
else
{
wxChildFocusEvent eventFocus(thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
- #if wxUSE_CARET
+#if wxUSE_CARET
if ( thisWindow->GetCaret() )
- {
thisWindow->GetCaret()->OnSetFocus();
- }
- #endif // wxUSE_CARET
+#endif
wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
event.SetEventObject(thisWindow);
thisWindow->GetEventHandler()->ProcessEvent(event) ;
}
+
if ( thisWindow->MacIsUserPane() )
result = noErr ;
}
break ;
+
case kEventControlHit :
- {
- result = thisWindow->MacControlHit( handler , event ) ;
- }
+ result = thisWindow->MacControlHit( handler , event ) ;
break ;
+
default :
break ;
}
+
return result ;
}
wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
- switch( GetEventKind( event ) )
+ switch ( GetEventKind( event ) )
{
case kEventServiceGetTypes :
- if( textCtrl )
+ if ( textCtrl )
{
long from, to ;
textCtrl->GetSelection( &from , &to ) ;
CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;
- if( from != to )
+ if ( from != to )
copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ;
if ( textCtrl->IsEditable() )
pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ;
- static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt' , 'PICT', 'MooV', 'AIFF' */ };
+ static const OSType textDataTypes[] = { kTXNTextData /* , 'utxt', 'PICT', 'MooV', 'AIFF' */ };
for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i )
{
CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]);
if ( typestring )
{
if ( copyTypes )
- CFArrayAppendValue (copyTypes, typestring) ;
+ CFArrayAppendValue(copyTypes, typestring) ;
if ( pasteTypes )
- CFArrayAppendValue (pasteTypes, typestring) ;
+ CFArrayAppendValue(pasteTypes, typestring) ;
+
CFRelease( typestring ) ;
}
}
+
result = noErr ;
}
break ;
+
case kEventServiceCopy :
if ( textCtrl )
{
long from, to ;
+
textCtrl->GetSelection( &from , &to ) ;
wxString val = textCtrl->GetValue() ;
val = val.Mid( from , to - from ) ;
ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
verify_noerr( ClearScrap( &scrapRef ) ) ;
- verify_noerr( PutScrapFlavor( scrapRef , kTXNTextData , 0 , val.Length() , val.c_str() ) ) ;
+ verify_noerr( PutScrapFlavor( scrapRef , kTXNTextData , 0 , val.length() , val.c_str() ) ) ;
result = noErr ;
}
break ;
+
case kEventServicePaste :
if ( textCtrl )
{
ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
Size textSize, pastedSize ;
- verify_noerr( GetScrapFlavorSize (scrapRef, kTXNTextData, &textSize) ) ;
+ verify_noerr( GetScrapFlavorSize(scrapRef, kTXNTextData, &textSize) ) ;
textSize++ ;
char *content = new char[textSize] ;
- GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content );
- content[textSize-1] = 0 ;
+ GetScrapFlavorData(scrapRef, kTXNTextData, &pastedSize, content );
+ content[textSize - 1] = 0 ;
+
#if wxUSE_UNICODE
- textCtrl->WriteText( wxString( content , wxConvLocal ) );
+ textCtrl->WriteText( wxString( content , wxConvLocal ) );
#else
textCtrl->WriteText( wxString( content ) ) ;
#endif
+
delete[] content ;
result = noErr ;
}
break ;
+
+ default:
+ break ;
}
return result ;
case kEventClassControl :
result = wxMacWindowControlEventHandler( handler, event, data ) ;
break ;
+
case kEventClassService :
result = wxMacWindowServiceEventHandler( handler, event , data ) ;
+ break ;
+
default :
break ;
}
+
wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+
return result ;
}
if ( win )
win->MacControlUserPaneDrawProc(part) ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneDrawUPP , wxMacControlUserPaneDrawProc ) ;
static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
{
else
return kControlNoPart ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneHitTestUPP , wxMacControlUserPaneHitTestProc ) ;
static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)
{
else
return kControlNoPart ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneTrackingUPP , wxMacControlUserPaneTrackingProc ) ;
static pascal void wxMacControlUserPaneIdleProc(ControlRef control)
{
if ( win )
win->MacControlUserPaneIdleProc() ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneIdleUPP , wxMacControlUserPaneIdleProc ) ;
static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
{
else
return kControlNoPart ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneKeyDownUPP , wxMacControlUserPaneKeyDownProc ) ;
static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
{
if ( win )
win->MacControlUserPaneActivateProc(activating) ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneActivateUPP , wxMacControlUserPaneActivateProc ) ;
static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
{
else
return kControlNoPart ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneFocusUPP , wxMacControlUserPaneFocusProc ) ;
static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
{
if ( win )
win->MacControlUserPaneBackgroundProc(info) ;
}
+wxMAC_DEFINE_PROC_GETTER( ControlUserPaneBackgroundUPP , wxMacControlUserPaneBackgroundProc ) ;
void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
{
+ int x = 0 , y = 0;
RgnHandle rgn = NewRgn() ;
GetClip( rgn ) ;
+ MacWindowToRootWindow( &x, &y ) ;
+ OffsetRgn( rgn , -x , -y ) ;
wxMacWindowStateSaver sv( this ) ;
SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ;
MacDoRedraw( rgn , 0 ) ;
wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)
{
- return kControlNoPart ;
+ if ( AcceptsFocus() )
+ return 1 ;
+ else
+ return kControlNoPart ;
}
void wxWindowMac::MacControlUserPaneBackgroundProc(void* info)
{
}
-ControlUserPaneDrawUPP gControlUserPaneDrawUPP = NULL ;
-ControlUserPaneHitTestUPP gControlUserPaneHitTestUPP = NULL ;
-ControlUserPaneTrackingUPP gControlUserPaneTrackingUPP = NULL ;
-ControlUserPaneIdleUPP gControlUserPaneIdleUPP = NULL ;
-ControlUserPaneKeyDownUPP gControlUserPaneKeyDownUPP = NULL ;
-ControlUserPaneActivateUPP gControlUserPaneActivateUPP = NULL ;
-ControlUserPaneFocusUPP gControlUserPaneFocusUPP = NULL ;
-ControlUserPaneBackgroundUPP gControlUserPaneBackgroundUPP = NULL ;
-
#endif
-// ===========================================================================
-// implementation
-// ===========================================================================
-
-#if KEY_wxList_DEPRECATED
-wxList wxWinMacControlList(wxKEY_INTEGER);
-
-wxWindow *wxFindControlFromMacControl(ControlRef inControl )
-{
- wxNode *node = wxWinMacControlList.Find((long)inControl);
- if (!node)
- return NULL;
- return (wxControl *)node->GetData();
-}
+// ---------------------------------------------------------------------------
+// Scrollbar Tracking for all
+// ---------------------------------------------------------------------------
-void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
{
- // adding NULL ControlRef is (first) surely a result of an error and
- // (secondly) breaks native event processing
- wxCHECK_RET( inControl != (ControlRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
-
- if ( !wxWinMacControlList.Find((long)inControl) )
- wxWinMacControlList.Append((long)inControl, control);
+ if ( partCode != 0)
+ {
+ wxWindow* wx = wxFindControlFromMacControl( control ) ;
+ if ( wx )
+ wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
+ }
}
+wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
-void wxRemoveMacControlAssociation(wxWindow *control)
-{
- wxWinMacControlList.DeleteObject(control);
-}
-#else
+// ===========================================================================
+// implementation
+// ===========================================================================
WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
void wxRemoveMacControlAssociation(wxWindow *control)
{
// iterate over all the elements in the class
- MacControlMap::iterator it;
- for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
- {
- if ( it->second == control )
- {
- wxWinMacControlList.erase(it);
- break;
- }
- }
-}
-#endif // deprecated wxList
-
-// UPP functions
-ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
+ // is the iterator stable ? as we might have two associations pointing to the same wxWindow
+ // we should go on...
-ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
-
-// we have to setup the brush in the current port and return noErr
-// or return an error code so that the control manager walks further up the
-// hierarchy to find a correct background
-
-pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor )
-{
- OSStatus status = paramErr ;
- switch( iMessage )
+ bool found = true ;
+ while ( found )
{
- case kControlMsgApplyTextColor :
- break ;
- case kControlMsgSetUpBackground :
+ found = false ;
+ MacControlMap::iterator it;
+ for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
+ {
+ if ( it->second == control )
{
- wxWindow* wx = (wxWindow*) wxFindControlFromMacControl( iControl ) ;
- if ( wx != NULL )
- {
- /*
- const wxBrush &brush = wx->MacGetBackgroundBrush() ;
- if ( brush.Ok() )
- {
- wxDC::MacSetupBackgroundForCurrentPort( brush ) ;
- */
- // this clipping is only needed for non HIView
-
- RgnHandle clip = NewRgn() ;
- int x = 0 , y = 0;
-
- wx->MacWindowToRootWindow( &x,&y ) ;
- CopyRgn( (RgnHandle) wx->MacGetVisibleRegion().GetWXHRGN() , clip ) ;
- OffsetRgn( clip , x , y ) ;
- SetClip( clip ) ;
- DisposeRgn( clip ) ;
-
- status = noErr ;
- /*
- }
- else if ( wx->MacIsUserPane() )
- {
- // if we don't have a valid brush for such a control, we have to call the
- // setup of our parent ourselves
- status = SetUpControlBackground( (ControlRef) wx->GetParent()->GetHandle() , iDepth , iIsColor ) ;
- }
- */
- }
+ wxWinMacControlList.erase(it);
+ found = true ;
+ break;
}
- break ;
- default :
- break ;
- }
- return status ;
-}
-
-
-pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
-pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
-{
- if ( partCode != 0)
- {
- wxWindow* wx = wxFindControlFromMacControl( control ) ;
- if ( wx )
- {
- wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
}
}
}
{
m_peer = NULL ;
m_frozenness = 0 ;
+
#if WXWIN_COMPATIBILITY_2_4
- m_backgroundTransparent = FALSE;
+ m_backgroundTransparent = false;
+#endif
+
+#if wxMAC_USE_CORE_GRAPHICS
+ m_cgContextRef = NULL ;
#endif
// as all windows are created with WS_VISIBLE style...
- m_isShown = TRUE;
+ m_isShown = true;
m_hScrollBar = NULL ;
m_vScrollBar = NULL ;
m_macBackgroundBrush = wxNullBrush ;
- m_macIsUserPane = TRUE;
-#if wxMAC_USE_CORE_GRAPHICS
- m_cgContextRef = NULL ;
-#endif
- // make sure all proc ptrs are available
-
-#if !TARGET_API_MAC_OSX
- if ( gControlUserPaneDrawUPP == NULL )
- {
- gControlUserPaneDrawUPP = NewControlUserPaneDrawUPP( wxMacControlUserPaneDrawProc ) ;
- gControlUserPaneHitTestUPP = NewControlUserPaneHitTestUPP( wxMacControlUserPaneHitTestProc ) ;
- gControlUserPaneTrackingUPP = NewControlUserPaneTrackingUPP( wxMacControlUserPaneTrackingProc ) ;
- gControlUserPaneIdleUPP = NewControlUserPaneIdleUPP( wxMacControlUserPaneIdleProc ) ;
- gControlUserPaneKeyDownUPP = NewControlUserPaneKeyDownUPP( wxMacControlUserPaneKeyDownProc ) ;
- gControlUserPaneActivateUPP = NewControlUserPaneActivateUPP( wxMacControlUserPaneActivateProc ) ;
- gControlUserPaneFocusUPP = NewControlUserPaneFocusUPP( wxMacControlUserPaneFocusProc ) ;
- gControlUserPaneBackgroundUPP = NewControlUserPaneBackgroundUPP( wxMacControlUserPaneBackgroundProc ) ;
- }
-#endif
- if ( wxMacLiveScrollbarActionUPP == NULL )
- {
- wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
- }
-
- if ( wxMacSetupControlBackgroundUPP == NULL )
- {
- wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
- }
+ m_macIsUserPane = true;
+ m_clipChildren = false ;
+ m_cachedClippedRectValid = false ;
// we need a valid font for the encodings
wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
{
SendDestroyEvent();
- m_isBeingDeleted = TRUE;
+ m_isBeingDeleted = true;
MacInvalidateBorders() ;
if ( frame )
{
if ( frame->GetLastFocus() == this )
- {
frame->SetLastFocus((wxWindow*)NULL);
- }
break;
}
}
if (parent->GetDefaultItem() == (wxButton*) this)
parent->SetDefaultItem(NULL);
}
+
if ( m_peer && m_peer->Ok() )
{
// in case the callback might be called during destruction
wxRemoveMacControlAssociation( this) ;
+ ::RemoveEventHandler( (EventHandlerRef ) m_macControlEventHandler ) ;
// we currently are not using this hook
// ::SetControlColorProc( *m_peer , NULL ) ;
m_peer->Dispose() ;
}
if ( g_MacLastWindow == this )
- {
g_MacLastWindow = NULL ;
- }
wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
if ( frame )
delete m_dropTarget;
m_dropTarget = NULL;
}
-#endif // wxUSE_DRAG_AND_DROP
+#endif
+
delete m_peer ;
}
return (WXWidget) m_peer->GetControlRef() ;
}
-
void wxWindowMac::MacInstallEventHandler( WXWidget control )
{
- wxAssociateControlWithMacControl( (ControlRef) control , this ) ;
- InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(),
+ wxAssociateControlWithMacControl( (ControlRef) control , this ) ;
+ InstallControlEventHandler( (ControlRef)control , GetwxMacWindowEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, this,
(EventHandlerRef *)&m_macControlEventHandler);
+
#if !TARGET_API_MAC_OSX
if ( (ControlRef) control == m_peer->GetControlRef() )
{
- m_peer->SetData<ControlUserPaneDrawUPP>(kControlEntireControl,kControlUserPaneDrawProcTag,&gControlUserPaneDrawUPP) ;
- m_peer->SetData<ControlUserPaneHitTestUPP>(kControlEntireControl,kControlUserPaneHitTestProcTag,&gControlUserPaneHitTestUPP) ;
- m_peer->SetData<ControlUserPaneTrackingUPP>(kControlEntireControl,kControlUserPaneTrackingProcTag,&gControlUserPaneTrackingUPP) ;
- m_peer->SetData<ControlUserPaneIdleUPP>(kControlEntireControl,kControlUserPaneIdleProcTag,&gControlUserPaneIdleUPP) ;
- m_peer->SetData<ControlUserPaneKeyDownUPP>(kControlEntireControl,kControlUserPaneKeyDownProcTag,&gControlUserPaneKeyDownUPP) ;
- m_peer->SetData<ControlUserPaneActivateUPP>(kControlEntireControl,kControlUserPaneActivateProcTag,&gControlUserPaneActivateUPP) ;
- m_peer->SetData<ControlUserPaneFocusUPP>(kControlEntireControl,kControlUserPaneFocusProcTag,&gControlUserPaneFocusUPP) ;
- m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl,kControlUserPaneBackgroundProcTag,&gControlUserPaneBackgroundUPP) ;
+ m_peer->SetData<ControlUserPaneDrawUPP>(kControlEntireControl, kControlUserPaneDrawProcTag, GetwxMacControlUserPaneDrawProc()) ;
+ m_peer->SetData<ControlUserPaneHitTestUPP>(kControlEntireControl, kControlUserPaneHitTestProcTag, GetwxMacControlUserPaneHitTestProc()) ;
+ m_peer->SetData<ControlUserPaneTrackingUPP>(kControlEntireControl, kControlUserPaneTrackingProcTag, GetwxMacControlUserPaneTrackingProc()) ;
+ m_peer->SetData<ControlUserPaneIdleUPP>(kControlEntireControl, kControlUserPaneIdleProcTag, GetwxMacControlUserPaneIdleProc()) ;
+ m_peer->SetData<ControlUserPaneKeyDownUPP>(kControlEntireControl, kControlUserPaneKeyDownProcTag, GetwxMacControlUserPaneKeyDownProc()) ;
+ m_peer->SetData<ControlUserPaneActivateUPP>(kControlEntireControl, kControlUserPaneActivateProcTag, GetwxMacControlUserPaneActivateProc()) ;
+ m_peer->SetData<ControlUserPaneFocusUPP>(kControlEntireControl, kControlUserPaneFocusProcTag, GetwxMacControlUserPaneFocusProc()) ;
+ m_peer->SetData<ControlUserPaneBackgroundUPP>(kControlEntireControl, kControlUserPaneBackgroundProcTag, GetwxMacControlUserPaneBackgroundProc()) ;
}
#endif
-
}
// Constructor
-bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+bool wxWindowMac::Create(wxWindowMac *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
- wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
+ wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") );
if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+ return false;
m_windowVariant = parent->GetWindowVariant() ;
UInt32 features = 0
| kControlSupportsEmbedding
-// | kControlSupportsLiveFeedback
+ | kControlSupportsLiveFeedback
+ | kControlGetsFocusOnClick
// | kControlHasSpecialBackground
// | kControlSupportsCalcBestRect
-// | kControlHandlesTracking
+ | kControlHandlesTracking
| kControlSupportsFocus
-// | kControlWantsActivate
-// | kControlWantsIdle
- ;
+ | kControlWantsActivate
+ | kControlWantsIdle ;
m_peer = new wxMacControl(this) ;
- ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
+ OSStatus err =::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
+ verify_noerr( err );
-
- MacPostControlCreate(pos,size) ;
+ MacPostControlCreate(pos, size) ;
}
+
#ifndef __WXUNIVERSAL__
// Don't give scrollbars to wxControls unless they ask for them
- if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar))) ||
- (IsKindOf(CLASSINFO(wxControl)) && ( style & wxHSCROLL || style & wxVSCROLL)))
+ if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
+ || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
{
MacCreateScrollBars( style ) ;
}
wxWindowCreateEvent event(this);
GetEventHandler()->AddPendingEvent(event);
- return TRUE;
+ return true;
}
-void wxWindowMac::MacChildAdded()
+void wxWindowMac::MacChildAdded()
{
if ( m_vScrollBar )
- {
m_vScrollBar->Raise() ;
- }
if ( m_hScrollBar )
- {
m_hScrollBar->Raise() ;
- }
-
}
void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
{
wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
- m_peer->SetReference( (long) this ) ;
- GetParent()->AddChild(this);
+ m_peer->SetReference( (long)this ) ;
+ GetParent()->AddChild( this );
MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
// adjust font, controlsize etc
DoSetWindowVariant( m_windowVariant ) ;
-#if !TARGET_API_MAC_OSX
- // eventually we can fix some clipping issues be reactivating this hook
- //if ( m_macIsUserPane )
- // SetControlColorProc( m_peer->GetControlRef() , wxMacSetupControlBackgroundUPP ) ;
-#endif
- m_peer->SetTitle( wxStripMenuCodes(m_label) ) ;
+ m_peer->SetLabel( wxStripMenuCodes(m_label) ) ;
if (!m_macIsUserPane)
- {
SetInitialBestSize(size);
- }
SetCursor( *wxSTANDARD_CURSOR ) ;
}
size = kControlSizeNormal;
themeFont = kThemeSystemFont ;
break ;
+
case wxWINDOW_VARIANT_SMALL :
size = kControlSizeSmall;
themeFont = kThemeSmallSystemFont ;
break ;
+
case wxWINDOW_VARIANT_MINI :
if (UMAGetSystemVersion() >= 0x1030 )
{
themeFont = kThemeSmallSystemFont ;
}
break ;
+
case wxWINDOW_VARIANT_LARGE :
size = kControlSizeLarge;
themeFont = kThemeSystemFont ;
break ;
+
default:
wxFAIL_MSG(_T("unexpected window variant"));
break ;
}
- m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag,&size ) ;
+
+ m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
wxFont font ;
font.MacCreateThemeFont( themeFont ) ;
bool wxWindowMac::SetFont(const wxFont& font)
{
- bool retval = wxWindowBase::SetFont( font ) ;
+ bool retval = wxWindowBase::SetFont( font );
MacUpdateControlFont() ;
bool wxWindowMac::SetForegroundColour(const wxColour& col )
{
- if ( !wxWindowBase::SetForegroundColour(col) )
- return false ;
+ bool retval = wxWindowBase::SetForegroundColour( col );
- MacUpdateControlFont() ;
+ if (retval)
+ MacUpdateControlFont();
- return true ;
+ return retval;
}
bool wxWindowMac::SetBackgroundColour(const wxColour& col )
wxBrush brush ;
wxColour newCol(GetBackgroundColour());
- if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
- {
+
+ if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) )
brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
- }
- else if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
- {
+ else if ( newCol == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
- }
else
- {
brush.SetColour( newCol ) ;
- }
- MacSetBackgroundBrush( brush ) ;
+ MacSetBackgroundBrush( brush ) ;
MacUpdateControlFont() ;
return true ;
// to issue a SetKeyboardFocus event and verify after whether it succeeded, this would risk problems
// in event handlers...
UInt32 features = 0 ;
- m_peer->GetFeatures( & features ) ;
+ m_peer->GetFeatures( &features ) ;
+
return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
}
-
void wxWindowMac::SetFocus()
{
- if ( AcceptsFocus() )
- {
-
- wxWindow* former = FindFocus() ;
- if ( former == this )
+ if ( !AcceptsFocus() )
return ;
- OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
- // as we cannot rely on the control features to find out whether we are in full keyboard mode, we can only
- // leave in case of an error
- if ( err == errCouldntSetFocus )
- return ;
+ wxWindow* former = FindFocus() ;
+ if ( former == this )
+ return ;
+
+ // as we cannot rely on the control features to find out whether we are in full keyboard mode,
+ // we can only leave in case of an error
+ OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
+ if ( err == errCouldntSetFocus )
+ return ;
+
+ SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
#if !TARGET_API_MAC_OSX
- // emulate carbon events when running under carbonlib where they are not natively available
- if ( former )
- {
- EventRef evRef = NULL ;
- verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
- &evRef ) );
+ // emulate carbon events when running under CarbonLib where they are not natively available
+ if ( former )
+ {
+ EventRef evRef = NULL ;
- wxMacCarbonEvent cEvent( evRef ) ;
- cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
- cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;
+ err = MacCreateEvent(
+ NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
+ kEventAttributeUserEvent , &evRef );
+ verify_noerr( err );
- wxMacWindowEventHandler( NULL , evRef , former ) ;
- ReleaseEvent(evRef) ;
- }
- // send new focus event
- {
- EventRef evRef = NULL ;
- verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
- &evRef ) );
+ wxMacCarbonEvent cEvent( evRef ) ;
+ cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) former->GetHandle() ) ;
+ cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNoPart ) ;
- wxMacCarbonEvent cEvent( evRef ) ;
- cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
- cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
+ wxMacWindowEventHandler( NULL , evRef , former ) ;
+ ReleaseEvent( evRef ) ;
+ }
- wxMacWindowEventHandler( NULL , evRef , this ) ;
- ReleaseEvent(evRef) ;
- }
-#endif
+ // send new focus event
+ {
+ EventRef evRef = NULL ;
+
+ err = MacCreateEvent(
+ NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) ,
+ kEventAttributeUserEvent , &evRef );
+ verify_noerr( err );
+
+ wxMacCarbonEvent cEvent( evRef ) ;
+ cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
+ cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
+
+ wxMacWindowEventHandler( NULL , evRef , this ) ;
+ ReleaseEvent( evRef ) ;
}
+#endif
}
-
void wxWindowMac::DoCaptureMouse()
{
- wxTheApp->s_captureWindow = this ;
+ wxApp::s_captureWindow = this ;
}
wxWindow* wxWindowBase::GetCapture()
{
- return wxTheApp->s_captureWindow ;
+ return wxApp::s_captureWindow ;
}
void wxWindowMac::DoReleaseMouse()
{
- wxTheApp->s_captureWindow = NULL ;
+ wxApp::s_captureWindow = NULL ;
}
-#if wxUSE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP
void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
{
- if ( m_dropTarget != 0 ) {
+ if ( m_dropTarget != NULL )
delete m_dropTarget;
- }
m_dropTarget = pDropTarget;
- if ( m_dropTarget != 0 )
+ if ( m_dropTarget != NULL )
{
- // TODO
+ // TODO:
}
}
// Old style file-manager drag&drop
void wxWindowMac::DragAcceptFiles(bool accept)
{
- // TODO
+ // TODO:
}
// Returns the size of the native control. In the case of the toplevel window
void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
int& w, int& h) const
{
- Rect bounds ;
- m_peer->GetRect( &bounds ) ;
-
-
- x = bounds.left ;
- y = bounds.top ;
- w = bounds.right - bounds.left ;
- h = bounds.bottom - bounds.top ;
+ wxFAIL_MSG( wxT("Not currently supported") ) ;
}
// From a wx position / size calculate the appropriate size of the native control
-bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
- const wxSize& size,
- int& x, int& y,
- int& w, int& h , bool adjustOrigin ) const
+bool wxWindowMac::MacGetBoundsForControl(
+ const wxPoint& pos,
+ const wxSize& size,
+ int& x, int& y,
+ int& w, int& h , bool adjustOrigin ) const
{
+ bool isCompositing = MacGetTopLevelWindow()->MacUsesCompositing() ;
+
// the desired size, minus the border pixels gives the correct size of the control
x = (int)pos.x;
y = (int)pos.y;
- // todo the default calls may be used as soon as PostCreateControl Is moved here
- w = size.x ; // WidthDefault( size.x );
- h = size.y ; // HeightDefault( size.y ) ;
-#if !TARGET_API_MAC_OSX
- GetParent()->MacWindowToRootWindow( &x , &y ) ;
-#endif
+
+ // TODO: the default calls may be used as soon as PostCreateControl Is moved here
+ w = wxMax(size.x, 0) ; // WidthDefault( size.x );
+ h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
+
+ if ( !isCompositing )
+ GetParent()->MacWindowToRootWindow( &x , &y ) ;
x += MacGetLeftBorderSize() ;
y += MacGetTopBorderSize() ;
if ( adjustOrigin )
AdjustForParentClientOrigin( x , y ) ;
-#if TARGET_API_MAC_OSX
+
// this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border
- if ( ! GetParent()->IsTopLevel() )
+ if ( !GetParent()->IsTopLevel() )
{
x -= GetParent()->MacGetLeftBorderSize() ;
y -= GetParent()->MacGetTopBorderSize() ;
}
-#endif
+
return true ;
}
// Get window size (not client size)
void wxWindowMac::DoGetSize(int *x, int *y) const
{
- // take the size of the control and add the borders that have to be drawn outside
- int x1 , y1 , w1 , h1 ;
-
- MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
-
- w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
- h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+ Rect bounds ;
+ m_peer->GetRect( &bounds ) ;
- if(x) *x = w1 ;
- if(y) *y = h1 ;
+ if (x)
+ *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ if (y)
+ *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
}
// get the position of the bounds of this window in client coordinates of its parent
void wxWindowMac::DoGetPosition(int *x, int *y) const
{
- int x1 , y1 , w1 ,h1 ;
- MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
+ Rect bounds ;
+ m_peer->GetRect( &bounds ) ;
+
+ int x1 = bounds.left ;
+ int y1 = bounds.top ;
+
+ // get the wx window position from the native one
x1 -= MacGetLeftBorderSize() ;
y1 -= MacGetTopBorderSize() ;
- // to non-client
- #if !TARGET_API_MAC_OSX
- if ( !GetParent()->IsTopLevel() )
- {
- Rect bounds ;
- GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ;
- x1 -= bounds.left ;
- y1 -= bounds.top ;
- }
-#endif
+
if ( !IsTopLevel() )
{
wxWindow *parent = GetParent();
if ( parent )
{
- // we must first adjust it to be in window coordinates of the parent, as otherwise it gets lost by the clientareaorigin fix
+ // we must first adjust it to be in window coordinates of the parent,
+ // as otherwise it gets lost by the ClientAreaOrigin fix
x1 += parent->MacGetLeftBorderSize() ;
y1 += parent->MacGetTopBorderSize() ;
+
// and now to client coordinates
wxPoint pt(parent->GetClientAreaOrigin());
x1 -= pt.x ;
y1 -= pt.y ;
}
}
- if(x) *x = x1 ;
- if(y) *y = y1 ;
+
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
}
void wxWindowMac::DoScreenToClient(int *x, int *y) const
{
WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+ wxCHECK_RET( window , wxT("TopLevel Window missing") ) ;
- wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+ Point localwhere = { 0, 0 } ;
- {
- Point localwhere = {0,0} ;
+ if (x)
+ localwhere.h = *x ;
+ if (y)
+ localwhere.v = *y ;
- if(x) localwhere.h = * x ;
- if(y) localwhere.v = * y ;
+ QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;
- QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;
- if(x) *x = localwhere.h ;
- if(y) *y = localwhere.v ;
+ if (x)
+ *x = localwhere.h ;
+ if (y)
+ *y = localwhere.v ;
- }
MacRootWindowToWindow( x , y ) ;
wxPoint origin = GetClientAreaOrigin() ;
- if(x) *x -= origin.x ;
- if(y) *y -= origin.y ;
+ if (x)
+ *x -= origin.x ;
+ if (y)
+ *y -= origin.y ;
}
void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
- wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+ wxCHECK_RET( window , wxT("TopLevel window missing") ) ;
wxPoint origin = GetClientAreaOrigin() ;
- if(x) *x += origin.x ;
- if(y) *y += origin.y ;
+ if (x)
+ *x += origin.x ;
+ if (y)
+ *y += origin.y ;
MacWindowToRootWindow( x , y ) ;
- {
- Point localwhere = { 0,0 };
- if(x) localwhere.h = * x ;
- if(y) localwhere.v = * y ;
- QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ;
- if(x) *x = localwhere.h ;
- if(y) *y = localwhere.v ;
- }
+ Point localwhere = { 0, 0 };
+ if (x)
+ localwhere.h = *x ;
+ if (y)
+ localwhere.v = *y ;
+
+ QDLocalToGlobalPoint( GetWindowPort( window ) , &localwhere ) ;
+
+ if (x)
+ *x = localwhere.h ;
+ if (y)
+ *y = localwhere.v ;
}
void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
{
wxPoint origin = GetClientAreaOrigin() ;
- if(x) *x += origin.x ;
- if(y) *y += origin.y ;
+ if (x)
+ *x += origin.x ;
+ if (y)
+ *y += origin.y ;
MacWindowToRootWindow( x , y ) ;
}
MacRootWindowToWindow( x , y ) ;
wxPoint origin = GetClientAreaOrigin() ;
- if(x) *x -= origin.x ;
- if(y) *y -= origin.y ;
+ if (x)
+ *x -= origin.x ;
+ if (y)
+ *y -= origin.y ;
}
void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
{
wxPoint pt ;
- if ( x ) pt.x = *x ;
- if ( y ) pt.y = *y ;
+
+ if (x)
+ pt.x = *x ;
+ if (y)
+ pt.y = *y ;
if ( !IsTopLevel() )
{
}
}
- if ( x ) *x = (int) pt.x ;
- if ( y ) *y = (int) pt.y ;
+ if (x)
+ *x = (int) pt.x ;
+ if (y)
+ *y = (int) pt.y ;
}
void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
{
int x1 , y1 ;
- if ( x ) x1 = *x ;
- if ( y ) y1 = *y ;
+
+ if (x)
+ x1 = *x ;
+ if (y)
+ y1 = *y ;
+
MacWindowToRootWindow( &x1 , &y1 ) ;
- if ( x ) *x = x1 ;
- if ( y ) *y = y1 ;
+
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
}
void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
{
wxPoint pt ;
- if ( x ) pt.x = *x ;
- if ( y ) pt.y = *y ;
+
+ if (x)
+ pt.x = *x ;
+ if (y)
+ pt.y = *y ;
if ( !IsTopLevel() )
{
- wxMacControl::Convert( &pt , MacGetTopLevelWindow()->m_peer , m_peer ) ;
- pt.x += MacGetLeftBorderSize() ;
- pt.y += MacGetTopBorderSize() ;
+ wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+ if (top)
+ {
+ wxMacControl::Convert( &pt , top->m_peer , m_peer ) ;
+ pt.x += MacGetLeftBorderSize() ;
+ pt.y += MacGetTopBorderSize() ;
+ }
}
- if ( x ) *x = (int) pt.x ;
- if ( y ) *y = (int) pt.y ;
+ if (x)
+ *x = (int) pt.x ;
+ if (y)
+ *y = (int) pt.y ;
}
void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
{
int x1 , y1 ;
- if ( x ) x1 = *x ;
- if ( y ) y1 = *y ;
+
+ if (x)
+ x1 = *x ;
+ if (y)
+ y1 = *y ;
+
MacRootWindowToWindow( &x1 , &y1 ) ;
- if ( x ) *x = x1 ;
- if ( y ) *y = y1 ;
+
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
}
void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
{
RgnHandle rgn = NewRgn() ;
- Rect content ;
+
if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
+ Rect structure, content ;
+
GetRegionBounds( rgn , &content ) ;
+ m_peer->GetRect( &structure ) ;
+ OffsetRect( &structure, -structure.left , -structure.top ) ;
+
+ left = content.left - structure.left ;
+ top = content.top - structure.top ;
+ right = structure.right - content.right ;
+ bottom = structure.bottom - content.bottom ;
}
else
{
- m_peer->GetRect( &content ) ;
+ left = top = right = bottom = 0 ;
}
+
DisposeRgn( rgn ) ;
- Rect structure ;
- m_peer->GetRect( &structure ) ;
-#if !TARGET_API_MAC_OSX
- OffsetRect( &content , -structure.left , -structure.top ) ;
-#endif
- left = content.left - structure.left ;
- top = content.top - structure.top ;
- right = structure.right - content.right ;
- bottom = structure.bottom - content.bottom ;
}
wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const
wxSize sizeTotal = size;
RgnHandle rgn = NewRgn() ;
-
- Rect content ;
-
if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
+ Rect content, structure ;
GetRegionBounds( rgn , &content ) ;
+ m_peer->GetRect( &structure ) ;
+
+ // structure is in parent coordinates, but we only need width and height, so it's ok
+
+ sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
+ sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top) ;
}
- else
- {
- m_peer->GetRect( &content ) ;
- }
- DisposeRgn( rgn ) ;
- Rect structure ;
- m_peer->GetRect( &structure ) ;
-#if !TARGET_API_MAC_OSX
- OffsetRect( &content , -structure.left , -structure.top ) ;
-#endif
- sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
- sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ;
+ DisposeRgn( rgn ) ;
- sizeTotal.x += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
- sizeTotal.y += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ;
+ sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
return sizeTotal;
}
-
// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindowMac::DoGetClientSize(int *x, int *y) const
+void wxWindowMac::DoGetClientSize( int *x, int *y ) const
{
int ww, hh;
RgnHandle rgn = NewRgn() ;
Rect content ;
if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
- {
GetRegionBounds( rgn , &content ) ;
- }
else
- {
m_peer->GetRect( &content ) ;
- }
DisposeRgn( rgn ) ;
-#if !TARGET_API_MAC_OSX
- Rect structure ;
- m_peer->GetRect( &structure ) ;
- OffsetRect( &content , -structure.left , -structure.top ) ;
-#endif
+
ww = content.right - content.left ;
hh = content.bottom - content.top ;
- /*
- 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 ;
- int h ;
- GetSize( &w , &h ) ;
-
- MacClientToRootWindow( &x1 , &y1 ) ;
- MacClientToRootWindow( &w , &h ) ;
-
- wxWindowMac *iter = (wxWindowMac*)this ;
-
- int totW = 10000 , totH = 10000;
- while( iter )
- {
- if ( iter->IsTopLevel() )
- {
- iter->GetSize( &totW , &totH ) ;
- break ;
- }
-
- iter = iter->GetParent() ;
- }
- if (m_hScrollBar && m_hScrollBar->IsShown() )
- {
- hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ;
- if ( h-y1 >= totH )
- {
- hh += 1 ;
- }
- }
- if (m_vScrollBar && m_vScrollBar->IsShown() )
- {
- ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE;
- if ( w-x1 >= totW )
- {
- ww += 1 ;
- }
- }
- }
- */
if (m_hScrollBar && m_hScrollBar->IsShown() )
- {
- hh -= m_hScrollBar->GetSize().y ; // MAC_SCROLLBAR_SIZE ;
- }
+ hh -= m_hScrollBar->GetSize().y ;
+
if (m_vScrollBar && m_vScrollBar->IsShown() )
- {
- ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE;
- }
- if(x) *x = ww;
- if(y) *y = hh;
+ ww -= m_vScrollBar->GetSize().x ;
+ if (x)
+ *x = ww;
+ if (y)
+ *y = hh;
}
bool wxWindowMac::SetCursor(const wxCursor& cursor)
{
if (m_cursor == cursor)
- return FALSE;
+ return false;
if (wxNullCursor == cursor)
{
if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
- return FALSE ;
+ return false ;
}
else
{
if ( ! wxWindowBase::SetCursor( cursor ) )
- return FALSE ;
+ return false ;
}
wxASSERT_MSG( m_cursor.Ok(),
wxT("cursor must be valid after call to the base version"));
-
wxWindowMac *mouseWin = 0 ;
{
- WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+ wxTopLevelWindowMac *tlw = MacGetTopLevelWindow() ;
+ WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ;
CGrafPtr savePort ;
Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
- // TODO If we ever get a GetCurrentEvent.. replacement for the mouse
- // position, use it...
+ // TODO: If we ever get a GetCurrentEvent... replacement
+ // for the mouse position, use it...
Point pt ;
- GetMouse( &pt ) ;
ControlPartCode part ;
ControlRef control ;
- control = wxMacFindControlUnderMouse( pt , window , &part ) ;
+
+ GetMouse( &pt ) ;
+ control = wxMacFindControlUnderMouse( tlw , pt , window , &part ) ;
if ( control )
mouseWin = wxFindControlFromMacControl( control ) ;
}
if ( mouseWin == this && !wxIsBusy() )
- {
m_cursor.MacInstall() ;
- }
- return TRUE ;
+ return true ;
}
#if wxUSE_MENUS
if ( x == -1 && y == -1 )
{
wxPoint mouse = wxGetMousePosition();
- x = mouse.x; y = mouse.y;
+ x = mouse.x;
+ y = mouse.y;
}
else
{
}
menu->MacBeforeDisplay( true ) ;
- long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
+ long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
if ( HiWord(menuResult) != 0 )
{
MenuCommand id ;
GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
wxMenuItem* item = NULL ;
wxMenu* realmenu ;
- item = menu->FindItem(id, &realmenu) ;
+ item = menu->FindItem( id, &realmenu ) ;
if (item->IsCheckable())
- {
item->Check( !item->IsChecked() ) ;
- }
+
menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
- menu->MacAfterDisplay( true ) ;
- menu->SetInvokingWindow(NULL);
+ menu->MacAfterDisplay( true ) ;
+ menu->SetInvokingWindow( NULL );
- return TRUE;
+ return true;
}
#endif
m_tooltip->SetWindow(this);
}
-#endif // wxUSE_TOOLTIPS
+#endif
-void wxWindowMac::MacInvalidateBorders()
+void wxWindowMac::MacInvalidateBorders()
{
if ( m_peer == NULL )
return ;
bool vis = MacIsReallyShown() ;
if ( !vis )
return ;
-
+
int outerBorder = MacGetLeftBorderSize() ;
if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
outerBorder += 4 ;
if ( outerBorder == 0 )
return ;
-
- // now we know that we have something to do at all
+
+ // now we know that we have something to do at all
// as the borders are drawn on the parent we have to properly invalidate all these areas
- RgnHandle updateInner = NewRgn() ,
- updateOuter = NewRgn() ;
+ RgnHandle updateInner , updateOuter;
+ Rect rect ;
// this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon
- Rect rect ;
+ updateInner = NewRgn() ;
+ updateOuter = NewRgn() ;
+
m_peer->GetRect( &rect ) ;
- RectRgn( updateInner , &rect ) ;
+ RectRgn( updateInner, &rect ) ;
InsetRect( &rect , -outerBorder , -outerBorder ) ;
- RectRgn( updateOuter , &rect ) ;
- DiffRgn( updateOuter , updateInner ,updateOuter ) ;
+ RectRgn( updateOuter, &rect ) ;
+ DiffRgn( updateOuter, updateInner , updateOuter ) ;
+
#ifdef __WXMAC_OSX__
- GetParent()->m_peer->SetNeedsDisplay( true , updateOuter ) ;
+ GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;
#else
WindowRef tlw = (WindowRef) MacGetTopLevelWindowRef() ;
if ( tlw )
InvalWindowRgn( tlw , updateOuter ) ;
#endif
- DisposeRgn(updateOuter) ;
- DisposeRgn(updateInner) ;
-/*
- RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() ;
- RectRgn( updateInner , &rect ) ;
- InsetRect( &rect , -4 , -4 ) ;
- RectRgn( updateOuter , &rect ) ;
- DiffRgn( updateOuter , updateInner ,updateOuter ) ;
- wxPoint parent(0,0);
- GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
- parent -= GetParent()->GetClientAreaOrigin() ;
- OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
- GetParent()->m_peer->SetNeedsDisplay( true , updateOuter ) ;
- DisposeRgn(updateOuter) ;
- DisposeRgn(updateInner) ;
-*/
-/*
- if ( m_peer )
- {
- // deleting a window while it is shown invalidates the region occupied by border or
- // focus
-
- if ( IsShown() && ( outerBorder > 0 ) )
- {
- // as the borders are drawn on the parent we have to properly invalidate all these areas
- RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ;
-
- Rect rect ;
-
- m_peer->GetRect( &rect ) ;
- RectRgn( updateInner , &rect ) ;
- InsetRect( &rect , -outerBorder , -outerBorder ) ;
- RectRgn( updateOuter , &rect ) ;
- DiffRgn( updateOuter , updateInner ,updateOuter ) ;
- wxPoint parent(0,0);
- GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
- parent -= GetParent()->GetClientAreaOrigin() ;
- OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
- CopyRgn( updateOuter , updateTotal ) ;
-
- GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ;
- DisposeRgn(updateOuter) ;
- DisposeRgn(updateInner) ;
- DisposeRgn(updateTotal) ;
- }
- }
-*/
-#if 0
- Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
-
- int outerBorder = MacGetLeftBorderSize() ;
- if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
- outerBorder += 4 ;
-
- if ( vis && ( outerBorder > 0 ) )
- {
- // as the borders are drawn on the parent we have to properly invalidate all these areas
- RgnHandle updateInner = NewRgn() , updateOuter = NewRgn() , updateTotal = NewRgn() ;
-
- Rect rect ;
-
- m_peer->GetRect( &rect ) ;
- RectRgn( updateInner , &rect ) ;
- InsetRect( &rect , -outerBorder , -outerBorder ) ;
- RectRgn( updateOuter , &rect ) ;
- DiffRgn( updateOuter , updateInner ,updateOuter ) ;
- /*
- wxPoint parent(0,0);
-#if TARGET_API_MAC_OSX
- // no offsetting needed when compositing
-#else
- GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
- parent -= GetParent()->GetClientAreaOrigin() ;
- OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
-#endif
- */
- CopyRgn( updateOuter , updateTotal ) ;
-
- rect = r ;
- RectRgn( updateInner , &rect ) ;
- InsetRect( &rect , -outerBorder , -outerBorder ) ;
- RectRgn( updateOuter , &rect ) ;
- DiffRgn( updateOuter , updateInner ,updateOuter ) ;
-/*
- OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
-*/
- UnionRgn( updateOuter , updateTotal , updateTotal ) ;
- GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ;
- DisposeRgn(updateOuter) ;
- DisposeRgn(updateInner) ;
- DisposeRgn(updateTotal) ;
- }
-#endif
+ DisposeRgn( updateOuter ) ;
+ DisposeRgn( updateInner ) ;
}
void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
former_y += pt.y ;
}
- int actualWidth = wxMax( width , 0 ) ;
- int actualHeight = wxMax( height , 0 ) ;
+ int actualWidth = width ;
+ int actualHeight = height ;
int actualX = x;
int actualY = y;
if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
actualWidth = m_maxWidth;
if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
- actualHeight = m_maxHeight;
+ actualHeight = m_maxHeight;
- bool doMove = false ;
- bool doResize = false ;
+ bool doMove = false, doResize = false ;
if ( actualX != former_x || actualY != former_y )
- {
doMove = true ;
- }
+
if ( actualWidth != former_w || actualHeight != former_h )
- {
doResize = true ;
- }
if ( doMove || doResize )
{
- // we don't adjust twice for the origin
- Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
- bool vis = MacIsReallyShown() ;
+ // as the borders are drawn outside the native control, we adjust now
- MacInvalidateBorders() ;
+ wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ),
+ wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
+ actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
- // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
- if ( vis )
- m_peer->SetVisibility( false , true ) ;
+ Rect r ;
+ wxMacRectToNative( &bounds , &r ) ;
+ if ( !GetParent()->IsTopLevel() )
+ wxMacWindowToNative( GetParent() , &r ) ;
+
+ MacInvalidateBorders() ;
+
+ m_cachedClippedRectValid = false ;
m_peer->SetRect( &r ) ;
- if ( vis )
- m_peer->SetVisibility( true , true ) ;
- if ( doMove )
- wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+ wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
MacInvalidateBorders() ;
MacRepositionScrollBars() ;
if ( doMove )
{
- wxPoint point(actualX,actualY);
+ wxPoint point(actualX, actualY);
wxMoveEvent event(point, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event) ;
}
+
if ( doResize )
{
MacRepositionScrollBars() ;
GetEventHandler()->ProcessEvent(event);
}
}
-
}
wxSize wxWindowMac::DoGetBestSize() const
Rect bestsize = { 0 , 0 , 0 , 0 } ;
int bestWidth, bestHeight ;
- m_peer->GetBestRect( &bestsize ) ;
+ m_peer->GetBestRect( &bestsize ) ;
if ( EmptyRect( &bestsize ) )
{
- bestsize.left = bestsize.top = 0 ;
- bestsize.right = 16 ;
+ bestsize.left =
+ bestsize.top = 0 ;
+ bestsize.right =
bestsize.bottom = 16 ;
+
if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
{
bestsize.bottom = 16 ;
}
-#if wxUSE_SPINBTN
+#if wxUSE_SPINBTN
else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
{
bestsize.bottom = 24 ;
}
-#endif // wxUSE_SPINBTN
+#endif
else
{
// return wxWindowBase::DoGetBestSize() ;
return wxSize(bestWidth, bestHeight);
}
-
// set the size of the window: if the dimensions are positive, just use them,
// but if any of them is equal to -1, it means that we must find the value for
// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
{
// get the current size and position...
int currentX, currentY;
- GetPosition(¤tX, ¤tY);
+ int currentW, currentH;
- int currentW,currentH;
+ GetPosition(¤tX, ¤tY);
GetSize(¤tW, ¤tH);
// ... and don't do anything (avoiding flicker) if it's already ok
if ( x == currentX && y == currentY &&
width == currentW && height == currentH && ( height != -1 && width != -1 ) )
{
- // TODO REMOVE
+ // TODO: REMOVE
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;
+ if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
+ {
+ if ( x == wxDefaultCoord )
+ x = currentX;
+ if ( y == wxDefaultCoord )
+ y = currentY;
+ }
- AdjustForParentClientOrigin(x, y, sizeFlags);
+ AdjustForParentClientOrigin( x, y, sizeFlags );
- wxSize size(-1, -1);
- if ( width == -1 )
+ wxSize size = wxDefaultSize;
+ if ( width == wxDefaultCoord )
{
if ( sizeFlags & wxSIZE_AUTO_WIDTH )
{
}
}
- if ( height == -1 )
+ if ( height == wxDefaultCoord )
{
if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
{
- if ( size.x == -1 )
- {
+ if ( size.x == wxDefaultCoord )
size = DoGetBestSize();
- }
- //else: already called DoGetBestSize() above
+ // else: already called DoGetBestSize() above
height = size.y;
}
}
}
- DoMoveWindow(x, y, width, height);
-
+ DoMoveWindow( x, y, width, height );
}
wxPoint wxWindowMac::GetClientAreaOrigin() const
{
RgnHandle rgn = NewRgn() ;
Rect content ;
- m_peer->GetRegion( kControlContentMetaPart , rgn ) ;
- GetRegionBounds( rgn , &content ) ;
- DisposeRgn( rgn ) ;
-#if !TARGET_API_MAC_OSX
- // if the content rgn is empty / not supported
- // don't attempt to correct the coordinates to wxWindow relative ones
- if (!::EmptyRect( &content ) )
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
- Rect structure ;
- m_peer->GetRect( &structure ) ;
- OffsetRect( &content , -structure.left , -structure.top ) ;
+ GetRegionBounds( rgn , &content ) ;
}
-#endif
+ else
+ {
+ content.left =
+ content.top = 0 ;
+ }
+
+ DisposeRgn( rgn ) ;
- return wxPoint( content.left + MacGetLeftBorderSize( ) , content.top + MacGetTopBorderSize( ) );
+ return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() );
}
void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
{
- if ( clientheight != -1 || clientheight != -1 )
+ if ( clientheight != wxDefaultCoord || clientheight != wxDefaultCoord )
{
int currentclientwidth , currentclientheight ;
int currentwidth , currentheight ;
GetClientSize( ¤tclientwidth , ¤tclientheight ) ;
GetSize( ¤twidth , ¤theight ) ;
- DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+ DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth ,
currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
}
}
-void wxWindowMac::SetTitle(const wxString& title)
+void wxWindowMac::SetLabel(const wxString& title)
{
m_label = wxStripMenuCodes(title) ;
if ( m_peer && m_peer->Ok() )
- {
- m_peer->SetTitle( m_label ) ;
- }
+ m_peer->SetLabel( m_label ) ;
+
Refresh() ;
}
-wxString wxWindowMac::GetTitle() const
+wxString wxWindowMac::GetLabel() const
{
return m_label ;
}
{
bool former = MacIsReallyShown() ;
if ( !wxWindowBase::Show(show) )
- return FALSE;
+ return false;
- // TODO use visibilityChanged Carbon Event for OSX
+ // TODO: use visibilityChanged Carbon Event for OSX
if ( m_peer )
- {
m_peer->SetVisibility( show , true ) ;
- }
+
if ( former != MacIsReallyShown() )
MacPropagateVisibilityChanged() ;
- return TRUE;
+
+ return true;
}
bool wxWindowMac::Enable(bool enable)
wxASSERT( m_peer->Ok() ) ;
bool former = MacIsReallyEnabled() ;
if ( !wxWindowBase::Enable(enable) )
- return FALSE;
+ return false;
m_peer->Enable( enable ) ;
if ( former != MacIsReallyEnabled() )
MacPropagateEnabledStateChanged() ;
- return TRUE;
+
+ return true;
}
//
#if !TARGET_API_MAC_OSX
MacVisibilityChanged() ;
+ wxWindowMac *child;
wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = node->GetData();
+ child = node->GetData();
if ( child->IsShown() )
- child->MacPropagateVisibilityChanged( ) ;
+ child->MacPropagateVisibilityChanged() ;
+
node = node->GetNext();
}
#endif
}
-void wxWindowMac::MacPropagateEnabledStateChanged( )
+void wxWindowMac::MacPropagateEnabledStateChanged()
{
#if !TARGET_API_MAC_OSX
MacEnabledStateChanged() ;
+ wxWindowMac *child;
wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = node->GetData();
+ child = node->GetData();
if ( child->IsEnabled() )
child->MacPropagateEnabledStateChanged() ;
+
node = node->GetNext();
}
#endif
}
-void wxWindowMac::MacPropagateHiliteChanged( )
+void wxWindowMac::MacPropagateHiliteChanged()
{
#if !TARGET_API_MAC_OSX
MacHiliteChanged() ;
+ wxWindowMac *child;
wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = node->GetData();
- // if ( child->IsEnabled() )
+ child = node->GetData();
+ if (child /* && child->IsEnabled() */)
child->MacPropagateHiliteChanged() ;
+
node = node->GetNext();
}
#endif
// only under OSX the visibility of the TLW is taken into account
if ( m_isBeingDeleted )
return false ;
-
+
#if TARGET_API_MAC_OSX
if ( m_peer && m_peer->Ok() )
return m_peer->IsVisible();
#endif
+
wxWindow* win = this ;
- while( win->IsShown() )
+ while ( win->IsShown() )
{
if ( win->IsTopLevel() )
return true ;
win = win->GetParent() ;
if ( win == NULL )
return true ;
+ }
- } ;
return false ;
}
#endif
}
-//
-//
-//
-
int wxWindowMac::GetCharHeight() const
{
- wxClientDC dc ( (wxWindowMac*)this ) ;
+ wxClientDC dc( (wxWindowMac*)this ) ;
+
return dc.GetCharHeight() ;
}
int wxWindowMac::GetCharWidth() const
{
- wxClientDC dc ( (wxWindowMac*)this ) ;
+ wxClientDC dc( (wxWindowMac*)this ) ;
+
return dc.GetCharWidth() ;
}
if ( m_peer == NULL )
return ;
-#if TARGET_API_MAC_OSX
- if ( rect == NULL )
- m_peer->SetNeedsDisplay( true ) ;
- else
- {
- RgnHandle update = NewRgn() ;
- SetRectRgn( update , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;
- SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , update , update ) ;
- wxPoint origin = GetClientAreaOrigin() ;
- OffsetRgn( update, origin.x , origin.y ) ;
- // right now this is wx' window coordinates, as our native peer does not have borders, this is
- // inset
- OffsetRgn( update , -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
- m_peer->SetNeedsDisplay( true , update) ;
- DisposeRgn( update ) ;
- }
-#else
-/*
- RgnHandle updateRgn = NewRgn() ;
- if ( rect == NULL )
- {
- CopyRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn ) ;
- }
- else
- {
- SetRectRgn( updateRgn , rect->x , rect->y , rect->x + rect->width , rect->y + rect->height ) ;
- SectRgn( (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , updateRgn , updateRgn ) ;
- }
- InvalWindowRgn( (WindowRef) MacGetTopLevelWindowRef() , updateRgn ) ;
- DisposeRgn(updateRgn) ;
-*/
- if ( MacIsReallyShown() )
- {
- m_peer->SetVisibility( false , false ) ;
- m_peer->SetVisibility( true , true ) ;
- }
- /*
- if ( MacGetTopLevelWindow() == NULL )
- return ;
-
- if ( !m_peer->IsVisible())
+ if ( !MacIsReallyShown() )
return ;
- wxPoint client = GetClientAreaOrigin();
- int x1 = -client.x;
- int y1 = -client.y;
- int x2 = m_width - client.x;
- int y2 = m_height - client.y;
-
- if (IsKindOf( CLASSINFO(wxButton)))
- {
- // buttons have an "aura"
- y1 -= 5;
- x1 -= 5;
- y2 += 5;
- x2 += 5;
- }
-
- Rect clientrect = { y1, x1, y2, x2 };
-
if ( rect )
{
- Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
- SectRect( &clientrect , &r , &clientrect ) ;
- }
+ Rect r ;
- if ( !EmptyRect( &clientrect ) )
+ wxMacRectToNative( rect , &r ) ;
+ m_peer->SetNeedsDisplay( &r ) ;
+ }
+ else
{
- int top = 0 , left = 0 ;
-
- MacClientToRootWindow( &left , &top ) ;
- OffsetRect( &clientrect , left , top ) ;
-
- MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
+ m_peer->SetNeedsDisplay() ;
}
- */
-#endif
}
void wxWindowMac::Freeze()
#endif
}
-
void wxWindowMac::Thaw()
{
#if TARGET_API_MAC_OSX
- wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
+ wxASSERT_MSG( m_frozenness > 0, wxT("Thaw() without matching Freeze()") );
if ( !--m_frozenness )
{
}
// Coordinates relative to the window
-void wxWindowMac::WarpPointer (int x_pos, int y_pos)
+void wxWindowMac::WarpPointer(int x_pos, int y_pos)
{
// 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_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
+ if ( MacGetTopLevelWindow()->MacUsesCompositing() && (!m_macBackgroundBrush.Ok() || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT ) )
{
event.Skip() ;
}
if ( m_vScrollBar )
return m_vScrollBar->GetThumbPosition() ;
}
+
return 0;
}
if ( m_vScrollBar )
return m_vScrollBar->GetRange() ;
}
+
return 0;
}
if ( m_vScrollBar )
return m_vScrollBar->GetThumbSize() ;
}
+
return 0;
}
void wxWindowMac::MacPaintBorders( int leftOrigin , int rightOrigin )
{
- if( IsTopLevel() )
+ if ( IsTopLevel() )
return ;
Rect rect ;
bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
- bool hasBothScrollbars = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
+ bool hasBothScrollbars = (m_hScrollBar && m_hScrollBar->IsShown()) && (m_vScrollBar && m_vScrollBar->IsShown()) ;
+ // back to the surrounding frame rectangle
m_peer->GetRect( &rect ) ;
- InsetRect( &rect, -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
+ InsetRect( &rect, -1 , -1 ) ;
#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
- if ( UMAGetSystemVersion() >= 0x1030 )
+ if ( UMAGetSystemVersion() >= 0x1030 )
{
- Rect srect = rect ;
+ CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
+ rect.bottom - rect.top ) ;
+
HIThemeFrameDrawInfo info ;
- memset( &info, 0 , sizeof( info ) ) ;
-
+ memset( &info, 0 , sizeof(info) ) ;
+
info.version = 0 ;
info.kind = 0 ;
info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
info.isFocused = hasFocus ;
- bool draw = false ;
CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
wxASSERT( cgContext ) ;
-
- if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+
+ if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
{
- SInt32 border = 0 ;
- GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
- InsetRect( &srect , border , border );
info.kind = kHIThemeFrameTextFieldSquare ;
- draw = true ;
+ HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
}
- else if (HasFlag(wxSIMPLE_BORDER))
+ else if ( HasFlag(wxSIMPLE_BORDER) )
{
- SInt32 border = 0 ;
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
- InsetRect( &srect , border , border );
info.kind = kHIThemeFrameListBox ;
- draw = true ;
- }
-
- if ( draw )
- {
- CGRect cgrect = CGRectMake( srect.left , srect.top , srect.right - srect.left ,
- srect.bottom - srect.top ) ;
HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
}
else if ( hasFocus )
{
- srect = rect ;
- CGRect cgrect = CGRectMake( srect.left , srect.top , srect.right - srect.left ,
- srect.bottom - srect.top ) ;
HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
}
-
+
m_peer->GetRect( &rect ) ;
if ( hasBothScrollbars )
{
- srect = rect ;
int size = m_hScrollBar->GetWindowVariant() == wxWINDOW_VARIANT_NORMAL ? 16 : 12 ;
- CGRect cgrect = CGRectMake( srect.right - size , srect.bottom - size , size , size ) ;
- CGPoint cgpoint = CGPointMake( srect.right - size , srect.bottom - size ) ;
- HIThemeGrowBoxDrawInfo info ;
- memset( &info, 0 , sizeof( info ) ) ;
+ 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 ;
else
#endif
{
-#ifdef __WXMAC_OSX__
- // as the non OSX Version is already working in window relative coordinates, it's not needed
wxTopLevelWindowMac* top = MacGetTopLevelWindow();
- if (top)
+ if ( top )
{
- wxPoint pt(0,0) ;
+ wxPoint pt(0, 0) ;
wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
- rect.left += pt.x ;
- rect.right += pt.x ;
- rect.top += pt.y ;
- rect.bottom += pt.y ;
+ OffsetRect( &rect , pt.x , pt.y ) ;
}
-#endif
- if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
- {
- Rect srect = rect ;
- SInt32 border = 0 ;
- GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
- InsetRect( &srect , border , border );
- DrawThemeEditTextFrame(&srect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
- }
- else if (HasFlag(wxSIMPLE_BORDER))
- {
- Rect srect = rect ;
- SInt32 border = 0 ;
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
- InsetRect( &srect , border , border );
- DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
- }
-
+ if ( HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
+ DrawThemeEditTextFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ;
+ else if ( HasFlag(wxSIMPLE_BORDER) )
+ DrawThemeListBoxFrame( &rect, IsEnabled() ? kThemeStateActive : kThemeStateInactive ) ;
+
if ( hasFocus )
- {
- Rect srect = rect ;
- DrawThemeFocusRect( &srect , true ) ;
- }
+ DrawThemeFocusRect( &rect , true ) ;
+
if ( hasBothScrollbars )
{
- // GetThemeStandaloneGrowBoxBounds
- //DrawThemeStandaloneNoGrowBox
+ // GetThemeStandaloneGrowBoxBounds
+ // DrawThemeStandaloneNoGrowBox
}
}
}
void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
int range, bool refresh)
{
+ bool showScroller;
+
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) ;
- }
+ showScroller = ((range != 0) && (range > thumbVisible));
+ if ( m_hScrollBar->IsShown() != showScroller )
+ m_hScrollBar->Show( showScroller ) ;
+
m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
}
}
{
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) ;
- }
+ showScroller = ((range != 0) && (range > thumbVisible));
+ if ( m_vScrollBar->IsShown() != showScroller )
+ m_vScrollBar->Show( showScroller ) ;
+
m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
}
}
+
MacRepositionScrollBars() ;
}
// Does a physical scroll
void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{
- if( dx == 0 && dy ==0 )
+ if ( dx == 0 && dy == 0 )
return ;
+ int width , height ;
+ GetClientSize( &width , &height ) ;
- {
-
- int width , height ;
- GetClientSize( &width , &height ) ;
#if TARGET_API_MAC_OSX
+ if ( true /* m_peer->IsCompositing() */ )
+ {
// note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
// area is scrolled, this does not occur if width and height are 2 pixels less,
- // TODO write optimal workaround
- wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
+ // TODO: write optimal workaround
+ wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
if ( rect )
- {
scrollrect.Intersect( *rect ) ;
- }
+
if ( m_peer->GetNeedsDisplay() )
{
- // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
+ // because HIViewScrollRect does not scroll the already invalidated area we have two options:
// either immediate redraw or full invalidate
#if 1
// is the better overall solution, as it does not slow down scrolling
- m_peer->SetNeedsDisplay( true ) ;
+ m_peer->SetNeedsDisplay() ;
#else
// this would be the preferred version for fast drawing controls
- if( UMAGetSystemVersion() < 0x1030 )
- Update() ;
- else
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+ if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
HIViewRender(m_peer->GetControlRef()) ;
+ else
+#endif
+ Update() ;
#endif
}
+
// as the native control might be not a 0/0 wx window coordinates, we have to offset
scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
- m_peer->ScrollRect( scrollrect , dx , dy ) ;
+ m_peer->ScrollRect( &scrollrect , dx , dy ) ;
+
+ // becuase HIViewScrollRect does not scroll the already invalidated area we have two options
+ // either immediate redraw or full invalidate
+#if 0
+ // is the better overall solution, as it does not slow down scrolling
+ m_peer->SetNeedsDisplay() ;
#else
+ // this would be the preferred version for fast drawing controls
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+ if ( UMAGetSystemVersion() >= 0x1030 && m_peer->IsCompositing() )
+ HIViewRender(m_peer->GetControlRef()) ;
+ else
+#endif
+ Update() ;
+#endif
+ }
+ else
+#endif
+ {
wxPoint pos;
- pos.x = pos.y = 0;
+ pos.x =
+ pos.y = 0;
Rect scrollrect;
RgnHandle updateRgn = NewRgn() ;
- {
+ {
wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ;
- m_peer->GetRect( &scrollrect ) ;
- scrollrect.top += MacGetTopBorderSize() ;
- scrollrect.left += MacGetLeftBorderSize() ;
+ m_peer->GetRectInWindowCoords( &scrollrect ) ;
+ //scrollrect.top += MacGetTopBorderSize() ;
+ //scrollrect.left += MacGetLeftBorderSize() ;
scrollrect.bottom = scrollrect.top + height ;
scrollrect.right = scrollrect.left + width ;
dc.XLOG2DEVMAC(rect->x + rect->width) } ;
SectRect( &scrollrect , &r , &scrollrect ) ;
}
+
ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
// now scroll the former update region as well and add the new update region
-
WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ;
RgnHandle formerUpdateRgn = NewRgn() ;
RgnHandle scrollRgn = NewRgn() ;
RectRgn( scrollRgn , &scrollrect ) ;
GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
- Point pt = {0,0} ;
+ Point pt = {0, 0} ;
LocalToGlobal( &pt ) ;
OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
+
if ( !EmptyRgn( formerUpdateRgn ) )
{
MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
- InvalWindowRgn(rootWindow , formerUpdateRgn ) ;
+ InvalWindowRgn( rootWindow, formerUpdateRgn ) ;
}
- InvalWindowRgn(rootWindow , updateRgn ) ;
+
+ InvalWindowRgn(rootWindow, updateRgn ) ;
DisposeRgn( updateRgn ) ;
DisposeRgn( formerUpdateRgn ) ;
DisposeRgn( scrollRgn ) ;
}
-#endif
+
+ Update() ;
}
+ wxWindowMac *child;
+ int x, y, w, h;
for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *child = node->GetData();
- if (child == m_vScrollBar) continue;
- if (child == m_hScrollBar) continue;
- if (child->IsTopLevel()) continue;
+ child = node->GetData();
+ if (child == NULL)
+ continue;
+ 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 );
if (rect)
{
- wxRect rc(x,y,w,h);
- if (rect->Intersects(rc))
- child->SetSize( x+dx, y+dy, w, h );
+ wxRect rc( x, y, w, h );
+ if (rect->Intersects( rc ))
+ child->SetSize( x + dx, y + dy, w, h );
}
else
{
- child->SetSize( x+dx, y+dy, w, h );
+ child->SetSize( x + dx, y + dy, w, h );
}
}
}
-void wxWindowMac::MacOnScroll(wxScrollEvent &event )
+void wxWindowMac::MacOnScroll( wxScrollEvent &event )
{
if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
{
return wxFindControlFromMacControl( control ) ;
}
-void wxWindowMac::OnSetFocus(wxFocusEvent& event)
+void wxWindowMac::OnSetFocus( wxFocusEvent& event )
{
// panel wants to track the window which was the last to have focus in it,
// so we want to set ourselves as the window which last had focus
//
- // notice that it's also important to do it upwards the tree becaus
+ // notice that it's also important to do it upwards the tree because
// 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:
+ // CS: don't know if this is still needed:
//wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus);
if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
{
- #if !wxMAC_USE_CORE_GRAPHICS
+#if wxMAC_USE_CORE_GRAPHICS
+ GetParent()->Refresh() ;
+#else
wxMacWindowStateSaver sv( this ) ;
Rect rect ;
+
m_peer->GetRect( &rect ) ;
- InsetRect( &rect, -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
-#ifdef __WXMAC_OSX__
- // as the non OSX Version is already working in window relative coordinates, it's not needed
+ // auf den umgebenden Rahmen zur\9fck
+ InsetRect( &rect, -1 , -1 ) ;
+
wxTopLevelWindowMac* top = MacGetTopLevelWindow();
- if (top)
+ if ( top )
{
- wxPoint pt(0,0) ;
+ wxPoint pt(0, 0) ;
wxMacControl::Convert( &pt , GetParent()->m_peer , top->m_peer ) ;
rect.left += pt.x ;
rect.right += pt.x ;
rect.top += pt.y ;
rect.bottom += pt.y ;
}
-#endif
- if ( event.GetEventType() == wxEVT_SET_FOCUS )
- DrawThemeFocusRect( &rect , true ) ;
- else
+ bool bIsFocusEvent = (event.GetEventType() == wxEVT_SET_FOCUS);
+ DrawThemeFocusRect( &rect , bIsFocusEvent ) ;
+ if ( !bIsFocusEvent )
{
- DrawThemeFocusRect( &rect , false ) ;
-
// as this erases part of the frame we have to redraw borders
// and because our z-ordering is not always correct (staticboxes)
// we have to invalidate things, we cannot simple redraw
MacInvalidateBorders() ;
}
-#else
- GetParent()->Refresh() ;
#endif
}
m_peer->SetZOrder( false , NULL ) ;
}
-
// static wxWindow *gs_lastWhich = NULL;
-bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
{
// first trigger a set cursor event
}
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
// point
if ( !processedEvtSetCursor && m_cursor.Ok() )
- {
cursor = m_cursor ;
- }
- if ( wxIsBusy() )
- {
- }
- else
- {
- if ( !GetParent() )
- cursor = *wxSTANDARD_CURSOR ;
- }
+
+ if ( !wxIsBusy() && !GetParent() )
+ cursor = *wxSTANDARD_CURSOR ;
}
+
if ( cursor.Ok() )
cursor.MacInstall() ;
}
+
return cursor.Ok() ;
}
wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
{
+#if wxUSE_TOOLTIPS
if ( m_tooltip )
- {
return m_tooltip->GetTip() ;
- }
+#endif
+
return wxEmptyString ;
}
void wxWindowMac::Update()
{
#if TARGET_API_MAC_OSX
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
- WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ;
-
- // for composited windows this also triggers a redraw of all
- // invalid views in the window
- if( UMAGetSystemVersion() >= 0x1030 )
- HIWindowFlush(window) ;
- else
-#endif
- {
- // the only way to trigger the redrawing on earlier systems is to call
- // ReceiveNextEvent
-
- EventRef currentEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
- UInt32 currentEventClass = 0 ;
- UInt32 currentEventKind = 0 ;
- if ( currentEvent != NULL )
- {
- currentEventClass = ::GetEventClass( currentEvent ) ;
- currentEventKind = ::GetEventKind( currentEvent ) ;
- }
- if ( currentEventClass != kEventClassMenu )
- {
- // when tracking a menu, strange redraw errors occur if we flush now, so leave..
-
- EventRef theEvent;
- OSStatus status = noErr ;
- status = ReceiveNextEvent( 0 , NULL , kEventDurationNoWait , false , &theEvent ) ;
- }
- else
- m_peer->SetNeedsDisplay( true ) ;
- }
+ MacGetTopLevelWindow()->MacPerformUpdates() ;
#else
::Draw1Control( m_peer->GetControlRef() ) ;
#endif
wxTopLevelWindowMac* win = NULL ;
WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
if ( window )
- {
win = wxFindWinFromMacWindow( window ) ;
- }
+
return win ;
}
-wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
+
+const wxRect& wxWindowMac::MacGetClippedClientRect() const
+{
+ MacUpdateClippedRects() ;
+
+ return m_cachedClippedClientRect ;
+}
+
+const wxRect& wxWindowMac::MacGetClippedRect() const
+{
+ MacUpdateClippedRects() ;
+
+ return m_cachedClippedRect ;
+}
+
+const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const
+{
+ MacUpdateClippedRects() ;
+
+ return m_cachedClippedRectWithOuterStructure ;
+}
+
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
{
+ static wxRegion emptyrgn ;
+
+ if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ )
+ {
+ MacUpdateClippedRects() ;
+ if ( includeOuterStructures )
+ return m_cachedClippedRegionWithOuterStructure ;
+ else
+ return m_cachedClippedRegion ;
+ }
+ else
+ {
+ return emptyrgn ;
+ }
+}
+
+void wxWindowMac::MacUpdateClippedRects() const
+{
+ if ( m_cachedClippedRectValid )
+ return ;
+
// includeOuterStructures is true if we try to draw somthing like a focus ring etc.
// also a window dc uses this, in this case we only clip in the hierarchy for hard
// borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
// to add focus borders everywhere
- Rect r ;
- RgnHandle visRgn = NewRgn() ;
- RgnHandle tempRgn = NewRgn() ;
- if ( !m_isBeingDeleted && MacIsReallyShown() /*m_peer->IsVisible() */ )
- {
- m_peer->GetRect( &r ) ;
- r.left -= MacGetLeftBorderSize() ;
- r.top -= MacGetTopBorderSize() ;
- r.bottom += MacGetBottomBorderSize() ;
- r.right += MacGetRightBorderSize() ;
+ Rect r, rIncludingOuterStructures ;
+
+ m_peer->GetRect( &r ) ;
+ r.left -= MacGetLeftBorderSize() ;
+ r.top -= MacGetTopBorderSize() ;
+ r.bottom += MacGetBottomBorderSize() ;
+ r.right += MacGetRightBorderSize() ;
- if (! MacGetTopLevelWindow()->MacUsesCompositing() )
+ r.right -= r.left ;
+ r.bottom -= r.top ;
+ r.left = 0 ;
+ r.top = 0 ;
+
+ rIncludingOuterStructures = r ;
+ InsetRect( &rIncludingOuterStructures , -4 , -4 ) ;
+
+ wxRect cl = GetClientRect() ;
+ Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ;
+
+ int x , y ;
+ wxSize size ;
+ const wxWindow* child = this ;
+ const wxWindow* parent = NULL ;
+
+ while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL )
+ {
+ if ( parent->MacIsChildOfClientArea(child) )
{
- MacRootWindowToWindow( &r.left , & r.top ) ;
- MacRootWindowToWindow( &r.right , & r.bottom ) ;
+ size = parent->GetClientSize() ;
+ wxPoint origin = parent->GetClientAreaOrigin() ;
+ x = origin.x ;
+ y = origin.y ;
}
else
{
- r.right -= r.left ;
- r.bottom -= r.top ;
- r.left = 0 ;
- r.top = 0 ;
+ // this will be true for scrollbars, toolbars etc.
+ size = parent->GetSize() ;
+ y = parent->MacGetTopBorderSize() ;
+ x = parent->MacGetLeftBorderSize() ;
+ size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ;
+ size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ;
}
- if ( includeOuterStructures )
- InsetRect( &r , -4 , -4 ) ;
- RectRgn( visRgn , &r ) ;
- if ( !IsTopLevel() )
- {
- wxWindow* child = this ;
- wxWindow* parent = child->GetParent() ;
- while( parent )
- {
- int x , y ;
- wxSize size ;
- // we have to find a better clipping algorithm here, in order not to clip things
- // positioned like status and toolbar
- if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ )
- {
- size = parent->GetSize() ;
- x = y = 0 ;
- }
- else
- {
- size = parent->GetClientSize() ;
- wxPoint origin = parent->GetClientAreaOrigin() ;
- x = origin.x ;
- y = origin.y ;
- }
- parent->MacWindowToRootWindow( &x, &y ) ;
- MacRootWindowToWindow( &x , &y ) ;
+ parent->MacWindowToRootWindow( &x, &y ) ;
+ MacRootWindowToWindow( &x , &y ) ;
- if ( !includeOuterStructures || (
- parent->MacClipChildren() ||
- ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() )
- ) )
- {
- SetRectRgn( tempRgn ,
- x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
- x + size.x - parent->MacGetRightBorderSize(),
- y + size.y - parent->MacGetBottomBorderSize()) ;
+ Rect rparent = { y , x , y + size.y , x + size.x } ;
- SectRgn( visRgn , tempRgn , visRgn ) ;
- }
- if ( parent->IsTopLevel() )
- break ;
- child = parent ;
- parent = child->GetParent() ;
- }
+ // the wxwindow and client rects will always be clipped
+ SectRect( &r , &rparent , &r ) ;
+ SectRect( &rClient , &rparent , &rClient ) ;
+
+ // the structure only at 'hard' borders
+ if ( parent->MacClipChildren() ||
+ ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) )
+ {
+ SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ;
}
+
+ child = parent ;
}
- wxRegion vis = visRgn ;
- DisposeRgn( visRgn ) ;
- DisposeRgn( tempRgn ) ;
- return vis ;
+ m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ;
+ m_cachedClippedClientRect = wxRect( rClient.left , rClient.top ,
+ rClient.right - rClient.left , rClient.bottom - rClient.top ) ;
+ m_cachedClippedRectWithOuterStructure = wxRect(
+ rIncludingOuterStructures.left , rIncludingOuterStructures.top ,
+ rIncludingOuterStructures.right - rIncludingOuterStructures.left ,
+ rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ;
+
+ m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ;
+ m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ;
+ m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ;
+
+ m_cachedClippedRectValid = true ;
}
/*
*/
bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
{
- RgnHandle updatergn = (RgnHandle) updatergnr ;
bool handled = false ;
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 ) ;
+ // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
- if ( !EmptyRgn(updatergn) )
+ if ( !EmptyRgn(updatergn) )
{
RgnHandle newupdate = NewRgn() ;
wxSize point = GetClientSize() ;
wxPoint origin = GetClientAreaOrigin() ;
- SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
+ SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;
SectRgn( newupdate , updatergn , newupdate ) ;
// first send an erase event to the entire update 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 ;
+ wxDC* dc = new wxWindowDC(this);
if ( IsTopLevel() )
- dc = new wxWindowDC(this);
+ dc->SetClippingRegion(wxRegion(updatergn));
else
- dc = new wxClientDC(this);
- dc->SetClippingRegion(wxRegion(updatergn));
+ dc->SetClippingRegion(wxRegion(newupdate));
+
wxEraseEvent eevent( GetId(), dc );
eevent.SetEventObject( this );
GetEventHandler()->ProcessEvent( eevent );
// in Composited windowing
wxPoint clientOrigin = GetClientAreaOrigin() ;
+ wxWindowMac *child;
+ int x, y, w, h;
for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *child = node->GetData();
- if (child == m_vScrollBar) continue;
- if (child == m_hScrollBar) continue;
- if (child->IsTopLevel()) continue;
- if (!child->IsShown()) continue;
+ 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
- int x,y;
child->GetPosition( &x, &y );
- int w,h;
child->GetSize( &w, &h );
Rect childRect = { y , x , y + h , x + w } ;
OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
if ( RectInRgn( &childRect , updatergn ) )
{
-
// paint custom borders
wxNcPaintEvent eventNc( child->GetId() );
eventNc.SetEventObject( child );
#if wxMAC_USE_CORE_GRAPHICS && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
if ( UMAGetSystemVersion() >= 0x1030 )
{
- child->MacPaintBorders(0,0) ;
+ child->MacPaintBorders(0, 0) ;
}
else
#endif
wxWindowDC dc(this) ;
dc.SetClippingRegion(wxRegion(updatergn));
wxMacPortSetter helper(&dc) ;
- child->MacPaintBorders(0,0) ;
+ child->MacPaintBorders(0, 0) ;
}
}
}
}
}
+
return handled ;
}
{
wxWindowMac *iter = (wxWindowMac*)this ;
- while( iter )
+ while ( iter )
{
if ( iter->IsTopLevel() )
return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
iter = iter->GetParent() ;
}
+
wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
+
return NULL ;
}
int width, height ;
GetClientSize( &width , &height ) ;
- wxPoint vPoint(width-scrlsize, 0) ;
+ wxPoint vPoint(width - scrlsize, 0) ;
wxSize vSize(scrlsize, height - adjust) ;
- wxPoint hPoint(0 , height-scrlsize ) ;
- wxSize hSize( width - adjust, scrlsize) ;
-
+ wxPoint hPoint(0, height - scrlsize) ;
+ wxSize hSize(width - adjust, scrlsize) ;
if ( style & wxVSCROLL )
- {
- m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint,
- vSize , wxVERTICAL);
- }
+ m_vScrollBar = new wxScrollBar(this, wxID_ANY, vPoint, vSize , wxVERTICAL);
if ( style & wxHSCROLL )
- {
- m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint,
- hSize , wxHORIZONTAL);
- }
+ m_hScrollBar = new wxScrollBar(this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
}
-
// because the create does not take into account the client area origin
- MacRepositionScrollBars() ; // we might have a real position shift
+ // we might have a real position shift
+ MacRepositionScrollBars() ;
+}
+
+bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
+{
+ bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
+
+ return result ;
}
void wxWindowMac::MacRepositionScrollBars()
if ( !m_hScrollBar && !m_vScrollBar )
return ;
- bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
+ bool hasBoth = (m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
int adjust = hasBoth ? scrlsize - 1 : 0 ;
// get real client area
-
- int width ;
- int height ;
- GetSize( &width , &height ) ;
+ int width, height ;
+ GetSize( &width , &height );
width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
- wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
- wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
- wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
- wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
-/*
- int x = 0 ;
- int y = 0 ;
- int w ;
- int h ;
+ wxPoint vPoint( width - scrlsize, 0 ) ;
+ wxSize vSize( scrlsize, height - adjust ) ;
+ wxPoint hPoint( 0 , height - scrlsize ) ;
+ wxSize hSize( width - adjust, scrlsize ) ;
+
+#if 0
+ int x = 0, y = 0, w, h ;
GetSize( &w , &h ) ;
MacClientToRootWindow( &x , &y ) ;
wxWindowMac *iter = (wxWindowMac*)this ;
int totW = 10000 , totH = 10000;
- while( iter )
+ while ( iter )
{
if ( iter->IsTopLevel() )
{
vSize.y += 1 ;
}
- if ( w-x >= totW )
+ if ( w - x >= totW )
{
hSize.x += 1 ;
vPoint.x += 1 ;
}
-
- if ( h-y >= totH )
+ if ( h - y >= totH )
{
vSize.y += 1 ;
hPoint.y += 1 ;
}
-*/
+#endif
+
if ( m_vScrollBar )
- {
- m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
- }
+ m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );
if ( m_hScrollBar )
- {
- m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE);
- }
+ m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );
}
bool wxWindowMac::AcceptsFocus() const
{
// only window-absolute structures have to be moved i.e. controls
+ m_cachedClippedRectValid = false ;
+
+ wxWindowMac *child;
wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = node->GetData();
+ child = node->GetData();
child->MacSuperChangedPosition() ;
+
node = node->GetNext();
}
}
{
// only screen-absolute structures have to be moved i.e. glcanvas
+ wxWindowMac *child;
wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = node->GetData();
+ child = node->GetData();
child->MacTopLevelWindowChangedPosition() ;
+
node = node->GetNext();
}
}
-long wxWindowMac::MacGetLeftBorderSize( ) const
+long wxWindowMac::MacGetLeftBorderSize() const
{
- if( IsTopLevel() )
+ if ( IsTopLevel() )
return 0 ;
- if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
- {
- SInt32 border = 3 ;
- return border ;
- }
- else if ( m_windowStyle &wxDOUBLE_BORDER)
+ SInt32 border = 0 ;
+
+ if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
{
- SInt32 border = 3 ;
- return border ;
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+ border += 1 ;
}
- else if (m_windowStyle &wxSIMPLE_BORDER)
+ else if (HasFlag(wxSIMPLE_BORDER))
{
- return 1 ;
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+ border += 1 ;
}
- return 0 ;
+
+ return border ;
}
-long wxWindowMac::MacGetRightBorderSize( ) const
+long wxWindowMac::MacGetRightBorderSize() const
{
// they are all symmetric in mac themes
return MacGetLeftBorderSize() ;
}
-long wxWindowMac::MacGetTopBorderSize( ) const
+long wxWindowMac::MacGetTopBorderSize() const
{
// they are all symmetric in mac themes
return MacGetLeftBorderSize() ;
}
-long wxWindowMac::MacGetBottomBorderSize( ) const
+long wxWindowMac::MacGetBottomBorderSize() const
{
// they are all symmetric in mac themes
return MacGetLeftBorderSize() ;
// Find the wxWindowMac at the current mouse position, returning the mouse
// position.
-wxWindowMac* wxFindWindowAtPointer(wxPoint& pt)
+wxWindowMac * wxFindWindowAtPointer( wxPoint& pt )
{
pt = wxGetMousePosition();
wxWindowMac* found = wxFindWindowAtPoint(pt);
+
return found;
}
wxPoint wxGetMousePosition()
{
int x, y;
- wxGetMousePosition(& x, & y);
+
+ wxGetMousePosition( &x, &y );
+
return wxPoint(x, y);
}
if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
{
// copied from wxGTK : CS
+ // VZ: shouldn't we move this to base class then?
+
// generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
// except that:
//
void wxWindowMac::OnPaint( wxPaintEvent & event )
{
if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
- {
- CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
- }
+ CallNextEventHandler(
+ (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
+ (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
}
void wxWindowMac::MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool WXUNUSED( mouseStillDown ) )
Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
{
- int x ,y , w ,h ;
+ int x, y, w, h ;
+
+ window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
+ Rect bounds = { y, x, y + h, x + w };
- window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ;
- Rect bounds = { y , x , y+h , x+w };
return bounds ;
}
return eventNotHandledErr ;
}
+bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
+{
+ wxWindowMac *newParent = (wxWindowMac *)newParentBase;
+ if ( !wxWindowBase::Reparent(newParent) )
+ return false;
+ // copied from MacPostControlCreate
+ ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+
+ ::EmbedControl( m_peer->GetControlRef() , container ) ;
+
+ return true;
+}
projects / wxWidgets.git / blobdiff