/////////////////////////////////////////////////////////////////////////////
// Name: windows.cpp
// Purpose: wxWindowMac
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
+// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/window.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
-#include "wx/utils.h"
+#include "wx/utils.h"
#include "wx/app.h"
#include "wx/panel.h"
#include "wx/layout.h"
#include "wx/dialog.h"
-#include "wx/listbox.h"
#include "wx/scrolbar.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/toolbar.h"
+#include "wx/dc.h"
#if wxUSE_CARET
#include "wx/caret.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_IDLE(wxWindowMac::OnIdle)
- EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
+ EVT_NC_PAINT(wxWindowMac::OnNcPaint)
+ EVT_ERASE_BACKGROUND(wxWindowMac::OnEraseBackground)
+// TODO EVT_PAINT(wxWindowMac::OnPaint)
+ EVT_SYS_COLOUR_CHANGED(wxWindowMac::OnSysColourChanged)
+ EVT_INIT_DIALOG(wxWindowMac::OnInitDialog)
+// EVT_SET_FOCUS(wxWindowMac::OnSetFocus)
+ EVT_MOUSE_EVENTS(wxWindowMac::OnMouseEvent)
END_EVENT_TABLE()
#endif
#define wxMAC_USE_THEME_BORDER 0
+// ---------------------------------------------------------------------------
+// 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 ;
+
+ wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+ if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
+ {
+ updateRgn = (RgnHandle) visRegion.GetWXHRGN() ;
+ }
+ // GrafPtr myport = cEvent.GetParameter<GrafPtr>(kEventParamGrafPort,typeGrafPtr) ;
+
+#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 ;
+ }
+ 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) ;
+ if (thisWindow->MacIsUserPane())
+ result = noErr;
+ }
+ 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 )
+{
+ OSStatus result = eventNotHandledErr ;
+
+ switch ( GetEventClass( event ) )
+ {
+ case kEventClassControl :
+ result = wxMacWindowControlEventHandler( handler, event, data ) ;
+ break ;
+ case kEventClassService :
+ result = wxMacWindowServiceEventHandler( handler, event , data ) ;
+ default :
+ break ;
+ }
+ 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);
-// ----------------------------------------------------------------------------
-// constructors and such
-// ----------------------------------------------------------------------------
+wxWindow *wxFindControlFromMacControl(ControlRef inControl )
+{
+ wxNode *node = wxWinMacControlList.Find((long)inControl);
+ if (!node)
+ return NULL;
+ return (wxControl *)node->GetData();
+}
-void wxWindowMac::Init()
+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)
{
- // generic
- InitBase();
+ wxWinMacControlList.DeleteObject(control);
+}
+
+// UPP functions
+ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
- // MSW specific
- m_doubleClickAllowed = 0;
- m_winCaptured = FALSE;
+ControlColorUPP wxMacSetupControlBackgroundUPP = NULL ;
- m_isBeingDeleted = FALSE;
+// 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 */ ) ;
+ }
+ }
+}
- m_useCtl3D = FALSE;
- m_mouseInWindow = FALSE;
+// ----------------------------------------------------------------------------
+ // constructors and such
+// ----------------------------------------------------------------------------
- m_xThumbSize = 0;
- m_yThumbSize = 0;
+void wxWindowMac::Init()
+{
+ 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_macControl = NULL ;
+
+ 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
wxWindowMac::~wxWindowMac()
{
- // deleting a window while it is shown invalidates the region
- if ( IsShown() ) {
- wxWindowMac* iter = this ;
- while( iter ) {
- if ( iter->IsTopLevel() )
+ SendDestroyEvent();
+
+ m_isBeingDeleted = TRUE;
+
+#ifndef __WXUNIVERSAL__
+ // VS: make sure there's no wxFrame with last focus set to us:
+ for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
+ {
+ wxFrame *frame = wxDynamicCast(win, wxFrame);
+ if ( frame )
+ {
+ if ( frame->GetLastFocus() == this )
{
- Refresh() ;
- break ;
+ frame->SetLastFocus((wxWindow*)NULL);
}
- iter = iter->GetParent() ;
-
+ break;
}
}
+#endif // __WXUNIVERSAL__
- m_isBeingDeleted = TRUE;
-
- if ( s_lastMouseWindow == this )
+ // wxRemoveMacControlAssociation( this ) ;
+ // If we delete an item, we should initialize the parent panel,
+ // because it could now be invalid.
+ wxWindow *parent = GetParent() ;
+ if ( parent )
{
- s_lastMouseWindow = NULL ;
+ if (parent->GetDefaultItem() == (wxButton*) this)
+ parent->SetDefaultItem(NULL);
+ }
+ if ( (ControlRef) m_macControl )
+ {
+ // in case the callback might be called during destruction
+ wxRemoveMacControlAssociation( this) ;
+ ::SetControlColorProc( (ControlRef) m_macControl , NULL ) ;
+ ::DisposeControl( (ControlRef) m_macControl ) ;
+ m_macControl = NULL ;
}
- if ( gFocusWindow == this )
+ if ( g_MacLastWindow == this )
{
- gFocusWindow = NULL ;
+ g_MacLastWindow = NULL ;
}
- if ( m_parent )
- m_parent->RemoveChild(this);
+ wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( this ) , wxFrame ) ;
+ if ( frame )
+ {
+ if ( frame->GetLastFocus() == this )
+ frame->SetLastFocus( NULL ) ;
+ }
DestroyChildren();
+
+ // delete our drop target if we've got one
+#if wxUSE_DRAG_AND_DROP
+ if ( m_dropTarget != NULL )
+ {
+ delete m_dropTarget;
+ m_dropTarget = NULL;
+ }
+#endif // wxUSE_DRAG_AND_DROP
+}
+
+//
+
+void wxWindowMac::MacInstallEventHandler()
+{
+ wxAssociateControlWithMacControl( (ControlRef) m_macControl , this ) ;
+ InstallControlEventHandler( (ControlRef) m_macControl, GetwxMacWindowEventHandlerUPP(),
+ GetEventTypeCount(eventList), eventList, this,
+ (EventHandlerRef *)&m_macControlEventHandler);
+
}
// Constructor
parent->AddChild(this);
- 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 ) ;
+ m_windowVariant = parent->GetWindowVariant() ;
+
+ if ( m_macIsUserPane )
+ {
+ Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+
+ UInt32 features = 0
+ | kControlSupportsEmbedding
+// | kControlSupportsLiveFeedback
+// | kControlHasSpecialBackground
+// | kControlSupportsCalcBestRect
+// | kControlHandlesTracking
+ | kControlSupportsFocus
+// | kControlWantsActivate
+// | kControlWantsIdle
+ ;
+
+ ::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , (ControlRef*) &m_macControl);
+
+ MacPostControlCreate(pos,size) ;
+#if !TARGET_API_MAC_OSX
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneDrawProcTag,
+ sizeof(gControlUserPaneDrawUPP),(Ptr) &gControlUserPaneDrawUPP);
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneHitTestProcTag,
+ sizeof(gControlUserPaneHitTestUPP),(Ptr) &gControlUserPaneHitTestUPP);
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneTrackingProcTag,
+ sizeof(gControlUserPaneTrackingUPP),(Ptr) &gControlUserPaneTrackingUPP);
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneIdleProcTag,
+ sizeof(gControlUserPaneIdleUPP),(Ptr) &gControlUserPaneIdleUPP);
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneKeyDownProcTag,
+ sizeof(gControlUserPaneKeyDownUPP),(Ptr) &gControlUserPaneKeyDownUPP);
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneActivateProcTag,
+ sizeof(gControlUserPaneActivateUPP),(Ptr) &gControlUserPaneActivateUPP);
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneFocusProcTag,
+ sizeof(gControlUserPaneFocusUPP),(Ptr) &gControlUserPaneFocusUPP);
+ SetControlData((ControlRef) m_macControl,kControlEntireControl,kControlUserPaneBackgroundProcTag,
+ sizeof(gControlUserPaneBackgroundUPP),(Ptr) &gControlUserPaneBackgroundUPP);
+#endif
+ }
#ifndef __WXUNIVERSAL__
- if ( ! IsKindOf( CLASSINFO ( wxControl ) ) && ! IsKindOf( CLASSINFO( wxStatusBar ) ) )
+ // 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::SetFocus()
+void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
{
- if ( gFocusWindow == this )
- return ;
+ wxASSERT_MSG( (ControlRef) m_macControl != NULL , wxT("No valid mac control") ) ;
+
+ ::SetControlReference( (ControlRef) m_macControl , (long) this ) ;
+
+ MacInstallEventHandler();
+
+ ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+ ::EmbedControl( (ControlRef) m_macControl , 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( (ControlRef) m_macControl , wxMacSetupControlBackgroundUPP ) ;
+#endif
- if ( AcceptsFocus() )
+ UMASetControlTitle( (ControlRef) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+
+ wxSize new_size = size ;
+ if (!m_macIsUserPane)
{
- if (gFocusWindow )
- {
- #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
- wxFocusEvent event(wxEVT_KILL_FOCUS, gFocusWindow->m_windowId);
- event.SetEventObject(gFocusWindow);
- gFocusWindow->GetEventHandler()->ProcessEvent(event) ;
- }
- gFocusWindow = this ;
- {
- #if wxUSE_CARET
- // Deal with caret
- if ( m_caret )
+ 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_macControl != NULL ) ;
+
+ m_windowVariant = variant ;
+
+ if (!m_macControl)
+ 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 )
{
- m_caret->OnSetFocus();
+ // not always defined in the headers
+ size = 3 ;
+ themeFont = 109 ;
}
- #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() )
+ else
{
- UMASetKeyboardFocus( (WindowRef) gFocusWindow->MacGetRootWindow() , (ControlHandle) control->GetMacControl() , kControlEditTextPart ) ;
+ size = kControlSizeSmall;
+ themeFont = kThemeSmallSystemFont ;
}
- #endif
- wxFocusEvent event(wxEVT_SET_FOCUS, m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event) ;
- }
+ break ;
+ case wxWINDOW_VARIANT_LARGE :
+ size = kControlSizeLarge;
+ themeFont = kThemeSystemFont ;
+ break ;
+ default:
+ wxFAIL_MSG(_T("unexpected window variant"));
+ break ;
}
+ ::SetControlData( (ControlRef) m_macControl , kControlEntireControl, kControlSizeTag, sizeof( ControlSize ), &size );
+
+ wxFont font ;
+ font.MacCreateThemeFont( themeFont ) ;
+ SetFont( font ) ;
+}
+
+void wxWindowMac::MacUpdateControlFont()
+{
+ ControlFontStyleRec fontStyle;
+ if ( m_font.MacGetThemeFontID() != kThemeCurrentPortFont )
+ {
+ switch( m_font.MacGetThemeFontID() )
+ {
+ case kThemeSmallSystemFont : fontStyle.font = kControlFontSmallSystemFont ; break ;
+ case 109 /*mini font */ : fontStyle.font = -5 ; break ;
+ case kThemeSystemFont : fontStyle.font = kControlFontBigSystemFont ; break ;
+ default : fontStyle.font = kControlFontBigSystemFont ; break ;
+ }
+ fontStyle.flags = kControlUseFontMask ;
+ }
+ else
+ {
+ fontStyle.font = m_font.MacGetFontNum() ;
+ fontStyle.style = m_font.MacGetFontStyle() ;
+ fontStyle.size = m_font.MacGetFontSize() ;
+ fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask ;
+ }
+
+ fontStyle.just = teJustLeft ;
+ fontStyle.flags |= kControlUseJustMask ;
+ if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+ fontStyle.just = teJustCenter ;
+ else if ( ( GetWindowStyle() & wxALIGN_MASK ) & wxALIGN_RIGHT )
+ fontStyle.just = teJustRight ;
+
+
+ fontStyle.foreColor = MAC_WXCOLORREF(GetForegroundColour().GetPixel() ) ;
+ fontStyle.flags |= kControlUseForeColorMask ;
+
+ ::SetControlFontStyle( (ControlRef) m_macControl , &fontStyle );
+ Refresh() ;
}
-bool wxWindowMac::Enable(bool enable)
+bool wxWindowMac::SetFont(const wxFont& font)
{
- if ( !wxWindowBase::Enable(enable) )
- return FALSE;
+ bool retval = !wxWindowBase::SetFont( font ) ;
+
+ MacUpdateControlFont() ;
+
+ return retval;
+}
- MacSuperEnabled( enable ) ;
+bool wxWindowMac::SetForegroundColour(const wxColour& col )
+{
+ if ( !wxWindowBase::SetForegroundColour(col) )
+ return false ;
+
+ MacUpdateControlFont() ;
+
+ return true ;
+}
- return TRUE;
+bool wxWindowMac::SetBackgroundColour(const wxColour& col )
+{
+ if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
+ return false ;
+
+ wxBrush brush ;
+ if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE) )
+ {
+ brush.MacSetTheme( kThemeBrushDocumentWindowBackground ) ;
+ }
+ else if ( col == wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE ) )
+ {
+ brush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ;
+ }
+ else
+ {
+ brush.SetColour( col ) ;
+ }
+ MacSetBackgroundBrush( brush ) ;
+
+ MacUpdateControlFont() ;
+
+ return true ;
}
+
+bool wxWindowMac::MacCanFocus() const
+{
+#if 0
+ // there is currently no way to determinate whether the window is running in full keyboard
+ // access mode, therefore we cannot rely on these features yet
+ UInt32 features = 0 ;
+ GetControlFeatures( (ControlRef) m_macControl , &features ) ;
+ return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
+#endif
+ return true ;
+}
+
+
+void wxWindowMac::SetFocus()
+{
+ if ( AcceptsFocus() )
+ {
+#if !TARGET_API_MAC_OSX
+ wxWindow* former = FindFocus() ;
+#endif
+ OSStatus err = SetKeyboardFocus( (WindowRef) MacGetTopLevelWindowRef() , (ControlRef) GetHandle() , 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 )
+ {
+ 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) ;
+ }
+ // send new focus event
+ {
+ EventRef evRef = NULL ;
+ verify_noerr( MacCreateEvent( NULL , kEventClassControl , kEventControlSetFocusPart , TicksToEventTime( TickCount() ) , kEventAttributeUserEvent ,
+ &evRef ) );
+
+ wxMacCarbonEvent cEvent( evRef ) ;
+ cEvent.SetParameter<ControlRef>( kEventParamDirectObject , (ControlRef) GetHandle() ) ;
+ cEvent.SetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode , kControlFocusNextPart ) ;
+
+ wxMacWindowEventHandler( NULL , evRef , this ) ;
+ ReleaseEvent(evRef) ;
+ }
+#endif
+ }
+}
+
+
void wxWindowMac::DoCaptureMouse()
{
wxTheApp->s_captureWindow = this ;
void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
{
- if ( m_dropTarget != 0 ) {
- delete m_dropTarget;
- }
+ if ( m_dropTarget != 0 ) {
+ delete m_dropTarget;
+ }
- m_dropTarget = pDropTarget;
- if ( m_dropTarget != 0 )
- {
- // TODO
- }
+ m_dropTarget = pDropTarget;
+ if ( m_dropTarget != 0 )
+ {
+ // TODO
+ }
}
#endif
// TODO
}
+void wxWindowMac::MacGetPositionAndSizeFromControl(int& x, int& y,
+ int& w, int& h) const
+{
+ Rect bounds ;
+ GetControlBounds( (ControlRef) m_macControl , &bounds ) ;
+
+
+ x = bounds.left ;
+ y = bounds.top ;
+ w = bounds.right - bounds.left ;
+ h = bounds.bottom - bounds.top ;
+
+ wxTopLevelWindow* tlw = wxDynamicCast( this , wxTopLevelWindow ) ;
+ if ( tlw )
+ {
+ Point tlworigin = { 0 , 0 } ;
+ GrafPtr port ;
+ bool swapped = QDSwapPort( UMAGetWindowPort( (WindowRef) tlw->MacGetWindowRef() ) , &port ) ;
+ ::LocalToGlobal( &tlworigin ) ;
+ if ( swapped )
+ ::SetPort( port ) ;
+ x = tlworigin.h ;
+ y = tlworigin.v ;
+ }
+}
+
+bool wxWindowMac::MacGetBoundsForControl(const wxPoint& pos,
+ const wxSize& size,
+ int& x, int& y,
+ int& w, int& h , bool adjustOrigin ) const
+{
+ 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
+ if ( adjustOrigin )
+ AdjustForParentClientOrigin( x , y ) ;
+ return true ;
+}
+
// Get total size
void wxWindowMac::DoGetSize(int *x, int *y) const
{
- if(x) *x = m_width ;
- if(y) *y = m_height ;
+#if TARGET_API_MAC_OSX
+ int x1 , y1 , w1 ,h1 ;
+ MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
+ if(x) *x = w1 ;
+ if(y) *y = h1 ;
+
+#else
+ Rect bounds ;
+ GetControlBounds( (ControlRef) m_macControl , &bounds ) ;
+ if(x) *x = bounds.right - bounds.left ;
+ if(y) *y = bounds.bottom - bounds.top ;
+#endif
}
void wxWindowMac::DoGetPosition(int *x, int *y) const
{
- int xx,yy;
-
- xx = m_x ;
- yy = m_y ;
- if ( !IsTopLevel() && GetParent())
+ #if TARGET_API_MAC_OSX
+ int x1 , y1 , w1 ,h1 ;
+ MacGetPositionAndSizeFromControl( x1 , y1, w1 ,h1 ) ;
+ if ( !IsTopLevel() )
{
- wxPoint pt(GetParent()->GetClientAreaOrigin());
- xx -= pt.x;
- yy -= pt.y;
+ wxWindow *parent = GetParent();
+ if ( parent )
+ {
+ wxPoint pt(parent->GetClientAreaOrigin());
+ x1 -= pt.x ;
+ y1 -= pt.y ;
+ }
}
+ if(x) *x = x1 ;
+ if(y) *y = y1 ;
+ #else
+ Rect bounds ;
+ GetControlBounds( (ControlRef) m_macControl , &bounds ) ;
+ wxCHECK_RET( GetParent() , wxT("Missing Parent") ) ;
+
+ int xx = bounds.left ;
+ int yy = bounds.top ;
+
+ if ( !GetParent()->IsTopLevel() )
+ {
+ GetControlBounds( (ControlRef) GetParent()->GetHandle() , &bounds ) ;
+
+ xx -= bounds.left ;
+ yy -= bounds.top ;
+ }
+
+ wxPoint pt(GetParent()->GetClientAreaOrigin());
+ xx -= pt.x;
+ yy -= pt.y;
+
if(x) *x = xx;
if(y) *y = yy;
-}
-
-#if wxUSE_MENUS
-bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
-{
- menu->SetInvokingWindow(this);
- menu->UpdateUI();
- ClientToScreen( &x , &y ) ;
-
- ::InsertMenu( (MenuHandle) menu->GetHMenu() , -1 ) ;
- long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() ,y,x, 0) ;
- menu->MacMenuSelect( this , TickCount() , HiWord(menuResult) , LoWord(menuResult) ) ;
- ::DeleteMenu( menu->MacGetMenuId() ) ;
- menu->SetInvokingWindow(NULL);
-
- return TRUE;
-}
#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 ;
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+
+ wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+
+ {
+ Point localwhere = {0,0} ;
- GrafPtr port ;
- ::GetPort( &port ) ;
- ::SetPort( UMAGetWindowPort( window ) ) ;
- ::GlobalToLocal( &localwhere ) ;
- ::SetPort( port ) ;
+ if(x) localwhere.h = * x ;
+ if(y) localwhere.v = * y ;
+
+ wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
+ ::GlobalToLocal( &localwhere ) ;
+ if(x) *x = localwhere.h ;
+ if(y) *y = localwhere.v ;
- 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() ;
-
- if ( x )
- x += MacGetLeftBorderSize() ;
- if ( y )
- y += MacGetTopBorderSize() ;
-
+ WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
+ wxCHECK_RET( window , wxT("TopLevel Window Missing") ) ;
+
+ 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 ;
+
+ wxMacPortSaver s((GrafPtr)GetWindowPort( window )) ;
+ ::LocalToGlobal( &localwhere ) ;
+ if(x) *x = localwhere.h ;
+ if(y) *y = localwhere.v ;
+ }
}
void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
wxPoint origin = GetClientAreaOrigin() ;
if(x) *x += origin.x ;
if(y) *y += origin.y ;
-
+
MacWindowToRootWindow( x , y ) ;
}
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
+ HIPoint pt ;
+ if ( x ) pt.x = *x ;
+ if ( y ) pt.y = *y ;
+
+ if ( !IsTopLevel() )
+ HIViewConvertPoint( &pt , (ControlRef) m_macControl , (ControlRef) MacGetTopLevelWindow()->GetHandle() ) ;
+
+ 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 ;
+ GetControlBounds( (ControlRef) m_macControl , &bounds ) ;
+ if(x) *x += bounds.left ;
+ if(y) *y += bounds.top ;
}
+#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
+ HIPoint pt ;
+ if ( x ) pt.x = *x ;
+ if ( y ) pt.y = *y ;
+
+ if ( !IsTopLevel() )
+ HIViewConvertPoint( &pt , (ControlRef) MacGetTopLevelWindow()->GetHandle() , (ControlRef) m_macControl ) ;
+
+ 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 ;
+ GetControlBounds( (ControlRef) m_macControl , &bounds ) ;
+ if(x) *x -= bounds.left ;
+ if(y) *y -= bounds.top ;
}
+#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 ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+ {
+ GetRegionBounds( rgn , &content ) ;
+ DisposeRgn( rgn ) ;
+ }
+ else
{
- if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
- return FALSE ;
+ GetControlBounds( (ControlRef) m_macControl , &content ) ;
+ }
+ Rect structure ;
+ GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+#if !TARGET_API_MAC_OSX
+ OffsetRect( &content , -structure.left , -structure.top ) ;
+#endif
+ left = content.left - structure.left ;
+ top = content.top - structure.top ;
+ right = structure.right - content.right ;
+ bottom = structure.bottom - content.bottom ;
+}
+
+wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const
+{
+ wxSize sizeTotal = size;
+
+ RgnHandle rgn = NewRgn() ;
+
+ Rect content ;
+
+ if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+ {
+ GetRegionBounds( rgn , &content ) ;
+ DisposeRgn( rgn ) ;
}
else
{
- if ( ! wxWindowBase::SetCursor( cursor ) )
- return FALSE ;
+ GetControlBounds( (ControlRef) m_macControl , &content ) ;
}
+ Rect structure ;
+ GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+#if !TARGET_API_MAC_OSX
+ OffsetRect( &content , -structure.left , -structure.top ) ;
+#endif
- wxASSERT_MSG( m_cursor.Ok(),
- wxT("cursor must be valid after call to the base version"));
+ sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
+ sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top ) ;
- Point pt ;
- wxWindowMac *mouseWin ;
- GetMouse( &pt ) ;
-
- // Change the cursor NOW if we're within the correct window
+ sizeTotal.x += MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
+ sizeTotal.y += MacGetTopBorderSize( ) + MacGetBottomBorderSize( ) ;
+
+ return sizeTotal;
+}
+
+
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+void wxWindowMac::DoGetClientSize(int *x, int *y) const
+{
+ int ww, hh;
- if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
- {
- if ( mouseWin == this && !wxIsBusy() )
+ RgnHandle rgn = NewRgn() ;
+ Rect content ;
+ if ( GetControlRegion( (ControlRef) m_macControl , kControlContentMetaPart , rgn ) == noErr )
+ {
+ GetRegionBounds( rgn , &content ) ;
+ DisposeRgn( rgn ) ;
+ }
+ else
+ {
+ GetControlBounds( (ControlRef) m_macControl , &content ) ;
+ }
+#if !TARGET_API_MAC_OSX
+ Rect structure ;
+ GetControlBounds( (ControlRef) m_macControl , &structure ) ;
+ OffsetRect( &content , -structure.left , -structure.top ) ;
+#endif
+ ww = content.right - content.left ;
+ hh = content.bottom - content.top ;
+
+ ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
+ hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
+
+ if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) )
+ {
+ int x1 = 0 ;
+ int y1 = 0 ;
+ int w ;
+ int h ;
+ GetSize( &w , &h ) ;
+
+ MacClientToRootWindow( &x1 , &y1 ) ;
+ MacClientToRootWindow( &w , &h ) ;
+
+ wxWindowMac *iter = (wxWindowMac*)this ;
+
+ int totW = 10000 , totH = 10000;
+ while( iter )
+ {
+ if ( iter->IsTopLevel() )
+ {
+ iter->GetSize( &totW , &totH ) ;
+ break ;
+ }
+
+ iter = iter->GetParent() ;
+ }
+
+ if (m_hScrollBar && m_hScrollBar->IsShown() )
+ {
+ hh -= MAC_SCROLLBAR_SIZE;
+ if ( h-y1 >= totH )
+ {
+ hh += 1 ;
+ }
+ }
+ if (m_vScrollBar && m_vScrollBar->IsShown() )
+ {
+ ww -= MAC_SCROLLBAR_SIZE;
+ if ( w-x1 >= totW )
+ {
+ ww += 1 ;
+ }
+ }
+ }
+ if(x) *x = ww;
+ if(y) *y = hh;
+
+}
+
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
+{
+ if (m_cursor == cursor)
+ return FALSE;
+
+ if (wxNullCursor == cursor)
{
- m_cursor.MacInstall() ;
+ if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+ return FALSE ;
+ }
+ else
+ {
+ if ( ! wxWindowBase::SetCursor( cursor ) )
+ return FALSE ;
}
- }
-
- return TRUE ;
-}
-
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindowMac::DoGetClientSize(int *x, int *y) const
-{
- int ww, hh;
- ww = m_width ;
- hh = m_height ;
+ wxASSERT_MSG( m_cursor.Ok(),
+ wxT("cursor must be valid after call to the base version"));
- ww -= MacGetLeftBorderSize( ) + MacGetRightBorderSize( ) ;
- hh -= MacGetTopBorderSize( ) + MacGetBottomBorderSize( );
-
- if ( (m_vScrollBar && m_vScrollBar->IsShown()) || (m_hScrollBar && m_hScrollBar->IsShown()) )
- {
- int x1 = 0 ;
- int y1 = 0 ;
- int w = m_width ;
- int h = m_height ;
-
- MacClientToRootWindow( &x1 , &y1 ) ;
- MacClientToRootWindow( &w , &h ) ;
+ /*
- wxWindowMac *iter = (wxWindowMac*)this ;
+ TODO why do we have to use current coordinates ?
- int totW = 10000 , totH = 10000;
- while( iter )
- {
- if ( iter->IsTopLevel() )
- {
- totW = iter->m_width ;
- totH = iter->m_height ;
- break ;
- }
+ Point pt ;
+ wxWindowMac *mouseWin ;
+ GetMouse( &pt ) ;
+
+ // Change the cursor NOW if we're within the correct window
- iter = iter->GetParent() ;
- }
- if (m_hScrollBar && m_hScrollBar->IsShown() )
+ if ( MacGetWindowFromPoint( wxPoint( pt.h , pt.v ) , &mouseWin ) )
{
- hh -= MAC_SCROLLBAR_SIZE;
- if ( h-y1 >= totH )
+ if ( mouseWin == this && !wxIsBusy() )
{
- hh += 1 ;
+ m_cursor.MacInstall() ;
}
}
- if (m_vScrollBar && m_vScrollBar->IsShown() )
+ */
+ if ( !wxIsBusy() )
{
- ww -= MAC_SCROLLBAR_SIZE;
- if ( w-x1 >= totW )
+ m_cursor.MacInstall() ;
+ }
+
+ return TRUE ;
+}
+
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
+{
+ menu->SetInvokingWindow(this);
+ menu->UpdateUI();
+ 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 += 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 ;
-
- int actualWidth = width;
- int actualHeight = height;
- int actualX = x;
- int actualY = y;
-
- if ((m_minWidth != -1) && (actualWidth < m_minWidth))
+ int former_x , former_y , former_w, former_h ;
+#if !TARGET_API_MAC_OSX
+ DoGetPosition( &former_x , &former_y ) ;
+ DoGetSize( &former_w , &former_h ) ;
+#else
+ MacGetPositionAndSizeFromControl( former_x , former_y , former_w , former_h ) ;
+#endif
+
+ int actualWidth = width;
+ int actualHeight = height;
+ int actualX = x;
+ int actualY = y;
+
+ if ((m_minWidth != -1) && (actualWidth < m_minWidth))
actualWidth = m_minWidth;
- if ((m_minHeight != -1) && (actualHeight < m_minHeight))
+ if ((m_minHeight != -1) && (actualHeight < m_minHeight))
actualHeight = m_minHeight;
- if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
+ if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
actualWidth = m_maxWidth;
- if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
+ if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
actualHeight = m_maxHeight;
bool doMove = false ;
bool doResize = false ;
-
+
if ( actualX != former_x || actualY != former_y )
{
doMove = true ;
if ( doMove || doResize )
{
- // erase former position
-
- Refresh() ;
-
- m_x = actualX ;
- m_y = actualY ;
- m_width = actualWidth ;
- m_height = actualHeight ;
-
- // erase new position
-
- Refresh() ;
- if ( doMove )
- wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
-
+ // we don't adjust twice for the origin
+ Rect r = wxMacGetBoundsForControl(this , wxPoint( actualX,actualY), wxSize( actualWidth, actualHeight ) , false ) ;
+ bool vis = IsControlVisible( (ControlRef) m_macControl ) ;
+#if TARGET_API_MAC_OSX
+ // the HIViewSetFrame call itself should invalidate the areas, but when testing with the UnicodeTextCtrl it does not !
+ if ( vis )
+ SetControlVisibility( (ControlRef)m_macControl , false , true ) ;
+ HIRect hir = { r.left , r.top , r.right - r.left , r.bottom - r.top } ;
+ HIViewSetFrame ( (ControlRef) m_macControl , &hir ) ;
+ if ( vis )
+ SetControlVisibility( (ControlRef)m_macControl , true , true ) ;
+#else
+ if ( vis )
+ SetControlVisibility( (ControlRef)m_macControl , false , true ) ;
+ SetControlBounds( (ControlRef) m_macControl , &r ) ;
+ if ( vis )
+ SetControlVisibility( (ControlRef)m_macControl , true , true ) ;
+#endif
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);
- wxSizeEvent event(size, m_windowId);
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
+ MacRepositionScrollBars() ;
+ 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 } ;
+ short baselineoffset ;
+ int bestWidth, bestHeight ;
+ ::GetBestControlRect( (ControlRef) m_macControl , &bestsize , &baselineoffset ) ;
+
+ if ( EmptyRect( &bestsize ) )
+ {
+ baselineoffset = 0;
+ 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);
+// return wxWindowBase::DoGetBestSize() ;
}
+
// set the size of the window: if the dimensions are positive, just use them,
// but if any of them is equal to -1, it means that we must find the value for
// it ourselves (unless sizeFlags contains wxSIZE_ALLOW_MINUS_ONE flag, in
// get the current size and position...
int currentX, currentY;
GetPosition(¤tX, ¤tY);
-
+
int currentW,currentH;
GetSize(¤tW, ¤tH);
// ... 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 ;
+ GetControlRegion( (ControlRef) m_macControl , 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 ;
+ GetControlBounds( (ControlRef) m_macControl , &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 wxWindow::SetTitle(const wxString& title)
+void wxWindowMac::SetTitle(const wxString& title)
{
- m_label = title ;
+ m_label = wxStripMenuCodes(title) ;
+
+ if ( m_macControl )
+ {
+ UMASetControlTitle( (ControlRef) m_macControl , m_label , m_font.GetEncoding() ) ;
+ }
+ Refresh() ;
}
-wxString wxWindow::GetTitle() const
+wxString wxWindowMac::GetTitle() const
{
return m_label ;
}
{
if ( !wxWindowBase::Show(show) )
return FALSE;
+
+ // TODO use visibilityChanged Carbon Event for OSX
+ bool former = MacIsReallyShown() ;
+
+ SetControlVisibility( (ControlRef) m_macControl , show , true ) ;
+ if ( former != MacIsReallyShown() )
+ MacPropagateVisibilityChanged() ;
+ return TRUE;
+}
+
+bool wxWindowMac::Enable(bool enable)
+{
+ wxASSERT( m_macControl != NULL ) ;
+ if ( !wxWindowBase::Enable(enable) )
+ return FALSE;
- MacSuperShown( show ) ;
- if ( !show )
- {
- WindowRef window = (WindowRef) MacGetRootWindow() ;
- wxWindowMac* win = wxFindWinFromMacWindow( window ) ;
- if ( win && !win->m_isBeingDeleted )
- Refresh() ;
- }
+ bool former = MacIsReallyEnabled() ;
+#if TARGET_API_MAC_OSX
+ if ( enable )
+ EnableControl( (ControlRef) m_macControl ) ;
else
- {
- Refresh() ;
- }
+ DisableControl( (ControlRef) m_macControl ) ;
+#else
+ if ( enable )
+ ActivateControl( (ControlRef) m_macControl ) ;
+ else
+ DeactivateControl( (ControlRef) m_macControl ) ;
+#endif
+ if ( former != MacIsReallyEnabled() )
+ MacPropagateEnabledStateChanged() ;
return TRUE;
}
-void wxWindowMac::MacSuperShown( bool show )
+//
+// status change propagations (will be not necessary for OSX later )
+//
+
+void wxWindowMac::MacPropagateVisibilityChanged()
{
- wxNode *node = GetChildren().First();
+#if !TARGET_API_MAC_OSX
+ MacVisibilityChanged() ;
+
+ wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->Data();
- if ( child->m_isShown )
- child->MacSuperShown( show ) ;
- node = node->Next();
+ wxWindowMac *child = node->GetData();
+ 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();
}
- wxNode *node = GetChildren().First();
+#endif
+}
+
+void wxWindowMac::MacPropagateHiliteChanged( )
+{
+#if !TARGET_API_MAC_OSX
+ MacHiliteChanged() ;
+
+ wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->Data();
- if ( child->m_isShown )
- child->MacSuperEnabled( enabled ) ;
- node = node->Next();
+ wxWindowMac *child = node->GetData();
+ // if ( child->IsEnabled() )
+ child->MacPropagateHiliteChanged() ;
+ node = node->GetNext();
}
+#endif
}
-bool wxWindowMac::MacIsReallyShown() const
+//
+// status change notifications
+//
+
+void wxWindowMac::MacVisibilityChanged()
{
- 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::MacHiliteChanged()
+{
+}
+
+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
+ return IsControlVisible( (ControlRef) m_macControl ) ;
+#else
+ 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 ;
+#endif
+}
+
+bool wxWindowMac::MacIsReallyEnabled()
+{
+#if TARGET_API_MAC_OSX
+ return IsControlEnabled( (ControlRef) m_macControl ) ;
+#else
+ return IsControlActive( (ControlRef) m_macControl ) ;
+#endif
+}
+
+bool wxWindowMac::MacIsReallyHilited()
+{
+ return IsControlActive( (ControlRef) m_macControl ) ;
}
+//
+//
+//
+
int wxWindowMac::GetCharHeight() const
{
wxClientDC dc ( (wxWindowMac*)this ) ;
const wxFont *fontToUse = theFont;
if ( !fontToUse )
fontToUse = &m_font;
-
+
wxClientDC dc( (wxWindowMac*) this ) ;
long lx,ly,ld,le ;
dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
}
/*
- * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect
+ * Rect is given in client coordinates, for further reading, read wxTopLevelWindowMac::InvalidateRect
* we always intersect with the entire window, not only with the client area
*/
-
+
void wxWindowMac::Refresh(bool eraseBack, const wxRect *rect)
{
+#if TARGET_API_MAC_OSX
+ if ( rect == NULL )
+ HIViewSetNeedsDisplay( (ControlRef) m_macControl , 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 ) ;
+ HIViewSetNeedsDisplayInRegion( (ControlRef) m_macControl , update , true ) ;
+ }
+#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 ( IsControlVisible( (ControlRef) m_macControl ) )
+ {
+ SetControlVisibility( (ControlRef) m_macControl , false , false ) ;
+ SetControlVisibility( (ControlRef) m_macControl , true , true ) ;
+ }
+ /*
if ( MacGetTopLevelWindow() == NULL )
- return ;
-
- wxPoint client ;
- client = GetClientAreaOrigin( ) ;
- Rect clientrect = { -client.y , -client.x , m_height - client.y , m_width - client.x} ;
+ return ;
+
+ if ( !IsControlVisible( (ControlRef) m_macControl ) )
+ return ;
+
+ wxPoint client = GetClientAreaOrigin();
+ int x1 = -client.x;
+ int y1 = -client.y;
+ int x2 = m_width - client.x;
+ int y2 = m_height - client.y;
+
+ if (IsKindOf( CLASSINFO(wxButton)))
+ {
+ // buttons have an "aura"
+ y1 -= 5;
+ x1 -= 5;
+ y2 += 5;
+ x2 += 5;
+ }
+
+ Rect clientrect = { y1, x1, y2, x2 };
+
if ( rect )
{
Rect r = { rect->y , rect->x , rect->y + rect->height , rect->x + rect->width } ;
- SectRect( &clientrect , &r , &clientrect ) ;
+ SectRect( &clientrect , &r , &clientrect ) ;
}
+
if ( !EmptyRect( &clientrect ) )
{
int top = 0 , left = 0 ;
-
+
MacClientToRootWindow( &left , &top ) ;
OffsetRect( &clientrect , left , top ) ;
-
+
MacGetTopLevelWindow()->MacInvalidate( &clientrect , eraseBack ) ;
}
+ */
+#endif
}
-#if wxUSE_CARET && WXWIN_COMPATIBILITY
-// ---------------------------------------------------------------------------
-// Caret manipulation
-// ---------------------------------------------------------------------------
-
-void wxWindowMac::CreateCaret(int w, int h)
-{
- SetCaret(new wxCaret(this, w, h));
-}
-
-void wxWindowMac::CreateCaret(const wxBitmap *WXUNUSED(bitmap))
+void wxWindowMac::Freeze()
{
- wxFAIL_MSG("not implemented");
+#if TARGET_API_MAC_OSX
+ if ( !m_frozenness++ )
+ {
+ HIViewSetDrawingEnabled( (HIViewRef) m_macControl , false ) ;
+ }
+#endif
}
-void wxWindowMac::ShowCaret(bool show)
+#if TARGET_API_MAC_OSX
+static void InvalidateControlAndChildren( HIViewRef control )
{
- wxCHECK_RET( m_caret, "no caret to show" );
+ HIViewSetNeedsDisplay( control , true ) ;
+ UInt16 childrenCount = 0 ;
+ OSStatus err = CountSubControls( control , &childrenCount ) ;
+ if ( err == errControlIsNotEmbedder )
+ return ;
+ wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") ) ;
- m_caret->Show(show);
+ for ( UInt16 i = childrenCount ; i >=1 ; --i )
+ {
+ HIViewRef child ;
+ err = GetIndexedSubControl( control , i , & child ) ;
+ if ( err == errControlIsNotEmbedder )
+ return ;
+ InvalidateControlAndChildren( child ) ;
+ }
}
+#endif
-void wxWindowMac::DestroyCaret()
+void wxWindowMac::Thaw()
{
- SetCaret(NULL);
+#if TARGET_API_MAC_OSX
+ wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") );
+
+ if ( !--m_frozenness )
+ {
+ HIViewSetDrawingEnabled( (HIViewRef) m_macControl , true ) ;
+ InvalidateControlAndChildren( (HIViewRef) m_macControl ) ;
+ // HIViewSetNeedsDisplay( (HIViewRef) m_macControl , true ) ;
+ }
+#endif
}
-void wxWindowMac::SetCaretPos(int x, int y)
+void wxWindowMac::MacRedrawControl()
{
- wxCHECK_RET( m_caret, "no caret to move" );
-
- m_caret->Move(x, y);
+/*
+ if ( (ControlRef) m_macControl && MacGetTopLevelWindowRef() && IsControlVisible( (ControlRef) m_macControl ) )
+ {
+#if TARGET_API_MAC_CARBON
+ Update() ;
+#else
+ wxClientDC dc(this) ;
+ wxMacPortSetter helper(&dc) ;
+ wxMacWindowClipper clipper(this) ;
+ wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
+ UMADrawControl( (ControlRef) m_macControl ) ;
+#endif
+ }
+*/
}
-
-void wxWindowMac::GetCaretPos(int *x, int *y) const
+
+/* TODO
+void wxWindowMac::OnPaint(wxPaintEvent& event)
{
- wxCHECK_RET( m_caret, "no caret to get position of" );
-
- m_caret->GetPosition(x, y);
+ // why don't we skip that here ?
}
-#endif // wxUSE_CARET
+*/
wxWindowMac *wxGetActiveWindow()
{
// Coordinates relative to the window
void wxWindowMac::WarpPointer (int x_pos, int y_pos)
{
- // We really dont move the mouse programmatically under mac
+ // 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 ( 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 = 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() ;
+ event.GetDC()->Clear() ;
}
void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
{
wxWindowDC dc(this) ;
wxMacPortSetter helper(&dc) ;
-
+
MacPaintBorders( dc.m_macLocalOrigin.x , dc.m_macLocalOrigin.y) ;
}
}
}
-void wxWindowMac::MacPaintBorders( int left , int top )
+void wxWindowMac::MacPaintBorders( int left , int top )
{
if( IsTopLevel() )
return ;
+ int major,minor;
+ wxGetOsVersion( &major, &minor );
+
RGBColor white = { 0xFFFF, 0xFFFF , 0xFFFF } ;
- RGBColor black = { 0x0000, 0x0000 , 0x0000 } ;
RGBColor face = { 0xDDDD, 0xDDDD , 0xDDDD } ;
- RGBColor shadow = { 0x4444, 0x4444 , 0x4444 } ;
+
+ 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;
+ }
+
PenNormal() ;
+ int w , h ;
+ GetSize( &w , &h ) ;
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) ;
- */
-
+ 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 );
+ MoveTo( left + 0 , top + h - 2 );
LineTo( left + 0 , top + 0 );
- LineTo( left + m_width - 2 , top + 0 );
+ LineTo( left + w - 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 );
+ MoveTo( left + 2 , top + h - 3 );
+ LineTo( left + w - 3 , top + h - 3 );
+ LineTo( left + w - 3 , top + 2 );
- RGBForeColor( sunken ? &face : &black );
- 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 ? &face : &darkShadow );
+ MoveTo( left + 0 , top + h - 1 );
+ LineTo( left + w - 1 , top + h - 1 );
+ LineTo( left + w - 1 , top + 0 );
- RGBForeColor( sunken ? &shadow : &white );
- MoveTo( left + 1 , top + m_height - 3 );
+ RGBForeColor( sunken ? &lightShadow : &white );
+ MoveTo( left + 1 , top + h - 3 );
LineTo( left + 1, top + 1 );
- LineTo( left + m_width - 3 , top + 1 );
+ LineTo( left + w - 3 , top + 1 );
- RGBForeColor( sunken ? &white : &shadow );
- 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 ? &white : &lightShadow );
+ MoveTo( left + 1 , top + h - 2 );
+ LineTo( left + w - 2 , top + h - 2 );
+ LineTo( left + w - 2 , top + 1 );
- RGBForeColor( sunken ? &black : &face );
- MoveTo( left + 2 , top + m_height - 4 );
+ RGBForeColor( sunken ? &darkShadow : &face );
+ MoveTo( left + 2 , top + h - 4 );
LineTo( left + 2 , top + 2 );
- LineTo( left + m_width - 4 , top + 2 );
+ LineTo( left + w - 4 , top + 2 );
#endif
}
else if (HasFlag(wxSIMPLE_BORDER))
{
- Rect rect = { top , left , m_height + top , m_width + left } ;
- RGBForeColor( &black ) ;
+ Rect rect = { top , left , h + top , w + left } ;
+ RGBForeColor( &darkShadow ) ;
FrameRect( &rect ) ;
}
}
+void wxWindowMac::RemoveChild( wxWindowBase *child )
+{
+ if ( child == m_hScrollBar )
+ m_hScrollBar = NULL ;
+ if ( child == m_vScrollBar )
+ m_vScrollBar = NULL ;
+
+ wxWindowBase::RemoveChild( child ) ;
+}
+
// New function that will replace some of the above.
void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
int range, bool refresh)
{
- if ( orient == wxHORIZONTAL )
+ if ( orient == wxHORIZONTAL )
+ {
+ if ( m_hScrollBar )
{
- if ( m_hScrollBar )
+ if ( range == 0 || thumbVisible >= range )
{
- if ( range == 0 || thumbVisible >= range )
- {
- if ( m_hScrollBar->IsShown() )
- m_hScrollBar->Show(false) ;
- }
- else
- {
- if ( !m_hScrollBar->IsShown() )
- m_hScrollBar->Show(true) ;
- m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
- }
+ if ( m_hScrollBar->IsShown() )
+ m_hScrollBar->Show(false) ;
+ }
+ else
+ {
+ if ( !m_hScrollBar->IsShown() )
+ m_hScrollBar->Show(true) ;
+ m_hScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
}
}
- else
+ }
+ else
+ {
+ if ( m_vScrollBar )
{
- if ( m_vScrollBar )
+ if ( range == 0 || thumbVisible >= range )
{
- if ( range == 0 || thumbVisible >= range )
- {
- if ( m_vScrollBar->IsShown() )
- m_vScrollBar->Show(false) ;
- }
- else
- {
- if ( !m_vScrollBar->IsShown() )
- m_vScrollBar->Show(true) ;
- m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
- }
+ if ( m_vScrollBar->IsShown() )
+ m_vScrollBar->Show(false) ;
+ }
+ else
+ {
+ if ( !m_vScrollBar->IsShown() )
+ m_vScrollBar->Show(true) ;
+ m_vScrollBar->SetScrollbar( pos , thumbVisible , range , thumbVisible , refresh ) ;
}
}
- MacRepositionScrollBars() ;
+ }
+ MacRepositionScrollBars() ;
}
// Does a physical scroll
void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{
- wxClientDC dc(this) ;
- wxMacPortSetter helper(&dc) ;
+ if( dx == 0 && dy ==0 )
+ return ;
+
{
+ 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) } ;
+
+ wxPoint pos;
+ pos.x = pos.y = 0;
+
+ Rect scrollrect;
+ // TODO take out the boundaries
+ GetControlBounds( (ControlRef) m_macControl, &scrollrect);
+
RgnHandle updateRgn = NewRgn() ;
- ClipRect( &scrollrect ) ;
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 ) ;
+ 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( (WindowRef) MacGetRootWindow() , updateRgn ) ;
+#if TARGET_CARBON
+ //KO: The docs say ScrollRect creates an update region, which thus calls an update event
+ // but it seems the update only refreshes the background of the control, rather than calling
+ // kEventControlDraw, so we need to force a proper update here. There has to be a better
+ // way of doing this... (Note that code below under !TARGET_CARBON does not work either...)
+ Update();
+#endif
+ // we also have to scroll the update rgn in this rectangle
+ // in order not to loose updates
+#if !TARGET_CARBON
+ WindowRef rootWindow = (WindowRef) MacGetTopLevelWindowRef() ;
+ 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 ) )
+ {
+ MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
+ SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
+ InvalWindowRgn(rootWindow , formerUpdateRgn ) ;
+ }
+ InvalWindowRgn(rootWindow , updateRgn ) ;
DisposeRgn( updateRgn ) ;
+ DisposeRgn( formerUpdateRgn ) ;
+ DisposeRgn( scrollRgn ) ;
+#endif
}
-
- for (wxNode *node = GetChildren().First(); node; node = node->Next())
+
+ for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- wxWindowMac *child = (wxWindowMac*)node->Data();
+ wxWindowMac *child = node->GetData();
if (child == m_vScrollBar) continue;
if (child == m_hScrollBar) continue;
if (child->IsTopLevel()) continue;
+
int x,y;
child->GetPosition( &x, &y );
int w,h;
child->GetSize( &w, &h );
- child->SetSize( x+dx, y+dy, w, h );
+ 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 );
+ }
}
+// TODO remove, was moved higher up Update() ;
+
}
void wxWindowMac::MacOnScroll(wxScrollEvent &event )
wevent.SetPosition(event.GetPosition());
wevent.SetOrientation(event.GetOrientation());
wevent.m_eventObject = this;
-
- if (event.m_eventType == wxEVT_SCROLL_TOP) {
+
+ if (event.m_eventType == wxEVT_SCROLL_TOP)
wevent.m_eventType = wxEVT_SCROLLWIN_TOP;
- } else
- if (event.m_eventType == wxEVT_SCROLL_BOTTOM) {
+ else if (event.m_eventType == wxEVT_SCROLL_BOTTOM)
wevent.m_eventType = wxEVT_SCROLLWIN_BOTTOM;
- } else
- if (event.m_eventType == wxEVT_SCROLL_LINEUP) {
+ else if (event.m_eventType == wxEVT_SCROLL_LINEUP)
wevent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
- } else
- if (event.m_eventType == wxEVT_SCROLL_LINEDOWN) {
+ else if (event.m_eventType == wxEVT_SCROLL_LINEDOWN)
wevent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
- } else
- if (event.m_eventType == wxEVT_SCROLL_PAGEUP) {
+ else if (event.m_eventType == wxEVT_SCROLL_PAGEUP)
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
- } else
- if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN) {
+ else if (event.m_eventType == wxEVT_SCROLL_PAGEDOWN)
wevent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
- } else
- if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK) {
+ else if (event.m_eventType == wxEVT_SCROLL_THUMBTRACK)
wevent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
- }
-
+ else if (event.m_eventType == wxEVT_SCROLL_THUMBRELEASE)
+ wevent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+
GetEventHandler()->ProcessEvent(wevent);
}
}
// Get the window with the focus
wxWindowMac *wxWindowBase::FindFocus()
{
- return gFocusWindow ;
+ ControlRef control ;
+ GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+ return wxFindControlFromMacControl( control ) ;
}
-#if WXWIN_COMPATIBILITY
-// If nothing defined for this, try the parent.
-// E.g. we may be a button loaded from a resource, with no callback function
-// defined.
-void wxWindowMac::OnCommand(wxWindowMac& win, wxCommandEvent& event)
-{
- if ( GetEventHandler()->ProcessEvent(event) )
- return;
- if ( m_parent )
- m_parent->GetEventHandler()->OnCommand(win, event);
-}
-#endif // WXWIN_COMPATIBILITY_2
-
-#if WXWIN_COMPATIBILITY
-wxObject* wxWindowMac::GetChild(int number) const
-{
- // Return a pointer to the Nth object in the Panel
- wxNode *node = GetChildren().First();
- int n = number;
- while (node && n--)
- node = node->Next();
- if ( node )
- {
- wxObject *obj = (wxObject *)node->Data();
- return(obj);
- }
- else
- return NULL;
-}
-#endif // WXWIN_COMPATIBILITY
-
void wxWindowMac::OnSetFocus(wxFocusEvent& event)
{
// panel wants to track the window which was the last to have focus in it,
// notice that it's also important to do it upwards the tree becaus
// otherwise when the top level panel gets focus, it won't set it back to
// us, but to some other sibling
-
+
// CS:don't know if this is still needed:
//wxChildFocusEvent eventFocus(this);
//(void)GetEventHandler()->ProcessEvent(eventFocus);
event.Skip();
}
-void wxWindowMac::Clear()
-{
- wxClientDC dc(this);
- wxBrush brush(GetBackgroundColour(), wxSOLID);
- dc.SetBackground(brush);
- dc.Clear();
-}
-
-// Setup background and foreground colours correctly
-void wxWindowMac::SetupColours()
+void wxWindowMac::OnInternalIdle()
{
- if ( GetParent() )
- SetBackgroundColour(GetParent()->GetBackgroundColour());
-}
-
-void wxWindowMac::OnIdle(wxIdleEvent& event)
-{
-/*
- // Check if we need to send a LEAVE event
- if (m_mouseInWindow)
- {
- POINT pt;
- ::GetCursorPos(&pt);
- if (::WindowFromPoint(pt) != (HWND) GetHWND())
- {
- // Generate a LEAVE event
- m_mouseInWindow = FALSE;
- MSWOnMouseLeave(pt.x, pt.y, 0);
- }
- }
-*/
-
// This calls the UI-update mechanism (querying windows for
// menu/toolbar/control state information)
- UpdateWindowUI();
+ if (wxUpdateUIEvent::CanUpdate(this))
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
}
// Raise the window to the top of the Z order
void wxWindowMac::Raise()
{
+#if TARGET_API_MAC_OSX
+ HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderAbove, NULL) ;
+#endif
}
// Lower the window to the bottom of the Z order
void wxWindowMac::Lower()
{
-}
-
-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 ) ;
- }
+#if TARGET_API_MAC_OSX
+ HIViewSetZOrder((ControlRef)m_macControl,kHIViewZOrderBelow, NULL) ;
+#endif
}
-wxWindowMac* wxWindowMac::s_lastMouseWindow = NULL ;
+// static wxWindow *gs_lastWhich = NULL;
-bool wxWindowMac::MacGetWindowFromPointSub( const wxPoint &point , wxWindowMac** outWin )
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt)
{
- 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 ) ;
+ // first trigger a set cursor event
- if ( !IsTopLevel() )
- {
- newPoint.x -= m_x;
- newPoint.y -= m_y;
- }
-
- for (wxNode *node = GetChildren().First(); node; node = node->Next())
+ wxPoint clientorigin = GetClientAreaOrigin() ;
+ wxSize clientsize = GetClientSize() ;
+ wxCursor cursor ;
+ if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
{
- wxWindowMac *child = (wxWindowMac*)node->Data();
- // added the m_isShown test --dmazzoni
- if ( child->MacGetRootWindow() == window && child->m_isShown )
- {
- if (child->MacGetWindowFromPointSub(newPoint , outWin ))
- return TRUE;
- }
- }
-
- *outWin = this ;
- return TRUE;
-}
+ wxSetCursorEvent event( pt.x , pt.y );
-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 )
+ bool processedEvtSetCursor = GetEventHandler()->ProcessEvent(event);
+ if ( processedEvtSetCursor && event.HasCursor() )
{
- // 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 ) ;
+ cursor = event.GetCursor() ;
}
- }
- return FALSE ;
-}
-
-extern int wxBusyCursorCount ;
-
-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 ) ) )
- 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 (wxNode *node = GetChildren().First(); node; node = node->Next())
- {
- wxWindowMac *child = (wxWindowMac*)node->Data();
- if ( child->MacGetRootWindow() == window && child->IsShown() && child->IsEnabled() )
+ else
{
- if (child->MacDispatchMouseEvent(event))
- return TRUE;
- }
- }
- event.m_x = x ;
- event.m_y = y ;
-
- if ( wxBusyCursorCount == 0 )
- {
- m_cursor.MacInstall() ;
- }
-
- if ( event.GetEventType() == wxEVT_LEFT_DOWN )
- {
- // set focus to this window
- if (AcceptsFocus() && FindFocus()!=this)
- SetFocus();
+ // the test for processedEvtSetCursor is here to prevent using m_cursor
+ // if the user code caught EVT_SET_CURSOR() and returned nothing from
+ // it - this is a way to say that our cursor shouldn't be used for this
+ // point
+ if ( !processedEvtSetCursor && m_cursor.Ok() )
+ {
+ cursor = m_cursor ;
+ }
+ if ( wxIsBusy() )
+ {
+ }
+ else
+ {
+ if ( !GetParent() )
+ cursor = *wxSTANDARD_CURSOR ;
+ }
+ }
+ if ( cursor.Ok() )
+ cursor.MacInstall() ;
}
-
-#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
-
- GetEventHandler()->ProcessEvent( event ) ;
-
- return TRUE;
+ return cursor.Ok() ;
}
wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
{
return m_tooltip->GetTip() ;
}
- return "" ;
+ return wxEmptyString ;
}
void wxWindowMac::Update()
{
- wxTopLevelWindowMac* win = MacGetTopLevelWindow( ) ;
- if ( win )
- {
- win->MacUpdate( 0 ) ;
-#if TARGET_API_MAC_CARBON
- if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) )
- {
- QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ;
- }
+#if TARGET_API_MAC_OSX
+ HIViewSetNeedsDisplay( (ControlRef) m_macControl , true ) ;
+#else
+ ::Draw1Control( (ControlRef) m_macControl ) ;
#endif
- }
}
-wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
+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()
+wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
{
- RgnHandle visRgn = NewRgn() ;
- RgnHandle tempRgn = 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( tempRgn , borderOther , borderTop , m_width - borderOther , m_height - borderOther ) ;
- DiffRgn( visRgn , tempRgn , visRgn ) ;
- }
-
- if ( !IsTopLevel() )
- {
- wxWindow* parent = GetParent() ;
- while( parent )
- {
- wxSize size = parent->GetSize() ;
- int x , y ;
- x = y = 0 ;
- parent->MacWindowToRootWindow( &x, &y ) ;
- MacRootWindowToWindow( &x , &y ) ;
- SetRectRgn( tempRgn , x , y , x + size.x , y + size.y ) ;
- SectRgn( visRgn , tempRgn , visRgn ) ;
- if ( parent->IsTopLevel() )
- break ;
- parent = parent->GetParent() ;
- }
- }
- if ( GetWindowStyle() & wxCLIP_CHILDREN )
- {
- for (wxNode *node = GetChildren().First(); node; node = node->Next())
- {
- wxWindowMac *child = (wxWindowMac*)node->Data();
-
- 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 ) ;
- DiffRgn( visRgn , tempRgn , visRgn ) ;
- }
- }
- }
-
- if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
- {
- bool thisWindowThrough = false ;
- for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
+ Rect r ;
+ RgnHandle visRgn = NewRgn() ;
+ RgnHandle tempRgn = NewRgn() ;
+ if ( IsControlVisible( (ControlRef) m_macControl ) )
{
- wxWindowMac *sibling = (wxWindowMac*)node->Data();
- if ( sibling == this )
+ GetControlBounds( (ControlRef) m_macControl , &r ) ;
+ if (! MacGetTopLevelWindow()->MacUsesCompositing() )
{
- thisWindowThrough = true ;
- continue ;
+ MacRootWindowToWindow( &r.left , & r.top ) ;
+ MacRootWindowToWindow( &r.right , & r.bottom ) ;
}
- if( !thisWindowThrough )
+ else
{
- continue ;
+ r.right -= r.left ;
+ r.bottom -= r.top ;
+ r.left = 0 ;
+ r.top = 0 ;
}
-
- if ( !sibling->IsTopLevel() && sibling->IsShown() )
+ if ( includeOuterStructures )
+ InsetRect( &r , -3 , -3 ) ;
+ RectRgn( visRgn , &r ) ;
+ if ( !IsTopLevel() )
{
- 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 ) ;
- DiffRgn( visRgn , tempRgn , visRgn ) ;
+ wxWindow* child = this ;
+ wxWindow* parent = child->GetParent() ;
+ while( parent )
+ {
+ int x , y ;
+ wxSize size ;
+ // we have to find a better clipping algorithm here, in order not to clip things
+ // positioned like status and toolbar
+ if ( 1 /* parent->IsTopLevel() && child->IsKindOf( CLASSINFO( wxToolBar ) ) */ )
+ {
+ size = parent->GetSize() ;
+ x = y = 0 ;
+ }
+ else
+ {
+ size = parent->GetClientSize() ;
+ wxPoint origin = parent->GetClientAreaOrigin() ;
+ x = origin.x ;
+ y = origin.y ;
+ }
+ parent->MacWindowToRootWindow( &x, &y ) ;
+ MacRootWindowToWindow( &x , &y ) ;
+
+ 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 ;
+ child = parent ;
+ parent = child->GetParent() ;
+ }
}
- }
- }
- m_macVisibleRegion = visRgn ;
- DisposeRgn( visRgn ) ;
- DisposeRgn( tempRgn ) ;
- return m_macVisibleRegion ;
+ }
+
+ wxRegion vis = visRgn ;
+ DisposeRgn( visRgn ) ;
+ DisposeRgn( tempRgn ) ;
+ 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
+ bool handled = false ;
- WindowRef window = (WindowRef) MacGetRootWindow() ;
-
+ // calculate a client-origin version of the update rgn and set m_updateRegion to that
{
- // 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 ) ;
+ SectRgn( newupdate , updatergn , newupdate ) ;
OffsetRgn( newupdate , -origin.x , -origin.y ) ;
m_updateRegion = newupdate ;
- DisposeRgn( newupdate ) ; // it's been cloned to m_updateRegion
+ DisposeRgn( newupdate ) ;
+ }
+
+ if ( !EmptyRgn(updatergn) )
+ {
+ wxWindowDC dc(this);
+ if (!EmptyRgn(updatergn))
+ dc.SetClippingRegion(wxRegion(updatergn));
- if ( erase && !EmptyRgn(ownUpdateRgn) )
- {
- wxWindowDC dc(this);
- dc.SetClippingRegion(wxRegion(ownUpdateRgn));
- wxEraseEvent eevent( GetId(), &dc );
- eevent.SetEventObject( this );
- GetEventHandler()->ProcessEvent( eevent );
-
- wxNcPaintEvent eventNc( GetId() );
- eventNc.SetEventObject( this );
- GetEventHandler()->ProcessEvent( eventNc );
- }
- DisposeRgn( ownUpdateRgn ) ;
+ wxEraseEvent eevent( GetId(), &dc );
+ eevent.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( eevent );
+
if ( !m_updateRegion.Empty() )
{
- wxPaintEvent event;
- event.m_timeStamp = time ;
- event.SetEventObject(this);
- GetEventHandler()->ProcessEvent(event);
- }
+ // paint the window itself
+ wxPaintEvent event;
+ event.m_timeStamp = time ;
+ event.SetEventObject(this);
+ handled = GetEventHandler()->ProcessEvent(event);
+
+ // paint custom borders
+ wxNcPaintEvent eventNc( GetId() );
+ eventNc.SetEventObject( this );
+ GetEventHandler()->ProcessEvent( eventNc );
+ }
}
+ return handled ;
+}
+
+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
+
+ // 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;
+ UMAGetControlBoundsInWindowCoords( (ControlRef)m_macControl, &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 );
- // now intersect for each of the children their rect with the updateRgn and call MacRedraw recursively
-
- RgnHandle childupdate = NewRgn() ;
- for (wxNode *node = GetChildren().First(); node; node = node->Next())
- {
- // calculate the update region for the child windows by intersecting the window rectangle with our own
- // passed in update region and then offset it to be client-wise window coordinates again
- wxWindowMac *child = (wxWindowMac*)node->Data();
- 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 ) ;
- }
+ //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 ;
-
+
while( iter )
{
if ( iter->IsTopLevel() )
return ((wxTopLevelWindow*)iter)->MacGetWindowRef() ;
iter = iter->GetParent() ;
- }
- wxASSERT_MSG( 1 , "No valid mac root window" ) ;
+ }
+ wxASSERT_MSG( 1 , wxT("No valid mac root window") ) ;
return NULL ;
}
-void wxWindowMac::MacCreateScrollBars( long style )
+void wxWindowMac::MacCreateScrollBars( long style )
{
- wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , "attempt to create window twice" ) ;
-
+ wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
+
bool hasBoth = ( style & wxVSCROLL ) && ( style & wxHSCROLL ) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 1: 0 ;
int width, height ;
GetClientSize( &width , &height ) ;
-
+
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) ;
-
- m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
+
+ m_vScrollBar = new wxScrollBar(this, wxWINDOW_VSCROLL, vPoint,
vSize , wxVERTICAL);
if ( style & wxVSCROLL )
{
-
+
}
else
{
m_vScrollBar->Show(false) ;
}
- m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
+ m_hScrollBar = new wxScrollBar(this, wxWINDOW_HSCROLL, hPoint,
hSize , wxHORIZONTAL);
if ( style & wxHSCROLL )
{
{
m_hScrollBar->Show(false) ;
}
-
+
// because the create does not take into account the client area origin
MacRepositionScrollBars() ; // we might have a real position shift
}
{
bool hasBoth = ( m_hScrollBar && m_hScrollBar->IsShown()) && ( m_vScrollBar && m_vScrollBar->IsShown()) ;
int adjust = hasBoth ? MAC_SCROLLBAR_SIZE - 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();
-
+
wxPoint vPoint(width-MAC_SCROLLBAR_SIZE, 0) ;
wxSize vSize(MAC_SCROLLBAR_SIZE, height - adjust) ;
wxPoint hPoint(0 , height-MAC_SCROLLBAR_SIZE ) ;
wxSize hSize( width - adjust, MAC_SCROLLBAR_SIZE) ;
-
- int x = 0 ;
+
+ int 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 ) ;
-
+
wxWindowMac *iter = (wxWindowMac*)this ;
-
+
int totW = 10000 , totH = 10000;
while( iter )
{
if ( iter->IsTopLevel() )
{
- totW = iter->m_width ;
- totH = iter->m_height ;
+ iter->GetSize( &totW , &totH ) ;
break ;
}
iter = iter->GetParent() ;
- }
-
+ }
+
if ( x == 0 )
{
hPoint.x = -1 ;
vPoint.y = -1 ;
vSize.y += 1 ;
}
-
+
if ( w-x >= totW )
{
hSize.x += 1 ;
vPoint.x += 1 ;
}
-
+
if ( h-y >= totH )
{
vSize.y += 1 ;
return MacCanFocus() && wxWindowBase::AcceptsFocus();
}
-WXWidget wxWindowMac::MacGetContainerForEmbedding()
-{
- return GetParent()->MacGetContainerForEmbedding() ;
-}
-
-void wxWindowMac::MacSuperChangedPosition()
+void wxWindowMac::MacSuperChangedPosition()
{
// only window-absolute structures have to be moved i.e. controls
- wxNode *node = GetChildren().First();
+ wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->Data();
+ wxWindowMac *child = node->GetData();
child->MacSuperChangedPosition() ;
- node = node->Next();
+ node = node->GetNext();
}
}
-void wxWindowMac::MacTopLevelWindowChangedPosition()
+void wxWindowMac::MacTopLevelWindowChangedPosition()
{
// only screen-absolute structures have to be moved i.e. glcanvas
- wxNode *node = GetChildren().First();
+ wxWindowListNode *node = GetChildren().GetFirst();
while ( node )
{
- wxWindowMac *child = (wxWindowMac *)node->Data();
+ wxWindowMac *child = node->GetData();
child->MacTopLevelWindowChangedPosition() ;
- node = node->Next();
+ node = node->GetNext();
}
}
+
long wxWindowMac::MacGetLeftBorderSize( ) const
{
if( IsTopLevel() )
{
SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
#endif
return border ;
}
{
SInt32 border = 3 ;
#if wxMAC_USE_THEME_BORDER
-#if TARGET_CARBON
GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
-#endif
#endif
return border ;
}
return MacGetLeftBorderSize() ;
}
-long wxWindowMac::MacRemoveBordersFromStyle( long style )
+long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
return style & ~( wxDOUBLE_BORDER | wxSUNKEN_BORDER | wxRAISED_BORDER | wxBORDER | wxSTATIC_BORDER ) ;
}
return wxPoint(x, y);
}
+void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
+{
+ if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
+ {
+ // copied from wxGTK : CS
+ // generate a "context menu" event: this is similar to wxEVT_RIGHT_DOWN
+ // except that:
+ //
+ // (a) it's a command event and so is propagated to the parent
+ // (b) under MSW it can be generated from kbd too
+ // (c) it uses screen coords (because of (a))
+ wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
+ this->GetId(),
+ this->ClientToScreen(event.GetPosition()));
+ if ( ! GetEventHandler()->ProcessEvent(evtCtx) )
+ 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