#include "wx/panel.h"
#include "wx/layout.h"
#include "wx/dialog.h"
-#include "wx/listbox.h"
#include "wx/scrolbar.h"
+#include "wx/scrolwin.h"
#include "wx/statbox.h"
#include "wx/button.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/frame.h"
-#include "wx/notebook.h"
-#include "wx/tabctrl.h"
#include "wx/tooltip.h"
#include "wx/statusbr.h"
#include "wx/menuitem.h"
#include "wx/spinctrl.h"
#include "wx/log.h"
#include "wx/geometry.h"
+#include "wx/textctrl.h"
+#include "wx/laywin.h"
+#include "wx/splitter.h"
+
+#include "wx/toolbar.h"
+#include "wx/dc.h"
#if wxUSE_CARET
#include "wx/caret.h"
#define wxWINDOW_HSCROLL 5998
#define wxWINDOW_VSCROLL 5997
-#define MAC_SCROLLBAR_SIZE 16
+
+#define MAC_SCROLLBAR_SIZE 15
+#define MAC_SMALL_SCROLLBAR_SIZE 11
#include "wx/mac/uma.h"
#ifndef __DARWIN__
#include <Windows.h>
#include <ToolUtils.h>
+#include <Scrap.h>
+#include <MacTextEditor.h>
+#endif
+
+#if TARGET_API_MAC_OSX
+#ifndef __HIVIEW__
+ #include <HIToolbox/HIView.h>
+#endif
#endif
#if wxUSE_DRAG_AND_DROP
#include <string.h>
extern wxList wxPendingDelete;
-wxWindowMac* gFocusWindow = NULL ;
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
- EVT_NC_PAINT(wxWindowMac::OnNcPaint)
- EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
- EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
- EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
- EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
- EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
+ EVT_NC_PAINT(wxWindowMac::OnNcPaint)
+ EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+// TODO EVT_PAINT(wxWindowMac::OnPaint)
+ EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
+ EVT_KILL_FOCUS(wxWindowMac::OnSetFocus)
+ EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
END_EVENT_TABLE()
#endif
#define wxMAC_DEBUG_REDRAW 0
#endif
-#define wxMAC_USE_THEME_BORDER 0
+#define wxMAC_USE_THEME_BORDER 1
+
+// ---------------------------------------------------------------------------
+// Utility Routines to move between different coordinate systems
+// ---------------------------------------------------------------------------
+
+/*
+ * Right now we have the following setup :
+ * a border that is not part of the native control is always outside the
+ * control's border (otherwise we loose all native intelligence, future ways
+ * may be to have a second embedding control responsible for drawing borders
+ * and backgrounds eventually)
+ * so all this border calculations have to be taken into account when calling
+ * native methods or getting native oriented data
+ * so we have three coordinate systems here
+ * wx client coordinates
+ * wx window coordinates (including window frames)
+ * native coordinates
+ */
+
+//
+// originating from native control
+//
+
+
+void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle )
+{
+ OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
+}
+
+void wxMacNativeToWindow( const wxWindow* window , Rect *rect )
+{
+ OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
+}
+
+//
+// directed towards native control
+//
+
+void wxMacWindowToNative( const wxWindow* window , RgnHandle handle )
+{
+ OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+}
+
+void wxMacWindowToNative( const wxWindow* window , Rect *rect )
+{
+ OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ;
+}
+
+
+// ---------------------------------------------------------------------------
+// Carbon Events
+// ---------------------------------------------------------------------------
+
+extern long wxMacTranslateKey(unsigned char key, unsigned char code) ;
+pascal OSStatus wxMacSetupControlBackground( ControlRef iControl , SInt16 iMessage , SInt16 iDepth , Boolean iIsColor ) ;
+
+#if TARGET_API_MAC_OSX
+
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_3
+enum {
+ kEventControlVisibilityChanged = 157
+};
+#endif
+
+#endif
+
+static const EventTypeSpec eventList[] =
+{
+ { kEventClassControl , kEventControlHit } ,
+#if TARGET_API_MAC_OSX
+ { kEventClassControl , kEventControlDraw } ,
+ { kEventClassControl , kEventControlVisibilityChanged } ,
+ { kEventClassControl , kEventControlEnabledStateChanged } ,
+ { kEventClassControl , kEventControlHiliteChanged } ,
+ { kEventClassControl , kEventControlSetFocusPart } ,
+
+ { kEventClassService , kEventServiceGetTypes },
+ { kEventClassService , kEventServiceCopy },
+ { kEventClassService , kEventServicePaste },
+
+ // { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
+// { kEventClassControl , kEventControlBoundsChanged } ,
+#endif
+} ;
+
+static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ wxMacCarbonEvent cEvent( event ) ;
+
+ ControlRef controlRef ;
+ wxWindowMac* thisWindow = (wxWindowMac*) data ;
+
+ cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+ switch( GetEventKind( event ) )
+ {
+#if TARGET_API_MAC_OSX
+ case kEventControlDraw :
+ {
+ RgnHandle updateRgn = NULL ;
+ RgnHandle allocatedRgn = NULL ;
+ wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+ if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
+ {
+ updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+ }
+ else
+ {
+ if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
+ {
+ 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
+ CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+ if ( thisWindow->MacIsUserPane() )
+ {
+ static float color = 0.5 ;
+ static channel = 0 ;
+ HIRect bounds;
+ HIViewGetBounds( controlRef, &bounds );
+ CGContextSetRGBFillColor( cgContext, channel == 0 ? color : 0.5 ,
+ channel == 1 ? color : 0.5 , channel == 2 ? color : 0.5 , 1 );
+ CGContextFillRect( cgContext, bounds );
+ color += 0.1 ;
+ if ( color > 0.9 )
+ {
+ color = 0.5 ;
+ channel++ ;
+ if ( channel == 3 )
+ channel = 0 ;
+ }
+ }
+#endif
+ if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
+ result = noErr ;
+ if ( allocatedRgn )
+ DisposeRgn( allocatedRgn ) ;
+ }
+ break ;
+ case kEventControlVisibilityChanged :
+ thisWindow->MacVisibilityChanged() ;
+ break ;
+ case kEventControlEnabledStateChanged :
+ thisWindow->MacEnabledStateChanged() ;
+ break ;
+ case kEventControlHiliteChanged :
+ thisWindow->MacHiliteChanged() ;
+ break ;
+ case kEventControlSetFocusPart :
+ {
+ Boolean focusEverything = false ;
+ ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+ if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
+ {
+ }
+ if ( controlPart == kControlFocusNoPart )
+ {
+ #if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ {
+ thisWindow->GetCaret()->OnKillFocus();
+ }
+ #endif // wxUSE_CARET
+ wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->GetEventHandler()->ProcessEvent(event) ;
+ }
+ else
+ {
+ // panel wants to track the window which was the last to have focus in it
+ wxChildFocusEvent eventFocus(thisWindow);
+ thisWindow->GetEventHandler()->ProcessEvent(eventFocus);
+
+ #if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ {
+ thisWindow->GetCaret()->OnSetFocus();
+ }
+ #endif // wxUSE_CARET
+
+ wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->GetEventHandler()->ProcessEvent(event) ;
+ }
+ if ( thisWindow->MacIsUserPane() )
+ result = noErr ;
+ }
+ break ;
+#endif
+ case kEventControlHit :
+ {
+ result = thisWindow->MacControlHit( handler , event ) ;
+ }
+ break ;
+ default :
+ break ;
+ }
+ return result ;
+}
+
+static pascal OSStatus wxMacWindowServiceEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ wxMacCarbonEvent cEvent( event ) ;
+
+ ControlRef controlRef ;
+ wxWindowMac* thisWindow = (wxWindowMac*) data ;
+ wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
+ cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+
+ switch( GetEventKind( event ) )
+ {
+ case kEventServiceGetTypes :
+ if( textCtrl )
+ {
+ long from, to ;
+ textCtrl->GetSelection( &from , &to ) ;
+
+ CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;
+ 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' */ };
+ for ( size_t i = 0 ; i < WXSIZEOF(textDataTypes) ; ++i )
+ {
+ CFStringRef typestring = CreateTypeStringWithOSType(textDataTypes[i]);
+ if ( typestring )
+ {
+ if ( copyTypes )
+ CFArrayAppendValue (copyTypes, typestring) ;
+ if ( pasteTypes )
+ 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() ) ) ;
+ result = noErr ;
+ }
+ break ;
+ case kEventServicePaste :
+ if ( textCtrl )
+ {
+ ScrapRef scrapRef = cEvent.GetParameter< ScrapRef > ( kEventParamScrapRef , typeScrapRef ) ;
+ Size textSize, pastedSize ;
+ verify_noerr( GetScrapFlavorSize (scrapRef, kTXNTextData, &textSize) ) ;
+ textSize++ ;
+ char *content = new char[textSize] ;
+ GetScrapFlavorData (scrapRef, kTXNTextData, &pastedSize, content );
+ content[textSize-1] = 0 ;
+#if wxUSE_UNICODE
+ textCtrl->WriteText( wxString( content , wxConvLocal ) );
+#else
+ textCtrl->WriteText( wxString( content ) ) ;
+#endif
+ delete[] content ;
+ result = noErr ;
+ }
+ break ;
+ }
+
+ return result ;
+}
+
+pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+{
+ EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+ EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+ OSStatus result = eventNotHandledErr ;
+
+ switch ( GetEventClass( event ) )
+ {
+ case kEventClassControl :
+ result = wxMacWindowControlEventHandler( handler, event, data ) ;
+ break ;
+ case kEventClassService :
+ result = wxMacWindowServiceEventHandler( handler, event , data ) ;
+ default :
+ break ;
+ }
+ wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+ return result ;
+}
+
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
+// ---------------------------------------------------------------------------
+// UserPane events for non OSX builds
+// ---------------------------------------------------------------------------
+
+static pascal void wxMacControlUserPaneDrawProc(ControlRef control, SInt16 part)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+ win->MacControlUserPaneDrawProc(part) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneHitTestProc(ControlRef control, Point where)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+ return win->MacControlUserPaneHitTestProc(where.h , where.v) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneTrackingProc(ControlRef control, Point startPt, ControlActionUPP actionProc)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+ return win->MacControlUserPaneTrackingProc( startPt.h , startPt.v , (void*) actionProc) ;
+}
+
+static pascal void wxMacControlUserPaneIdleProc(ControlRef control)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+ win->MacControlUserPaneIdleProc() ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneKeyDownProc(ControlRef control, SInt16 keyCode, SInt16 charCode, SInt16 modifiers)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+ return win->MacControlUserPaneKeyDownProc(keyCode,charCode,modifiers) ;
+}
+
+static pascal void wxMacControlUserPaneActivateProc(ControlRef control, Boolean activating)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+ win->MacControlUserPaneActivateProc(activating) ;
+}
+
+static pascal ControlPartCode wxMacControlUserPaneFocusProc(ControlRef control, ControlFocusPart action)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_MSG( win , kControlNoPart , wxT("Callback from unkown control") ) ;
+ return win->MacControlUserPaneFocusProc(action) ;
+}
+
+static pascal void wxMacControlUserPaneBackgroundProc(ControlRef control, ControlBackgroundPtr info)
+{
+ wxWindow * win = wxFindControlFromMacControl(control) ;
+ wxCHECK_RET( win , wxT("Callback from unkown control") ) ;
+ win->MacControlUserPaneBackgroundProc(info) ;
+}
+
+void wxWindowMac::MacControlUserPaneDrawProc(wxInt16 part)
+{
+ RgnHandle rgn = NewRgn() ;
+ GetClip( rgn ) ;
+ wxMacWindowStateSaver sv( this ) ;
+ SectRgn( rgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , rgn ) ;
+ MacDoRedraw( rgn , 0 ) ;
+ DisposeRgn( rgn ) ;
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneHitTestProc(wxInt16 x, wxInt16 y)
+{
+ return kControlNoPart ;
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneTrackingProc(wxInt16 x, wxInt16 y, void* actionProc)
+{
+ return kControlNoPart ;
+}
+
+void wxWindowMac::MacControlUserPaneIdleProc()
+{
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneKeyDownProc(wxInt16 keyCode, wxInt16 charCode, wxInt16 modifiers)
+{
+ return kControlNoPart ;
+}
+
+void wxWindowMac::MacControlUserPaneActivateProc(bool activating)
+{
+}
+
+wxInt16 wxWindowMac::MacControlUserPaneFocusProc(wxInt16 action)
+{
+ 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 ;
// ===========================================================================
// implementation
// ===========================================================================
+wxList wxWinMacControlList(wxKEY_INTEGER);
+
+wxWindow *wxFindControlFromMacControl(ControlRef inControl )
+{
+ wxNode *node = wxWinMacControlList.Find((long)inControl);
+ if (!node)
+ return NULL;
+ return (wxControl *)node->GetData();
+}
+
+void wxAssociateControlWithMacControl(ControlRef inControl, wxWindow *control)
+{
+ // 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);
+}
+
+void wxRemoveMacControlAssociation(wxWindow *control)
+{
+ wxWinMacControlList.DeleteObject(control);
+}
+
+// UPP functions
+ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
+
+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 )
+ {
+ case kControlMsgApplyTextColor :
+ break ;
+ case kControlMsgSetUpBackground :
+ {
+ 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 ) ;
+ }
+ */
+ }
+ }
+ 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 */ ) ;
+ }
+ }
+}
// ----------------------------------------------------------------------------
-// constructors and such
+ // constructors and such
// ----------------------------------------------------------------------------
+wxWindowMac::wxWindowMac()
+{
+ Init();
+}
+
+wxWindowMac::wxWindowMac(wxWindowMac *parent,
+ wxWindowID id,
+ const wxPoint& pos ,
+ const wxSize& size ,
+ long style ,
+ const wxString& name )
+{
+ Init();
+ Create(parent, id, pos, size, style, name);
+}
+
void wxWindowMac::Init()
{
+ m_peer = NULL ;
+ m_frozenness = 0 ;
+#if WXWIN_COMPATIBILITY_2_4
m_backgroundTransparent = FALSE;
+#endif
// as all windows are created with WS_VISIBLE style...
m_isShown = TRUE;
- m_x = 0;
- m_y = 0 ;
- m_width = 0 ;
- m_height = 0 ;
-
m_hScrollBar = NULL ;
m_vScrollBar = NULL ;
+ m_macBackgroundBrush = wxNullBrush ;
+
+ m_macIsUserPane = TRUE;
+
+ // make sure all proc ptrs are available
+
+ 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 ) ;
+ }
+ if ( wxMacLiveScrollbarActionUPP == NULL )
+ {
+ wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
+ }
+
+ if ( wxMacSetupControlBackgroundUPP == NULL )
+ {
+ wxMacSetupControlBackgroundUPP = NewControlColorUPP( wxMacSetupControlBackground ) ;
+ }
+
+ // we need a valid font for the encodings
+ wxWindowBase::SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
}
// Destructor
{
SendDestroyEvent();
- // deleting a window while it is shown invalidates the region
- if ( IsShown() ) {
- wxWindowMac* iter = this ;
- while( iter ) {
- if ( iter->IsTopLevel() )
- {
- Refresh() ;
- break ;
- }
- iter = iter->GetParent() ;
-
- }
- }
-
m_isBeingDeleted = TRUE;
#ifndef __WXUNIVERSAL__
}
}
#endif // __WXUNIVERSAL__
+
+ // wxRemoveMacControlAssociation( this ) ;
+ // If we delete an item, we should initialize the parent panel,
+ // because it could now be invalid.
+ wxWindow *parent = GetParent() ;
+ if ( parent )
+ {
+ 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) ;
+ // we currently are not using this hook
+ // ::SetControlColorProc( *m_peer , NULL ) ;
+ m_peer->Dispose() ;
+ }
- if ( s_lastMouseWindow == this )
+ if ( g_MacLastWindow == this )
{
- s_lastMouseWindow = NULL ;
+ g_MacLastWindow = NULL ;
}
wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
frame->SetLastFocus( NULL ) ;
}
- if ( gFocusWindow == this )
- {
- gFocusWindow = NULL ;
- }
-
DestroyChildren();
// delete our drop target if we've got one
delete m_dropTarget;
m_dropTarget = NULL;
}
-#endif // wxUSE_DRAG_AND_DROP
+#endif // wxUSE_DRAG_AND_DROP
+ delete m_peer ;
+}
+
+WXWidget wxWindowMac::GetHandle() const
+{
+ return (WXWidget) m_peer->GetControlRef() ;
+}
+
+
+void wxWindowMac::MacInstallEventHandler( WXWidget control )
+{
+ wxAssociateControlWithMacControl( (ControlRef) control , this ) ;
+ InstallControlEventHandler( (ControlRef) control , GetwxMacWindowEventHandlerUPP(),
+ GetEventTypeCount(eventList), eventList, this,
+ (EventHandlerRef *)&m_macControlEventHandler);
+
+}
+
+// Constructor
+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") );
+
+ if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
+ return FALSE;
+
+ parent->AddChild(this);
+
+ m_windowVariant = parent->GetWindowVariant() ;
+
+ if ( m_macIsUserPane )
+ {
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+ UInt32 features = 0
+ | kControlSupportsEmbedding
+// | kControlSupportsLiveFeedback
+// | kControlHasSpecialBackground
+// | kControlSupportsCalcBestRect
+// | kControlHandlesTracking
+ | kControlSupportsFocus
+// | kControlWantsActivate
+// | kControlWantsIdle
+ ;
+
+ m_peer = new wxMacControl() ;
+ ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
+
+
+ MacPostControlCreate(pos,size) ;
+#if !TARGET_API_MAC_OSX
+ 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) ;
+#endif
+ }
+#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)))
+ {
+ MacCreateScrollBars( style ) ;
+ }
+#endif
+
+ wxWindowCreateEvent event(this);
+ GetEventHandler()->AddPendingEvent(event);
+
+ return TRUE;
+}
+
+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 ) ;
+
+ MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
+
+ ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+ ::EmbedControl( m_peer->GetControlRef() , container ) ;
+
+ // 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) ) ;
+
+ if (!m_macIsUserPane)
+ {
+ SetInitialBestSize(size);
+ }
+
+ SetCursor( *wxSTANDARD_CURSOR ) ;
+}
+
+void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
+{
+ // Don't assert, in case we set the window variant before
+ // the window is created
+ // wxASSERT( m_peer->Ok() ) ;
+
+ m_windowVariant = variant ;
+
+ if (m_peer == NULL || !m_peer->Ok())
+ return;
+
+ ControlSize size ;
+ ThemeFontID themeFont = kThemeSystemFont ;
+
+ // we will get that from the settings later
+ // and make this NORMAL later, but first
+ // we have a few calculations that we must fix
+
+ switch ( variant )
+ {
+ case wxWINDOW_VARIANT_NORMAL :
+ size = kControlSizeNormal;
+ themeFont = kThemeSystemFont ;
+ break ;
+ case wxWINDOW_VARIANT_SMALL :
+ size = kControlSizeSmall;
+ themeFont = kThemeSmallSystemFont ;
+ break ;
+ case wxWINDOW_VARIANT_MINI :
+ if (UMAGetSystemVersion() >= 0x1030 )
+ {
+ // not always defined in the headers
+ size = 3 ;
+ themeFont = 109 ;
+ }
+ else
+ {
+ size = kControlSizeSmall;
+ 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 ) ;
+
+ wxFont font ;
+ font.MacCreateThemeFont( themeFont ) ;
+ SetFont( font ) ;
}
-// Constructor
-bool wxWindowMac::Create(wxWindowMac *parent, wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+void wxWindowMac::MacUpdateControlFont()
{
- wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindowMac without parent") );
+ m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
+ Refresh() ;
+}
-#if wxUSE_STATBOX
- // wxGTK doesn't allow to create controls with static box as the parent so
- // this will result in a crash when the program is ported to wxGTK - warn
- // about it
- //
- // the correct solution is to create the controls as siblings of the
- // static box
- wxASSERT_MSG( !wxDynamicCast(parent, wxStaticBox),
- _T("wxStaticBox can't be used as a window parent!") );
-#endif // wxUSE_STATBOX
+bool wxWindowMac::SetFont(const wxFont& font)
+{
+ bool retval = !wxWindowBase::SetFont( font ) ;
+
+ MacUpdateControlFont() ;
+
+ return retval;
+}
- if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return FALSE;
+bool wxWindowMac::SetForegroundColour(const wxColour& col )
+{
+ if ( !wxWindowBase::SetForegroundColour(col) )
+ return false ;
+
+ MacUpdateControlFont() ;
+
+ return true ;
+}
- parent->AddChild(this);
+bool wxWindowMac::SetBackgroundColour(const wxColour& col )
+{
+ if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
+ return false ;
- m_x = (int)pos.x;
- m_y = (int)pos.y;
- AdjustForParentClientOrigin(m_x, m_y, wxSIZE_USE_EXISTING);
- m_width = WidthDefault( size.x );
- m_height = HeightDefault( size.y ) ;
-#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)))
+ wxBrush brush ;
+ wxColour newCol(GetBackgroundColour());
+ if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
{
- MacCreateScrollBars( style ) ;
+ brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
}
-#endif
+ else if ( newCol == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+ {
+ brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
+ }
+ else
+ {
+ brush.SetColour( newCol ) ;
+ }
+ MacSetBackgroundBrush( brush ) ;
+
+ MacUpdateControlFont() ;
+
+ return true ;
+}
- wxWindowCreateEvent event(this);
- GetEventHandler()->AddPendingEvent(event);
+void wxWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
+{
+ m_macBackgroundBrush = brush ;
+ m_peer->SetBackground( brush ) ;
+}
- return TRUE;
+bool wxWindowMac::MacCanFocus() const
+{
+ // there is currently no way to determine whether the window is running in full keyboard
+ // access mode, therefore we cannot rely on these features, yet the only other way would be
+ // 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 ) ;
+ return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
}
+
void wxWindowMac::SetFocus()
{
- if ( gFocusWindow == this )
- return ;
-
if ( AcceptsFocus() )
{
- if (gFocusWindow )
+
+ wxWindow* former = FindFocus() ;
+ if ( former == this )
+ 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 ;
+
+#if !TARGET_API_MAC_OSX
+ // emulate carbon events when running under carbonlib where they are not natively available
+ if ( former )
{
-#if wxUSE_CARET
- // Deal with caret
- if ( gFocusWindow->m_caret )
- {
- gFocusWindow->m_caret->OnKillFocus();
- }
-#endif // wxUSE_CARET
-#ifndef __WXUNIVERSAL__
- wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
- if ( control && control->GetMacControl() )
- {
- UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNoPart ) ;
- control->MacRedrawControl() ;
- }
-#endif
- // Without testing the window id, for some reason
- // a kill focus event can still be sent to
- // the control just being focussed.
- int thisId = this->m_windowId;
- int gFocusWindowId = gFocusWindow->m_windowId;
- if (gFocusWindowId != thisId)
- {
- wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
- event.SetEventObject(gFocusWindow);
- gFocusWindow->GetEventHandler()->ProcessEvent(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 ) ;
+
+ wxMacWindowEventHandler( NULL , evRef , former ) ;
+ ReleaseEvent(evRef) ;
}
- gFocusWindow = this ;
+ // send new focus event
{
- #if wxUSE_CARET
- // Deal with caret
- if ( m_caret )
- {
- m_caret->OnSetFocus();
- }
- #endif // wxUSE_CARET
- // panel wants to track the window which was the last to have focus in it
- wxChildFocusEvent eventFocus(this);
- GetEventHandler()->ProcessEvent(eventFocus);
-
- #ifndef __WXUNIVERSAL__
- wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ;
- if ( control && control->GetMacControl() )
- {
- UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlFocusNextPart ) ;
- }
- #endif
- wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event) ;
+ EventRef evRef = NULL ;
+ verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
+ &evRef ) );
+
+ wxMacCarbonEvent cEvent( evRef ) ;
+ cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
+ cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
+
+ wxMacWindowEventHandler( NULL , evRef , this ) ;
+ ReleaseEvent(evRef) ;
}
+#endif
}
}
-bool wxWindowMac::Enable(bool enable)
-{
- if ( !wxWindowBase::Enable(enable) )
- return FALSE;
-
- MacSuperEnabled( enable ) ;
-
- return TRUE;
-}
void wxWindowMac::DoCaptureMouse()
{
// TODO
}
-// Get total size
-void wxWindowMac::DoGetSize(int *x, int *y) const
+// Returns the size of the native control. In the case of the toplevel window
+// this is the content area root control
+
+void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
+ int& w, int& h) const
{
- if(x) *x = m_width ;
- if(y) *y = m_height ;
+ Rect bounds ;
+ m_peer->GetRect( &bounds ) ;
+
+
+ x = bounds.left ;
+ y = bounds.top ;
+ w = bounds.right - bounds.left ;
+ h = bounds.bottom - bounds.top ;
}
-void wxWindowMac::DoGetPosition(int *x, int *y) const
+// 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
{
- int xx,yy;
+ // 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
- xx = m_x ;
- yy = m_y ;
- if ( !IsTopLevel() && GetParent())
- {
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx -= pt.x;
- yy -= pt.y;
- }
- if(x) *x = xx;
- if(y) *y = yy;
+ x += MacGetLeftBorderSize() ;
+ y += MacGetTopBorderSize() ;
+ w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+
+ if ( adjustOrigin )
+ AdjustForParentClientOrigin( x , y ) ;
+ return true ;
}
-#if wxUSE_MENUS
-bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
+// Get window size (not client size)
+void wxWindowMac::DoGetSize(int *x, int *y) const
{
- menu->SetInvokingWindow(this);
- menu->UpdateUI();
- ClientToScreen( &x , &y ) ;
+ // take the size of the control and add the borders that have to be drawn outside
+ int x1 , y1 , w1 , h1 ;
- menu->MacBeforeDisplay( true ) ;
- long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
- if ( HiWord(menuResult) != 0 )
+ MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
+
+ w1 += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ h1 += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+
+ if(x) *x = w1 ;
+ if(y) *y = h1 ;
+}
+
+// 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 ) ;
+ x1 -= MacGetLeftBorderSize() ;
+ y1 -= MacGetTopBorderSize() ;
+ // to non-client
+ #if !TARGET_API_MAC_OSX
+ if ( !GetParent()->IsTopLevel() )
{
- MenuCommand id ;
- GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &id ) ;
- wxMenuItem* item = NULL ;
- wxMenu* realmenu ;
- item = menu->FindItem(id, &realmenu) ;
- if (item->IsCheckable())
+ Rect bounds ;
+ GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ;
+ x1 -= bounds.left ;
+ y1 -= bounds.top ;
+ }
+#endif
+ if ( !IsTopLevel() )
+ {
+ wxWindow *parent = GetParent();
+ if ( parent )
{
- item->Check( !item->IsChecked() ) ;
+ // 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 ;
}
- menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
- menu->MacAfterDisplay( true ) ;
-
- menu->SetInvokingWindow(NULL);
-
- return TRUE;
+ if(x) *x = x1 ;
+ if(y) *y = y1 ;
}
-#endif
void wxWindowMac::DoScreenToClient(int *x, int *y) const
{
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
- Point localwhere = {0,0} ;
-
- if(x) localwhere.h = * x ;
- if(y) localwhere.v = * y ;
-
- GrafPtr port ;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( window ) ) ;
- ::GlobalToLocal( &localwhere ) ;
- ::SetPort( port ) ;
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+
+ wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+
+ {
+ Point localwhere = {0,0} ;
- if(x) *x = localwhere.h ;
- if(y) *y = localwhere.v ;
+ if(x) localwhere.h = * x ;
+ if(y) localwhere.v = * y ;
+
+ QDGlobalToLocalPoint( GetWindowPort( window ) , &localwhere ) ;
+ if(x) *x = localwhere.h ;
+ if(y) *y = localwhere.v ;
+ }
MacRootWindowToWindow( x , y ) ;
- if ( x )
- *x -= MacGetLeftBorderSize() ;
- if ( y )
- *y -= MacGetTopBorderSize() ;
+
+ wxPoint origin = GetClientAreaOrigin() ;
+ if(x) *x -= origin.x ;
+ if(y) *y -= origin.y ;
}
void wxWindowMac::DoClientToScreen(int *x, int *y) const
{
- WindowRef window = (WindowRef) MacGetRootWindow() ;
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+ wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
- if ( x )
- *x += MacGetLeftBorderSize() ;
- if ( y )
- *y += MacGetTopBorderSize() ;
+ wxPoint origin = GetClientAreaOrigin() ;
+ 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 ;
-
- GrafPtr port ;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( window ) ) ;
-
- ::LocalToGlobal( &localwhere ) ;
- ::SetPort( port ) ;
- 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
void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
{
- wxPoint origin = GetClientAreaOrigin() ;
MacRootWindowToWindow( x , y ) ;
+
+ wxPoint origin = GetClientAreaOrigin() ;
if(x) *x -= origin.x ;
if(y) *y -= origin.y ;
}
void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
{
+ #if TARGET_API_MAC_OSX
+ wxPoint pt ;
+ if ( x ) pt.x = *x ;
+ if ( y ) pt.y = *y ;
+
+ if ( !IsTopLevel() )
+ {
+ wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+ if (top)
+ {
+ pt.x -= MacGetLeftBorderSize() ;
+ pt.y -= MacGetTopBorderSize() ;
+ wxMacControl::Convert( &pt , m_peer , top->m_peer ) ;
+ }
+ }
+
+ if ( x ) *x = (int) pt.x ;
+ if ( y ) *y = (int) pt.y ;
+ #else
if ( !IsTopLevel() )
{
- if(x) *x += m_x ;
- if(y) *y += m_y ;
- GetParent()->MacWindowToRootWindow( x , y ) ;
+ Rect bounds ;
+ m_peer->GetRect( &bounds ) ;
+ if(x) *x += bounds.left - MacGetLeftBorderSize() ;
+ if(y) *y += bounds.top - MacGetTopBorderSize() ;
}
+#endif
+}
+
+void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
+{
+ int x1 , y1 ;
+ if ( x ) x1 = *x ;
+ if ( y ) y1 = *y ;
+ MacWindowToRootWindow( &x1 , &y1 ) ;
+ if ( x ) *x = x1 ;
+ if ( y ) *y = y1 ;
}
void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
{
+ #if TARGET_API_MAC_OSX
+ wxPoint pt ;
+ 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() ;
+ }
+
+ if ( x ) *x = (int) pt.x ;
+ if ( y ) *y = (int) pt.y ;
+ #else
if ( !IsTopLevel() )
{
- if(x) *x -= m_x ;
- if(y) *y -= m_y ;
- GetParent()->MacRootWindowToWindow( x , y ) ;
+ Rect bounds ;
+ m_peer->GetRect( &bounds ) ;
+ if(x) *x -= bounds.left + MacGetLeftBorderSize() ;
+ if(y) *y -= bounds.top + MacGetTopBorderSize() ;
}
+#endif
}
-bool wxWindowMac::SetCursor(const wxCursor& cursor)
+void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
{
- if (m_cursor == cursor)
- return FALSE;
+ int x1 , y1 ;
+ if ( x ) x1 = *x ;
+ if ( y ) y1 = *y ;
+ MacRootWindowToWindow( &x1 , &y1 ) ;
+ if ( x ) *x = x1 ;
+ if ( y ) *y = y1 ;
+}
- if (wxNullCursor == cursor)
+void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
+{
+ RgnHandle rgn = NewRgn() ;
+ Rect content ;
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
- if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
- return FALSE ;
+ GetRegionBounds( rgn , &content ) ;
+ DisposeRgn( rgn ) ;
}
else
{
- if ( ! wxWindowBase::SetCursor( cursor ) )
- return FALSE ;
+ m_peer->GetRect( &content ) ;
}
+ 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 ;
+}
- wxASSERT_MSG( m_cursor.Ok(),
- wxT("cursor must be valid after call to the base version"));
-
- Point pt ;
- wxWindowMac *mouseWin ;
- GetMouse( &pt ) ;
+wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const
+{
+ wxSize sizeTotal = size;
- // Change the cursor NOW if we're within the correct window
+ RgnHandle rgn = NewRgn() ;
- if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
+ Rect content ;
+
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
- if ( mouseWin == this && !wxIsBusy() )
- {
- m_cursor.MacInstall() ;
- }
+ GetRegionBounds( rgn , &content ) ;
+ DisposeRgn( rgn ) ;
+ }
+ else
+ {
+ m_peer->GetRect( &content ) ;
}
+ Rect structure ;
+ m_peer->GetRect( &structure ) ;
+#if !TARGET_API_MAC_OSX
+ OffsetRect( &content , -structure.left , -structure.top ) ;
+#endif
- return TRUE ;
+ sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
+ sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ;
+
+ sizeTotal.x += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
+ sizeTotal.y += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ;
+
+ return sizeTotal;
}
void wxWindowMac::DoGetClientSize(int *x, int *y) const
{
int ww, hh;
- ww = m_width ;
- hh = m_height ;
+ RgnHandle rgn = NewRgn() ;
+ Rect content ;
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
+ {
+ GetRegionBounds( rgn , &content ) ;
+ DisposeRgn( rgn ) ;
+ }
+ else
+ {
+ m_peer->GetRect( &content ) ;
+ }
+#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 = m_width ;
- int h = m_height ;
-
+ int w ;
+ int h ;
+ GetSize( &w , &h ) ;
+
MacClientToRootWindow( &x1 , &y1 ) ;
MacClientToRootWindow( &w , &h ) ;
{
if ( iter->IsTopLevel() )
{
- totW = iter->m_width ;
- totH = iter->m_height ;
+ iter->GetSize( &totW , &totH ) ;
break ;
}
iter = iter->GetParent() ;
}
- if (m_hScrollBar && m_hScrollBar->IsShown() )
- {
- hh -= MAC_SCROLLBAR_SIZE;
- if ( h-y1 >= totH )
- {
- hh += 1 ;
- }
- }
- if (m_vScrollBar && m_vScrollBar->IsShown() )
+ 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 ;
+ }
+ if (m_vScrollBar && m_vScrollBar->IsShown() )
+ {
+ ww -= m_vScrollBar->GetSize().x ; // MAC_SCROLLBAR_SIZE;
+ }
+ if(x) *x = ww;
+ if(y) *y = hh;
+
+}
+
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
+{
+ if (m_cursor == cursor)
+ return FALSE;
+
+ if (wxNullCursor == cursor)
+ {
+ if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+ return FALSE ;
+ }
+ else
+ {
+ if ( ! wxWindowBase::SetCursor( cursor ) )
+ 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() ;
+ CGrafPtr savePort ;
+ Boolean swapped = QDSwapPort( GetWindowPort( window ) , &savePort ) ;
+
+ // 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 ) ;
+ if ( control )
+ mouseWin = wxFindControlFromMacControl( control ) ;
+
+ if ( swapped )
+ QDSwapPort( savePort , NULL ) ;
+ }
+
+ if ( mouseWin == this && !wxIsBusy() )
+ {
+ m_cursor.MacInstall() ;
+ }
+
+ return TRUE ;
+}
+
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+ menu->SetInvokingWindow(this);
+ menu->UpdateUI();
+
+ if ( x == -1 && y == -1 )
+ {
+ wxPoint mouse = wxGetMousePosition();
+ x = mouse.x; y = mouse.y;
+ }
+ else
+ {
+ ClientToScreen( &x , &y ) ;
+ }
+
+ menu->MacBeforeDisplay( true ) ;
+ 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) ;
+ if (item->IsCheckable())
{
- ww -= MAC_SCROLLBAR_SIZE;
- if ( w-x1 >= totW )
- {
- ww += 1 ;
- }
+ item->Check( !item->IsChecked() ) ;
}
+ menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
- if(x) *x = ww;
- if(y) *y = hh;
-}
+ menu->MacAfterDisplay( true ) ;
+ menu->SetInvokingWindow(NULL);
+
+ return TRUE;
+}
+#endif
// ----------------------------------------------------------------------------
// tooltips
void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{
- int former_x = m_x ;
- int former_y = m_y ;
- int former_w = m_width ;
- int former_h = m_height ;
+ // this is never called for a toplevel window, so we know we have a parent
+ int former_x , former_y , former_w, former_h ;
+
+ // Get true coordinates of former position
+ DoGetPosition( &former_x , &former_y ) ;
+ DoGetSize( &former_w , &former_h ) ;
+
+ wxWindow *parent = GetParent();
+ if ( parent )
+ {
+ wxPoint pt(parent->GetClientAreaOrigin());
+ former_x += pt.x ;
+ former_y += pt.y ;
+ }
int actualWidth = width;
int actualHeight = height;
if ( doMove || doResize )
{
- // erase former position
-
- bool partialRepaint = false ;
-
- if ( !HasFlag(wxFULL_REPAINT_ON_RESIZE) )
+ // we don't adjust twice for the origin
+ Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
+#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() )
{
- wxPoint oldPos( m_x , m_y ) ;
- wxPoint newPos( actualX , actualY ) ;
- MacWindowToRootWindow( &oldPos.x , &oldPos.y ) ;
- MacWindowToRootWindow( &newPos.x , &newPos.y ) ;
- if ( oldPos == newPos )
- {
- partialRepaint = true ;
- RgnHandle oldRgn,newRgn,diffRgn ;
- oldRgn = NewRgn() ;
- newRgn = NewRgn() ;
- diffRgn = NewRgn() ;
-
- // invalidate the differences between the old and the new area
-
- SetRectRgn(oldRgn , oldPos.x , oldPos.y , oldPos.x + m_width , oldPos.y + m_height ) ;
- SetRectRgn(newRgn , newPos.x , newPos.y , newPos.x + actualWidth , newPos.y + actualHeight ) ;
- DiffRgn( newRgn , oldRgn , diffRgn ) ;
- InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
- DiffRgn( oldRgn , newRgn , diffRgn ) ;
- InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
-
- // we also must invalidate the border areas, someone might optimize this one day to invalidate only the really
- // changing pixels...
-
- if ( MacGetLeftBorderSize() != 0 || MacGetRightBorderSize() != 0 ||
- MacGetTopBorderSize() != 0 || MacGetBottomBorderSize() != 0 )
- {
- RgnHandle innerOldRgn, innerNewRgn ;
- innerOldRgn = NewRgn() ;
- innerNewRgn = NewRgn() ;
-
- SetRectRgn(innerOldRgn , oldPos.x + MacGetLeftBorderSize() , oldPos.y + MacGetTopBorderSize() ,
- oldPos.x + m_width - MacGetRightBorderSize() , oldPos.y + m_height - MacGetBottomBorderSize() ) ;
- DiffRgn( oldRgn , innerOldRgn , diffRgn ) ;
- InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
-
- SetRectRgn(innerNewRgn , newPos.x + MacGetLeftBorderSize() , newPos.y + MacGetTopBorderSize() ,
- newPos.x + actualWidth - MacGetRightBorderSize() , newPos.y + actualHeight - MacGetBottomBorderSize() ) ;
- DiffRgn( newRgn , innerNewRgn , diffRgn ) ;
- InvalWindowRgn( (WindowRef) MacGetRootWindow() , diffRgn ) ;
-
- DisposeRgn( innerOldRgn ) ;
- DisposeRgn( innerNewRgn ) ;
- }
-
- DisposeRgn(oldRgn) ;
- DisposeRgn(newRgn) ;
- DisposeRgn(diffRgn) ;
- }
+ r.left -= GetParent()->MacGetLeftBorderSize() ;
+ r.top -= GetParent()->MacGetTopBorderSize() ;
+ r.right -= GetParent()->MacGetLeftBorderSize() ;
+ r.bottom -= GetParent()->MacGetTopBorderSize() ;
}
+#endif
+ bool vis = m_peer->IsVisible();
+
+ int outerBorder = MacGetLeftBorderSize() ;
+ if ( m_peer->NeedsFocusRect() && m_peer->HasFocus() )
+ outerBorder = 4 ;
- if ( !partialRepaint )
- Refresh() ;
-
- m_x = actualX ;
- m_y = actualY ;
- m_width = actualWidth ;
- m_height = actualHeight ;
-
- // update any low-level frame-relative positions
+ 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);
+ GetParent()->MacWindowToRootWindow( &parent.x , &parent.y ) ;
+ parent -= GetParent()->GetClientAreaOrigin() ;
+ OffsetRgn( updateOuter , -parent.x , -parent.y ) ;
+ CopyRgn( updateOuter , updateTotal ) ;
+
+ rect = r ;
+ RectRgn( updateInner , &rect ) ;
+ InsetRect( &rect , -outerBorder , -outerBorder ) ;
+ RectRgn( updateOuter , &rect ) ;
+ DiffRgn( updateOuter , updateInner ,updateOuter ) ;
+ wxPoint parentorig(0,0);
+ GetParent()->MacWindowToRootWindow( &parentorig.x , &parentorig.y ) ;
+ parent -= GetParent()->GetClientAreaOrigin() ;
+ OffsetRgn( updateOuter , -parentorig.x , -parentorig.y ) ;
+ UnionRgn( updateOuter , updateTotal , updateTotal ) ;
+
+ GetParent()->m_peer->SetNeedsDisplay( true , updateTotal ) ;
+ DisposeRgn(updateOuter) ;
+ DisposeRgn(updateInner) ;
+ DisposeRgn(updateTotal) ;
+ }
- MacUpdateDimensions() ;
- // erase new position
+ // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
+ if ( vis )
+ m_peer->SetVisibility( false , true ) ;
- if ( !partialRepaint )
- Refresh() ;
- if ( doMove )
- wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+ m_peer->SetRect( &r ) ;
+ if ( vis )
+ m_peer->SetVisibility( true , true ) ;
MacRepositionScrollBars() ;
if ( doMove )
{
- wxPoint point(m_x, m_y);
+ wxPoint point(actualX,actualY);
wxMoveEvent event(point, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event) ;
if ( doResize )
{
MacRepositionScrollBars() ;
- wxSize size(m_width, m_height);
+ wxSize size(actualWidth, actualHeight);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
}
+wxSize wxWindowMac::DoGetBestSize() const
+{
+ if ( m_macIsUserPane || IsTopLevel() )
+ return wxWindowBase::DoGetBestSize() ;
+
+ Rect bestsize = { 0 , 0 , 0 , 0 } ;
+ int bestWidth, bestHeight ;
+ m_peer->GetBestRect( &bestsize ) ;
+
+ if ( EmptyRect( &bestsize ) )
+ {
+ bestsize.left = bestsize.top = 0 ;
+ bestsize.right = 16 ;
+ bestsize.bottom = 16 ;
+ if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+ {
+ bestsize.bottom = 16 ;
+ }
+ else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+ {
+ bestsize.bottom = 24 ;
+ }
+ else
+ {
+ // return wxWindowBase::DoGetBestSize() ;
+ }
+ }
+
+ bestWidth = bestsize.right - bestsize.left ;
+ bestHeight = bestsize.bottom - bestsize.top ;
+ if ( bestHeight < 10 )
+ bestHeight = 13 ;
+
+ 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
// ... and don't do anything (avoiding flicker) if it's already ok
if ( x == currentX && y == currentY &&
- width == currentW && height == currentH )
+ width == currentW && height == currentH && ( height != -1 && width != -1 ) )
{
+ // TODO REMOVE
MacRepositionScrollBars() ; // we might have a real position shift
return;
}
DoMoveWindow(x, y, width, height);
}
-// For implementation purposes - sometimes decorations make the client area
-// smaller
wxPoint wxWindowMac::GetClientAreaOrigin() const
{
- return wxPoint(MacGetLeftBorderSize( ) , MacGetTopBorderSize( ) );
+ 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 ) )
+ {
+ Rect structure ;
+ m_peer->GetRect( &structure ) ;
+ OffsetRect( &content , -structure.left , -structure.top ) ;
+ }
+#endif
+
+ return wxPoint( content.left + MacGetLeftBorderSize( ) , content.top + MacGetTopBorderSize( ) );
+}
+
+void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
+{
+ if ( clientheight != -1 || clientheight != -1 )
+ {
+ int currentclientwidth , currentclientheight ;
+ int currentwidth , currentheight ;
+
+ GetClientSize( ¤tclientwidth , ¤tclientheight ) ;
+ GetSize( ¤twidth , ¤theight ) ;
+
+ DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+ currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
+ }
}
void wxWindowMac::SetTitle(const wxString& title)
{
- m_label = title ;
+ m_label = wxStripMenuCodes(title) ;
+
+ if ( m_peer && m_peer->Ok() )
+ {
+ m_peer->SetTitle( m_label ) ;
+ }
+ Refresh() ;
}
wxString wxWindowMac::GetTitle() const
{
if ( !wxWindowBase::Show(show) )
return FALSE;
+
+ // TODO use visibilityChanged Carbon Event for OSX
+ bool former = MacIsReallyShown() ;
+
+ m_peer->SetVisibility( show , true ) ;
+ if ( former != MacIsReallyShown() )
+ MacPropagateVisibilityChanged() ;
+ return TRUE;
+}
+
+bool wxWindowMac::Enable(bool enable)
+{
+ wxASSERT( m_peer->Ok() ) ;
+ if ( !wxWindowBase::Enable(enable) )
+ return FALSE;
- MacSuperShown( show ) ;
- Refresh() ;
+ bool former = MacIsReallyEnabled() ;
+ m_peer->Enable( enable ) ;
+ if ( former != MacIsReallyEnabled() )
+ MacPropagateEnabledStateChanged() ;
return TRUE;
}
-void wxWindowMac::MacSuperShown( bool show )
+//
+// status change propagations (will be not necessary for OSX later )
+//
+
+void wxWindowMac::MacPropagateVisibilityChanged()
{
+#if !TARGET_API_MAC_OSX
+ MacVisibilityChanged() ;
+
wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
wxWindowMac *child = node->GetData();
- if ( child->m_isShown )
- child->MacSuperShown( show ) ;
+ if ( child->IsShown() )
+ child->MacPropagateVisibilityChanged( ) ;
node = node->GetNext();
}
+#endif
}
-void wxWindowMac::MacSuperEnabled( bool enabled )
+void wxWindowMac::MacPropagateEnabledStateChanged( )
{
- if ( !IsTopLevel() )
+#if !TARGET_API_MAC_OSX
+ MacEnabledStateChanged() ;
+
+ wxWindowListNode *node = GetChildren().GetFirst();
+ while ( node )
{
- // to be absolutely correct we'd have to invalidate (with eraseBkground
- // because unter MacOSX the frames are drawn with an addXXX mode)
- // the borders area
+ wxWindowMac *child = node->GetData();
+ if ( child->IsEnabled() )
+ child->MacPropagateEnabledStateChanged() ;
+ node = node->GetNext();
}
+#endif
+}
+
+void wxWindowMac::MacPropagateHiliteChanged( )
+{
+#if !TARGET_API_MAC_OSX
+ MacHiliteChanged() ;
+
wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->GetData();
- if ( child->m_isShown )
- child->MacSuperEnabled( enabled ) ;
+ wxWindowMac *child = node->GetData();
+ // if ( child->IsEnabled() )
+ child->MacPropagateHiliteChanged() ;
node = node->GetNext();
}
+#endif
+}
+
+//
+// status change notifications
+//
+
+void wxWindowMac::MacVisibilityChanged()
+{
}
-bool wxWindowMac::MacIsReallyShown() const
+void wxWindowMac::MacHiliteChanged()
{
- if ( m_isShown && (m_parent != NULL) ) {
- return m_parent->MacIsReallyShown();
- }
- return m_isShown;
-/*
- bool status = m_isShown ;
- wxWindowMac * win = this ;
- while ( status && win->m_parent != NULL )
+}
+
+void wxWindowMac::MacEnabledStateChanged()
+{
+}
+
+//
+// status queries on the inherited window's state
+//
+
+bool wxWindowMac::MacIsReallyShown()
+{
+ // only under OSX the visibility of the TLW is taken into account
+#if TARGET_API_MAC_OSX
+ if ( m_peer && m_peer->Ok() )
+ return m_peer->IsVisible();
+#endif
+ wxWindow* win = this ;
+ while( win->IsShown() )
{
- win = win->m_parent ;
- status = win->m_isShown ;
- }
- return status ;
-*/
+ if ( win->IsTopLevel() )
+ return true ;
+
+ win = win->GetParent() ;
+ if ( win == NULL )
+ return true ;
+
+ } ;
+ return false ;
+}
+
+bool wxWindowMac::MacIsReallyEnabled()
+{
+ return m_peer->IsEnabled() ;
}
+bool wxWindowMac::MacIsReallyHilited()
+{
+ return m_peer->IsActive();
+}
+
+void wxWindowMac::MacFlashInvalidAreas()
+{
+#if TARGET_API_MAC_OSX
+ HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ;
+#endif
+}
+
+//
+//
+//
+
int wxWindowMac::GetCharHeight() const
{
wxClientDC dc ( (wxWindowMac*)this ) ;
void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
+ 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 ( m_peer->IsVisible())
+ {
+ m_peer->SetVisibility( false , false ) ;
+ m_peer->SetVisibility( true , true ) ;
+ }
+ /*
if ( MacGetTopLevelWindow() == NULL )
return ;
- if ( !MacIsReallyShown() )
+ if ( !m_peer->IsVisible())
return ;
wxPoint client = GetClientAreaOrigin();
MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
}
+ */
+#endif
+}
+
+void wxWindowMac::Freeze()
+{
+#if TARGET_API_MAC_OSX
+ if ( !m_frozenness++ )
+ {
+ m_peer->SetDrawingEnabled( false ) ;
+ }
+#endif
+}
+
+
+void wxWindowMac::Thaw()
+{
+#if TARGET_API_MAC_OSX
+ wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
+
+ if ( !--m_frozenness )
+ {
+ m_peer->SetDrawingEnabled( true ) ;
+ m_peer->InvalidateWithChildren() ;
+ }
+#endif
+}
+
+void wxWindowMac::MacRedrawControl()
+{
+/*
+ if ( *m_peer && MacGetTopLevelWindowRef() && m_peer->IsVisible())
+ {
+#if TARGET_API_MAC_CARBON
+ Update() ;
+#else
+ wxClientDC dc(this) ;
+ wxMacPortSetter helper(&dc) ;
+ wxMacWindowClipper clipper(this) ;
+ wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
+ UMADrawControl( *m_peer ) ;
+#endif
+ }
+*/
+}
+
+/* TODO
+void wxWindowMac::OnPaint(wxPaintEvent& event)
+{
+ // why don't we skip that here ?
}
+*/
wxWindowMac *wxGetActiveWindow()
{
// We really don't move the mouse programmatically under Mac.
}
-const wxBrush& wxWindowMac::MacGetBackgroundBrush()
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
{
- if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
+#if TARGET_API_MAC_OSX
+ if ( m_macBackgroundBrush.Ok() == false || m_macBackgroundBrush.GetStyle() == wxTRANSPARENT )
{
- m_macBackgroundBrush.SetMacTheme( kThemeBrushDocumentWindowBackground ) ;
- }
- else if ( m_backgroundColour == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
- {
- // on mac we have the difficult situation, that 3dface gray can be different colours, depending whether
- // it is on a notebook panel or not, in order to take care of that we walk up the hierarchy until we have
- // either a non gray background color or a non control window
-
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
- wxWindowMac* parent = GetParent() ;
- while( parent )
- {
- if ( parent->MacGetRootWindow() != window )
- {
- // we are in a different window on the mac system
- parent = NULL ;
- break ;
- }
-
- {
- if ( parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE )
- && parent->m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
- {
- // if we have any other colours in the hierarchy
- m_macBackgroundBrush.SetColour( parent->m_backgroundColour ) ;
- break ;
- }
- // if we have the normal colours in the hierarchy but another control etc. -> use it's background
- if ( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
- {
- Rect extent = { 0 , 0 , 0 , 0 } ;
- int x , y ;
- x = y = 0 ;
- wxSize size = parent->GetSize() ;
- parent->MacClientToRootWindow( &x , &y ) ;
- extent.left = x ;
- extent.top = y ;
- extent.top-- ;
- extent.right = x + size.x ;
- extent.bottom = y + size.y ;
- m_macBackgroundBrush.SetMacThemeBackground( kThemeBackgroundTabPane , (WXRECTPTR) &extent ) ; // todo eventually change for inactive
- break ;
- }
- }
- parent = parent->GetParent() ;
- }
- if ( !parent )
- {
- m_macBackgroundBrush.SetMacTheme( kThemeBrushDialogBackgroundActive ) ; // todo eventually change for inactive
- }
+ event.Skip() ;
}
else
- {
- m_macBackgroundBrush.SetColour( m_backgroundColour ) ;
- }
-
- return m_macBackgroundBrush ;
-}
-
-void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
-{
- event.GetDC()->Clear() ;
+#endif
+ event.GetDC()->Clear() ;
}
void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
{
- wxWindowDC dc(this) ;
- wxMacPortSetter helper(&dc) ;
-
- MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
+ event.Skip() ;
}
int wxWindowMac::GetScrollPos(int orient) const
if( IsTopLevel() )
return ;
- int major,minor;
- wxGetOsVersion( &major, &minor );
+ Rect rect ;
+ m_peer->GetRect( &rect ) ;
+ InsetRect( &rect, -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
- RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
- RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
-
- RGBColor darkShadow = { 0x0000, 0x0000 , 0x0000 } ;
- RGBColor lightShadow = { 0x4444, 0x4444 , 0x4444 } ;
- // OS X has lighter border edges than classic:
- if (major >= 10)
- {
- darkShadow.red = 0x8E8E;
- darkShadow.green = 0x8E8E;
- darkShadow.blue = 0x8E8E;
- lightShadow.red = 0xBDBD;
- lightShadow.green = 0xBDBD;
- lightShadow.blue = 0xBDBD;
- }
+ if ( !IsTopLevel() )
+ {
+ wxTopLevelWindowMac* top = MacGetTopLevelWindow();
+ if (top)
+ {
+ 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 ;
+ }
+ }
- PenNormal() ;
-
if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
- {
-#if wxMAC_USE_THEME_BORDER
- Rect rect = { top , left , m_height + top , m_width + left } ;
- SInt32 border = 0 ;
- /*
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
- InsetRect( &rect , border , border );
- DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
- */
-
- DrawThemePrimaryGroup(&rect ,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
-#else
- bool sunken = HasFlag( wxSUNKEN_BORDER ) ;
- RGBForeColor( &face );
- MoveTo( left + 0 , top + m_height - 2 );
- LineTo( left + 0 , top + 0 );
- LineTo( left + m_width - 2 , top + 0 );
-
- MoveTo( left + 2 , top + m_height - 3 );
- LineTo( left + m_width - 3 , top + m_height - 3 );
- LineTo( left + m_width - 3 , top + 2 );
-
- RGBForeColor( sunken ? &face : &darkShadow );
- MoveTo( left + 0 , top + m_height - 1 );
- LineTo( left + m_width - 1 , top + m_height - 1 );
- LineTo( left + m_width - 1 , top + 0 );
-
- RGBForeColor( sunken ? &lightShadow : &white );
- MoveTo( left + 1 , top + m_height - 3 );
- LineTo( left + 1, top + 1 );
- LineTo( left + m_width - 3 , top + 1 );
-
- RGBForeColor( sunken ? &white : &lightShadow );
- MoveTo( left + 1 , top + m_height - 2 );
- LineTo( left + m_width - 2 , top + m_height - 2 );
- LineTo( left + m_width - 2 , top + 1 );
-
- RGBForeColor( sunken ? &darkShadow : &face );
- MoveTo( left + 2 , top + m_height - 4 );
- LineTo( left + 2 , top + 2 );
- LineTo( left + m_width - 4 , top + 2 );
-#endif
+ {
+ Rect srect = rect ;
+ SInt32 border = 0 ;
+ GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+ InsetRect( &srect , border , border );
+ DrawThemeEditTextFrame(&srect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
}
else if (HasFlag(wxSIMPLE_BORDER))
{
- Rect rect = { top , left , m_height + top , m_width + left } ;
- RGBForeColor( &darkShadow ) ;
- FrameRect( &rect ) ;
+ Rect srect = rect ;
+ SInt32 border = 0 ;
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+ InsetRect( &srect , border , border );
+ DrawThemeListBoxFrame(&rect,IsEnabled() ? kThemeStateActive : kThemeStateInactive) ;
}
}
{
- wxClientDC dc(this) ;
- wxMacPortSetter helper(&dc) ;
int width , height ;
GetClientSize( &width , &height ) ;
-
- Rect scrollrect = { dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , dc.YLOG2DEVMAC(height) , dc.XLOG2DEVMAC(width) } ;
- RgnHandle updateRgn = NewRgn() ;
- ClipRect( &scrollrect ) ;
- if ( rect )
+#if TARGET_API_MAC_OSX
+ // 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 ) ;
+ if ( rect )
{
- Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
- dc.XLOG2DEVMAC(rect->x + rect->width) } ;
- SectRect( &scrollrect , &r , &scrollrect ) ;
+ scrollrect.Intersect( *rect ) ;
}
- ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
- // we also have to scroll the update rgn in this rectangle
- // in order not to loose updates
- WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
- RgnHandle formerUpdateRgn = NewRgn() ;
- RgnHandle scrollRgn = NewRgn() ;
- RectRgn( scrollRgn , &scrollrect ) ;
- GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
- Point pt = {0,0} ;
- LocalToGlobal( &pt ) ;
- OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
- SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
- if ( !EmptyRgn( formerUpdateRgn ) )
+ if ( m_peer->GetNeedsDisplay() )
{
- MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
- SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
- InvalWindowRgn(rootWindow , formerUpdateRgn ) ;
+ // becuase 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 ) ;
+#else
+ // this would be the preferred version for fast drawing controls
+ if( UMAGetSystemVersion() < 0x1030 )
+ Update() ;
+ else
+ HIViewRender(m_peer->GetControlRef()) ;
+#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 ) ;
+#else
+
+ wxPoint pos;
+ 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() ;
+ scrollrect.bottom = scrollrect.top + height ;
+ scrollrect.right = scrollrect.left + width ;
+
+ if ( rect )
+ {
+ Rect r = { dc.YLOG2DEVMAC(rect->y) , dc.XLOG2DEVMAC(rect->x) , dc.YLOG2DEVMAC(rect->y + rect->height) ,
+ dc.XLOG2DEVMAC(rect->x + rect->width) } ;
+ SectRect( &scrollrect , &r , &scrollrect ) ;
+ }
+ ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
}
- InvalWindowRgn(rootWindow , updateRgn ) ;
- DisposeRgn( updateRgn ) ;
- DisposeRgn( formerUpdateRgn ) ;
- DisposeRgn( scrollRgn ) ;
+ // ScrollWindowRect( (WindowRef) MacGetTopLevelWindowRef() , &scrollrect , dx , dy , kScrollWindowInvalidate, updateRgn ) ;
+#endif
}
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
child->GetPosition( &x, &y );
int w,h;
child->GetSize( &w, &h );
- child->SetSize( x+dx, y+dy, w, h );
+ if (rect)
+ {
+ 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 );
+ }
}
-
- Update() ;
-
}
void wxWindowMac::MacOnScroll(wxScrollEvent &event )
// Get the window with the focus
wxWindowMac *wxWindowBase::FindFocus()
{
- return gFocusWindow ;
+ ControlRef control ;
+ GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+ return wxFindControlFromMacControl( control ) ;
}
void wxWindowMac::OnSetFocus(wxFocusEvent& event)
//wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus);
- event.Skip();
-}
+ if ( MacGetTopLevelWindow() && m_peer->NeedsFocusRect() )
+ {
+ wxMacWindowStateSaver sv( this ) ;
-// Setup background and foreground colours correctly
-void wxWindowMac::SetupColours()
-{
- if ( GetParent() )
- SetBackgroundColour(GetParent()->GetBackgroundColour());
+ int w , h ;
+ int x , y ;
+ x = y = 0 ;
+ MacWindowToRootWindow( &x , &y ) ;
+ GetSize( &w , &h ) ;
+ Rect rect = {y , x , h + y , w + x } ;
+
+ if ( event.GetEventType() == wxEVT_SET_FOCUS )
+ DrawThemeFocusRect( &rect , true ) ;
+ else
+ {
+ 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
+ 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) ;
+ }
+ }
+
+ event.Skip();
}
void wxWindowMac::OnInternalIdle()
// Raise the window to the top of the Z order
void wxWindowMac::Raise()
{
+ m_peer->SetZOrder( true , NULL ) ;
}
// Lower the window to the bottom of the Z order
void wxWindowMac::Lower()
{
+ m_peer->SetZOrder( false , NULL ) ;
}
-void wxWindowMac::DoSetClientSize(int width, int height)
-{
- if ( width != -1 || height != -1 )
- {
-
- if ( width != -1 && m_vScrollBar )
- width += MAC_SCROLLBAR_SIZE ;
- if ( height != -1 && m_vScrollBar )
- height += MAC_SCROLLBAR_SIZE ;
-
- width += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
- height += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ;
-
- DoSetSize( -1 , -1 , width , height ) ;
- }
-}
-
-
-wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
-
-bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
-{
- if ( IsTopLevel() )
- {
- if ((point.x < 0) || (point.y < 0) ||
- (point.x > (m_width)) || (point.y > (m_height)))
- return FALSE;
- }
- else
- {
- if ((point.x < m_x) || (point.y < m_y) ||
- (point.x > (m_x + m_width)) || (point.y > (m_y + m_height)))
- return FALSE;
- }
-
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
- wxPoint newPoint( point ) ;
-
- if ( !IsTopLevel() )
- {
- newPoint.x -= m_x;
- newPoint.y -= m_y;
- }
-
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *child = node->GetData();
- // added the m_isShown test --dmazzoni
- if ( child->MacGetRootWindow() == window && child->m_isShown )
- {
- if (child->MacGetWindowFromPointSub(newPoint , outWin ))
- return TRUE;
- }
- }
-
- *outWin = this ;
- return TRUE;
-}
-
-bool wxWindowMac::MacGetWindowFromPoint( const wxPoint &screenpoint , wxWindowMac** outWin )
-{
- WindowRef window ;
-
- Point pt = { screenpoint.y , screenpoint.x } ;
- if ( ::FindWindow( pt , &window ) == 3 )
- {
-
- wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
- if ( win )
- {
- // No, this yields the CLIENT are, we need the whole frame. RR.
- // point = win->ScreenToClient( point ) ;
-
- GrafPtr port;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( window ) ) ;
- ::GlobalToLocal( &pt ) ;
- ::SetPort( port ) ;
-
- wxPoint point( pt.h, pt.v ) ;
- return win->MacGetWindowFromPointSub( point , outWin ) ;
- }
- }
- return FALSE ;
-}
-
-static wxWindow *gs_lastWhich = NULL;
+// static wxWindow *gs_lastWhich = NULL;
bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
{
return cursor.Ok() ;
}
-bool wxWindowMac::MacDispatchMouseEvent(wxMouseEvent& event)
-{
- if ((event.m_x < m_x) || (event.m_y < m_y) ||
- (event.m_x > (m_x + m_width)) || (event.m_y > (m_y + m_height)))
- return FALSE;
-
-
- if ( IsKindOf( CLASSINFO ( wxStaticBox ) ) /* || IsKindOf( CLASSINFO( wxSpinCtrl ) ) */)
- return FALSE ;
-
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
- event.m_x -= m_x;
- event.m_y -= m_y;
-
- int x = event.m_x ;
- int y = event.m_y ;
-
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *child = node->GetData();
- if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
- {
- if (child->MacDispatchMouseEvent(event))
- return TRUE;
- }
- }
-
- wxWindow* cursorTarget = this ;
- wxPoint cursorPoint( x , y ) ;
-
- while( cursorTarget && !cursorTarget->MacSetupCursor( cursorPoint ) )
- {
- cursorTarget = cursorTarget->GetParent() ;
- if ( cursorTarget )
- cursorPoint += cursorTarget->GetPosition() ;
- }
- event.m_x = x ;
- event.m_y = y ;
- event.SetEventObject( this ) ;
-
- if ( event.GetEventType() == wxEVT_LEFT_DOWN )
- {
- // set focus to this window
- if (AcceptsFocus() && FindFocus()!=this)
- SetFocus();
- }
-
-#if wxUSE_TOOLTIPS
- if ( event.GetEventType() == wxEVT_MOTION
- || event.GetEventType() == wxEVT_ENTER_WINDOW
- || event.GetEventType() == wxEVT_LEAVE_WINDOW )
- wxToolTip::RelayEvent( this , event);
-#endif // wxUSE_TOOLTIPS
-
- if (gs_lastWhich != this)
- {
- gs_lastWhich = this;
-
- // Double clicks must always occur on the same window
- if (event.GetEventType() == wxEVT_LEFT_DCLICK)
- event.SetEventType( wxEVT_LEFT_DOWN );
- if (event.GetEventType() == wxEVT_RIGHT_DCLICK)
- event.SetEventType( wxEVT_RIGHT_DOWN );
-
- // Same for mouse up events
- if (event.GetEventType() == wxEVT_LEFT_UP)
- return TRUE;
- if (event.GetEventType() == wxEVT_RIGHT_UP)
- return TRUE;
- }
-
- GetEventHandler()->ProcessEvent( event ) ;
-
- return TRUE;
-}
-
wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
{
if ( m_tooltip )
void wxWindowMac::Update()
{
- wxRegion visRgn = MacGetVisibleRegion( false ) ;
- int top = 0 , left = 0 ;
- MacWindowToRootWindow( &left , &top ) ;
- WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
- RgnHandle updateRgn = NewRgn() ;
- // getting the update region in macos local coordinates
- GetWindowUpdateRgn( rootWindow , updateRgn ) ;
- GrafPtr port ;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( rootWindow ) ) ;
- Point pt = {0,0} ;
- LocalToGlobal( &pt ) ;
- ::SetPort( port ) ;
- OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
- // translate to window local coordinates
- OffsetRgn( updateRgn , -left , -top ) ;
- SectRgn( updateRgn , (RgnHandle) visRgn.GetWXHRGN() , updateRgn ) ;
- MacRedraw( updateRgn , 0 , true ) ;
- // for flushing and validating we need macos-local coordinates again
- OffsetRgn( updateRgn , left , top ) ;
-#if TARGET_API_MAC_CARBON
- if ( QDIsPortBuffered( GetWindowPort( rootWindow ) ) )
+#if TARGET_API_MAC_OSX
+ WindowRef window = (WindowRef)MacGetTopLevelWindowRef() ;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3
+ // for composited windows this also triggers a redraw of all
+ // invalid views in the window
+ if( UMAGetSystemVersion() >= 0x1030 )
+ HIWindowFlush(window) ;
+ else
+#endif
{
- QDFlushPortBuffer( GetWindowPort( rootWindow ) , updateRgn ) ;
+ // 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 ) ;
}
+#else
+ ::Draw1Control( m_peer->GetControlRef() ) ;
#endif
- ValidWindowRgn( rootWindow , updateRgn ) ;
- DisposeRgn( updateRgn ) ;
}
wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
{
wxTopLevelWindowMac* win = NULL ;
- WindowRef window = (WindowRef) MacGetRootWindow() ;
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
if ( window )
{
win = wxFindWinFromMacWindow( window ) ;
}
return win ;
}
-
-const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )
+wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
{
+ // 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() ;
- RgnHandle tempStaticBoxRgn = NewRgn() ;
-
- SetRectRgn( visRgn , 0 , 0 , m_width , m_height ) ;
-
- //TODO : as soon as the new scheme has proven to work correctly, move this to wxStaticBox
- if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
- {
- int borderTop = 14 ;
- int borderOther = 4 ;
-
- SetRectRgn( tempStaticBoxRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
- DiffRgn( visRgn , tempStaticBoxRgn , visRgn ) ;
- }
-
- if ( !IsTopLevel() )
+ if ( m_peer->IsVisible())
{
- wxWindow* parent = GetParent() ;
- while( parent )
+ m_peer->GetRect( &r ) ;
+ r.left -= MacGetLeftBorderSize() ;
+ r.top -= MacGetTopBorderSize() ;
+ r.bottom += MacGetBottomBorderSize() ;
+ r.right += MacGetRightBorderSize() ;
+
+ if (! MacGetTopLevelWindow()->MacUsesCompositing() )
{
- wxSize size = parent->GetSize() ;
- int x , y ;
- x = y = 0 ;
- parent->MacWindowToRootWindow( &x, &y ) ;
- MacRootWindowToWindow( &x , &y ) ;
-
- SetRectRgn( tempRgn ,
- x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
- x + size.x - parent->MacGetRightBorderSize(),
- y + size.y - parent->MacGetBottomBorderSize()) ;
-
- SectRgn( visRgn , tempRgn , visRgn ) ;
- if ( parent->IsTopLevel() )
- break ;
- parent = parent->GetParent() ;
+ MacRootWindowToWindow( &r.left , & r.top ) ;
+ MacRootWindowToWindow( &r.right , & r.bottom ) ;
}
- }
- if ( respectChildrenAndSiblings )
- {
- if ( GetWindowStyle() & wxCLIP_CHILDREN )
+ else
{
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxWindowMac *child = node->GetData();
-
- if ( !child->IsTopLevel() && child->IsShown() )
- {
- SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
- if ( child->IsKindOf( CLASSINFO( wxStaticBox ) ) )
- {
- int borderTop = 14 ;
- int borderOther = 4 ;
-
- SetRectRgn( tempStaticBoxRgn , child->m_x + borderOther , child->m_y + borderTop , child->m_x + child->m_width - borderOther , child->m_y + child->m_height - borderOther ) ;
- DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
- }
- DiffRgn( visRgn , tempRgn , visRgn ) ;
- }
- }
+ r.right -= r.left ;
+ r.bottom -= r.top ;
+ r.left = 0 ;
+ r.top = 0 ;
}
+ if ( includeOuterStructures )
+ InsetRect( &r , -4 , -4 ) ;
+ RectRgn( visRgn , &r ) ;
- if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
+ if ( !IsTopLevel() )
{
- bool thisWindowThrough = false ;
- for (wxWindowListNode *node = GetParent()->GetChildren().GetFirst(); node; node = node->GetNext())
+ wxWindow* child = this ;
+ wxWindow* parent = child->GetParent() ;
+ while( parent )
{
- wxWindowMac *sibling = node->GetData();
- if ( sibling == this )
+ 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 ) ) */ )
{
- thisWindowThrough = true ;
- continue ;
+ size = parent->GetSize() ;
+ x = y = 0 ;
}
- if( !thisWindowThrough )
+ else
{
- continue ;
+ size = parent->GetClientSize() ;
+ wxPoint origin = parent->GetClientAreaOrigin() ;
+ x = origin.x ;
+ y = origin.y ;
}
-
- if ( !sibling->IsTopLevel() && sibling->IsShown() )
+ parent->MacWindowToRootWindow( &x, &y ) ;
+ MacRootWindowToWindow( &x , &y ) ;
+
+ if ( !includeOuterStructures || (
+ parent->IsKindOf( CLASSINFO( wxScrolledWindow ) ) ||
+ parent->IsKindOf( CLASSINFO( wxSashLayoutWindow ) ) ||
+ ( parent->GetParent() && parent->GetParent()->IsKindOf( CLASSINFO( wxSplitterWindow ) ) )
+ ) )
{
- SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ;
- if ( sibling->IsKindOf( CLASSINFO( wxStaticBox ) ) )
- {
- int borderTop = 14 ;
- int borderOther = 4 ;
+ SetRectRgn( tempRgn ,
+ x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
+ x + size.x - parent->MacGetRightBorderSize(),
+ y + size.y - parent->MacGetBottomBorderSize()) ;
- SetRectRgn( tempStaticBoxRgn , sibling->m_x - m_x + borderOther , sibling->m_y - m_y + borderTop , sibling->m_x + sibling->m_width - m_x - borderOther , sibling->m_y + sibling->m_height - m_y - borderOther ) ;
- DiffRgn( tempRgn , tempStaticBoxRgn , tempRgn ) ;
- }
- DiffRgn( visRgn , tempRgn , visRgn ) ;
+ SectRgn( visRgn , tempRgn , visRgn ) ;
}
+ if ( parent->IsTopLevel() )
+ break ;
+ child = parent ;
+ parent = child->GetParent() ;
}
}
}
- m_macVisibleRegion = visRgn ;
+
+ wxRegion vis = visRgn ;
DisposeRgn( visRgn ) ;
DisposeRgn( tempRgn ) ;
- DisposeRgn( tempStaticBoxRgn ) ;
- return m_macVisibleRegion ;
+ return vis ;
}
-void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
+/*
+ This function must not change the updatergn !
+ */
+bool wxWindowMac::MacDoRedraw( WXHRGN updatergnr , long time )
{
RgnHandle updatergn = (RgnHandle) updatergnr ;
- // updatergn is always already clipped to our boundaries
- // it is in window coordinates, not in client coordinates
-
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
+ bool handled = false ;
+ Rect updatebounds ;
+ GetRegionBounds( updatergn , &updatebounds ) ;
+// wxLogDebug("update for %s bounds %d , %d , %d , %d",typeid(*this).name() , updatebounds.left , updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+ if ( !EmptyRgn(updatergn) )
{
- // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
- RgnHandle ownUpdateRgn = NewRgn() ;
- CopyRgn( updatergn , ownUpdateRgn ) ;
-
- SectRgn( ownUpdateRgn , (RgnHandle) MacGetVisibleRegion().GetWXHRGN() , ownUpdateRgn ) ;
-
- // newupdate is the update region in client coordinates
RgnHandle newupdate = NewRgn() ;
wxSize point = GetClientSize() ;
wxPoint origin = GetClientAreaOrigin() ;
SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y+point.y ) ;
- SectRgn( newupdate , ownUpdateRgn , newupdate ) ;
- OffsetRgn( newupdate , -origin.x , -origin.y ) ;
- m_updateRegion = newupdate ;
- DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
-
- if ( erase && !EmptyRgn(ownUpdateRgn) )
+ SectRgn( newupdate , updatergn , newupdate ) ;
+
+ // first send an erase event to the entire update area
{
wxWindowDC dc(this);
- if (!EmptyRgn(ownUpdateRgn))
- dc.SetClippingRegion(wxRegion(ownUpdateRgn));
+ dc.SetClippingRegion(wxRegion(updatergn));
wxEraseEvent eevent( GetId(), &dc );
eevent.SetEventObject( this );
GetEventHandler()->ProcessEvent( eevent );
-
- wxNcPaintEvent eventNc( GetId() );
- eventNc.SetEventObject( this );
- GetEventHandler()->ProcessEvent( eventNc );
}
- DisposeRgn( ownUpdateRgn ) ;
+
+ // calculate a client-origin version of the update rgn and set m_updateRegion to that
+ OffsetRgn( newupdate , -origin.x , -origin.y ) ;
+ m_updateRegion = newupdate ;
+ DisposeRgn( newupdate ) ;
+
if ( !m_updateRegion.Empty() )
{
- wxWindowList hiddenWindows ;
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
-
- if ( child && child->MacGetRootWindow() == window && child->IsShown() && child->GetMacControl() )
- {
- SetControlVisibility( (ControlHandle) child->GetMacControl() , false , false ) ;
- hiddenWindows.Append( child ) ;
- }
- }
-
+ // paint the window itself
wxPaintEvent event;
event.m_timeStamp = time ;
event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
-
- for (wxWindowListNode *node = hiddenWindows.GetFirst(); node; node = node->GetNext())
+ handled = GetEventHandler()->ProcessEvent(event);
+
+ // we have to call the default built-in handler, as otherwise our frames will be drawn and immediately erased afterwards
+ if ( !handled )
{
- wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
+ if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL )
+ {
+ CallNextEventHandler((EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() , (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
+ handled = true ;
+ }
+ }
- if ( child && child->GetMacControl() )
+ }
+
+ // now we cannot rely on having its borders drawn by a window itself, as it does not
+ // get the updateRgn wide enough to always do so, so we do it from the parent
+ // this would also be the place to draw any custom backgrounds for native controls
+ // in Composited windowing
+ wxPoint clientOrigin = GetClientAreaOrigin() ;
+
+ for (wxWindowListNode *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;
+
+ 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 ( child->MacGetTopBorderSize() )
+ {
+ if ( RectInRgn( &childRect , updatergn ) )
{
- SetControlVisibility( (ControlHandle) child->GetMacControl() , true , false ) ;
+ // paint custom borders
+ wxNcPaintEvent eventNc( child->GetId() );
+ eventNc.SetEventObject( child );
+ if ( !child->GetEventHandler()->ProcessEvent( eventNc ) )
+ {
+ wxWindowDC dc(this) ;
+ dc.SetClippingRegion(wxRegion(updatergn));
+ wxMacPortSetter helper(&dc) ;
+ child->MacPaintBorders( dc.m_macLocalOrigin.x + childRect.left , dc.m_macLocalOrigin.y + childRect.top) ;
+ }
}
+ }
+ if ( child->m_peer->NeedsFocusRect() && child->m_peer->HasFocus() )
+ {
+ wxWindowDC dc(this) ;
+ dc.SetClippingRegion(wxRegion(updatergn));
+ wxMacPortSetter helper(&dc) ;
+ OffsetRect( &childRect , dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y ) ;
+ DrawThemeFocusRect( &childRect , true ) ;
}
}
}
+ return handled ;
+}
- // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
+void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
+{
+ RgnHandle updatergn = (RgnHandle) updatergnr ;
+ // updatergn is always already clipped to our boundaries
+ // if we are in compositing mode then it is in relative to the upper left of the control
+ // if we are in non-compositing, then it is relatvie to the uppder left of the content area
+ // of the toplevel window
+ // it is in window coordinates, not in client coordinates
- RgnHandle childupdate = NewRgn() ;
- for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- // calculate the update region for the child windows by intersecting the window rectangle with our own
- // passed in update region and then offset it to be client-wise window coordinates again
- wxWindowMac *child = node->GetData();
- SetRectRgn( childupdate , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
- SectRgn( childupdate , updatergn , childupdate ) ;
- OffsetRgn( childupdate , -child->m_x , -child->m_y ) ;
- if ( child->MacGetRootWindow() == window && child->IsShown() && !EmptyRgn( childupdate ) )
- {
- // because dialogs may also be children
- child->MacRedraw( childupdate , time , erase ) ;
- }
+ // ownUpdateRgn is the area that this window has to repaint, it is in window coordinates
+ RgnHandle ownUpdateRgn = NewRgn() ;
+ CopyRgn( updatergn , ownUpdateRgn ) ;
+
+ if ( MacGetTopLevelWindow()->MacUsesCompositing() == false )
+ {
+ Rect bounds;
+ m_peer->GetRectInWindowCoords( &bounds );
+ RgnHandle controlRgn = NewRgn();
+ RectRgn( controlRgn, &bounds );
+ //KO: This sets the ownUpdateRgn to the area of this control that is inside
+ // the window update region
+ SectRgn( ownUpdateRgn, controlRgn, ownUpdateRgn );
+ DisposeRgn( controlRgn );
+
+ //KO: convert ownUpdateRgn to local coordinates
+ OffsetRgn( ownUpdateRgn, -bounds.left, -bounds.top );
}
- DisposeRgn( childupdate ) ;
- // eventually a draw grow box here
+
+ MacDoRedraw( ownUpdateRgn , time ) ;
+ DisposeRgn( ownUpdateRgn ) ;
}
-WXHWND wxWindowMac::MacGetRootWindow() const
+WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
{
wxWindowMac *iter = (wxWindowMac*)this ;
{
wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
- bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
- int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
- int width, height ;
- GetClientSize( &width , &height ) ;
+ if ( style & ( wxVSCROLL | wxHSCROLL ) )
+ {
+ bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
+ int scrlsize = MAC_SCROLLBAR_SIZE ;
+ wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL ;
+ if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+ {
+ scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
+ variant = wxWINDOW_VARIANT_SMALL ;
+ }
- 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 adjust = hasBoth ? scrlsize - 1: 0 ;
+ int width, height ;
+ GetClientSize( &width , &height ) ;
- m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
- vSize , wxVERTICAL);
+ wxPoint vPoint(width-scrlsize, 0) ;
+ wxSize vSize(scrlsize, height - adjust) ;
+ wxPoint hPoint(0 , height-scrlsize ) ;
+ wxSize hSize( width - adjust, scrlsize) ;
- if ( style & wxVSCROLL )
- {
+ if ( style & wxVSCROLL )
+ {
+ m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
+ vSize , wxVERTICAL);
+ }
+
+ if ( style & wxHSCROLL )
+ {
+ m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
+ hSize , wxHORIZONTAL);
+ }
}
- else
- {
- m_vScrollBar->Show(false) ;
- }
- m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
- hSize , wxHORIZONTAL);
- if ( style & wxHSCROLL )
- {
- }
- else
- {
- m_hScrollBar->Show(false) ;
- }
+
// because the create does not take into account the client area origin
MacRepositionScrollBars() ; // we might have a real position shift
void wxWindowMac::MacRepositionScrollBars()
{
+ if ( !m_hScrollBar && !m_vScrollBar )
+ return ;
+
bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
- int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1 : 0 ;
+ 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 = m_width ;
- int height = m_height ;
+ int width ;
+ int height ;
+ GetSize( &width , &height ) ;
width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
-
+/*
int x = 0 ;
int y = 0 ;
- int w = m_width ;
- int h = m_height ;
+ int w ;
+ int h ;
+ GetSize( &w , &h ) ;
MacClientToRootWindow( &x , &y ) ;
MacClientToRootWindow( &w , &h ) ;
{
if ( iter->IsTopLevel() )
{
- totW = iter->m_width ;
- totH = iter->m_height ;
+ iter->GetSize( &totW , &totH ) ;
break ;
}
vSize.y += 1 ;
hPoint.y += 1 ;
}
-
+*/
if ( m_vScrollBar )
{
m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE);
return MacCanFocus() && wxWindowBase::AcceptsFocus();
}
-WXWidget wxWindowMac::MacGetContainerForEmbedding()
-{
- return GetParent()->MacGetContainerForEmbedding() ;
-}
-
void wxWindowMac::MacSuperChangedPosition()
{
// only window-absolute structures have to be moved i.e. controls
node = node->GetNext();
}
}
+
long wxWindowMac::MacGetLeftBorderSize( ) const
{
if( IsTopLevel() )
if (m_windowStyle & wxRAISED_BORDER || m_windowStyle & wxSUNKEN_BORDER )
{
SInt32 border = 3 ;
-#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
-#endif
return border ;
}
else if ( m_windowStyle &wxDOUBLE_BORDER)
{
SInt32 border = 3 ;
-#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
-#endif
return border ;
}
else if (m_windowStyle &wxSIMPLE_BORDER)
long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
- return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
+ return style & ~wxBORDER_MASK ;
}
// Find the wxWindowMac at the current mouse position, returning the mouse
if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
event.Skip() ;
}
- else
- {
- event.Skip() ;
- }
+ else
+ {
+ event.Skip() ;
+ }
+}
+
+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 ;
+
+ window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin) ;
+ Rect bounds = { y , x , y+h , x+w };
+ return bounds ;
+}
+
+wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+{
+ return eventNotHandledErr ;
+}
+
+
projects / wxWidgets.git / blobdiff