#include "wx/sysopt.h"
#endif
+//
+// TODO BEGIN move to nonowned_osx.cpp
+//
+
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
-// unified title and toolbar constant - not in Tiger headers, so we duplicate it here
-#define kWindowUnifiedTitleAndToolbarAttribute (1 << 7)
+// trace mask for activation tracing messages
+#define TRACE_ACTIVATE "activation"
+
+wxWindow* g_MacLastWindow = NULL ;
+
+// ---------------------------------------------------------------------------
+// wxWindowMac utility functions
+// ---------------------------------------------------------------------------
+
+// Find an item given the Macintosh Window Reference
+
+WX_DECLARE_HASH_MAP(WXWindow, wxNonOwnedWindow*, wxPointerHash, wxPointerEqual, MacWindowMap);
+
+static MacWindowMap wxWinMacWindowList;
+
+wxNonOwnedWindow *wxFindWindowFromWXWindow(WXWindow inWindowRef)
+{
+ MacWindowMap::iterator node = wxWinMacWindowList.find(inWindowRef);
+
+ return (node == wxWinMacWindowList.end()) ? NULL : node->second;
+}
+
+void wxAssociateWindowWithWXWindow(WXWindow inWindowRef, wxNonOwnedWindow *win) ;
+void wxAssociateWindowWithWXWindow(WXWindow inWindowRef, wxNonOwnedWindow *win)
+{
+ // adding NULL WindowRef is (first) surely a result of an error and
+ // nothing else :-)
+ wxCHECK_RET( inWindowRef != (WXWindow) NULL, wxT("attempt to add a NULL WindowRef to window list") );
+
+ wxWinMacWindowList[inWindowRef] = win;
+}
+
+void wxRemoveWXWindowAssociation(wxNonOwnedWindow *win) ;
+void wxRemoveWXWindowAssociation(wxNonOwnedWindow *win)
+{
+ MacWindowMap::iterator it;
+ for ( it = wxWinMacWindowList.begin(); it != wxWinMacWindowList.end(); ++it )
+ {
+ if ( it->second == win )
+ {
+ wxWinMacWindowList.erase(it);
+ break;
+ }
+ }
+}
+
+wxNonOwnedWindow* wxNonOwnedWindow::GetFromWXWindow( WXWindow win )
+{
+ return wxFindWindowFromWXWindow( win );
+}
+
+// ----------------------------------------------------------------------------
+// wxNonOwnedWindow creation
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS( wxNonOwnedWindowImpl , wxObject )
+
+wxNonOwnedWindow *wxNonOwnedWindow::s_macDeactivateWindow = NULL;
+
+void wxNonOwnedWindow::Init()
+{
+ m_nowpeer = NULL;
+}
+
+bool wxNonOwnedWindow::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
+{
+ // init our fields
+ Init();
+
+ m_windowStyle = style;
+
+ SetName( name );
+
+ m_windowId = id == -1 ? NewControlId() : id;
+ m_windowStyle = style;
+ m_isShown = false;
+
+ // create frame.
+ int x = (int)pos.x;
+ int y = (int)pos.y;
+
+ wxRect display = wxGetClientDisplayRect() ;
+
+ if ( x == wxDefaultPosition.x )
+ x = display.x ;
+
+ if ( y == wxDefaultPosition.y )
+ y = display.y ;
+
+ int w = WidthDefault(size.x);
+ int h = HeightDefault(size.y);
+
+ // temporary define, TODO
+#if wxOSX_USE_CARBON
+ m_nowpeer = new wxNonOwnedWindowCarbonImpl( this );
+#elif wxOSX_USE_COCOA
+ m_nowpeer = new wxNonOwnedWindowCocoaImpl( this );
+#elif wxOSX_USE_IPHONE
+ m_nowpeer = new wxNonOwnedWindowIPhoneImpl( this );
+#endif
+
+ m_nowpeer->Create( parent, wxPoint(x,y) , wxSize(w,h) , style , GetExtraStyle(), name ) ;
+ wxAssociateWindowWithWXWindow( m_nowpeer->GetWXWindow() , this ) ;
+#if wxOSX_USE_CARBON
+ // temporary cast, TODO
+ m_peer = (wxMacControl*) wxWidgetImpl::CreateContentView(this);
+#else
+ m_peer = wxWidgetImpl::CreateContentView(this);
+#endif
+
+ DoSetWindowVariant( m_windowVariant ) ;
+
+ wxWindowCreateEvent event(this);
+ HandleWindowEvent(event);
+
+ SetBackgroundColour(wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
+
+ if ( parent )
+ parent->AddChild(this);
+
+ return true;
+}
+
+wxNonOwnedWindow::~wxNonOwnedWindow()
+{
+ wxRemoveWXWindowAssociation( this ) ;
+ if ( m_nowpeer )
+ m_nowpeer->Destroy();
+
+ // avoid dangling refs
+ if ( s_macDeactivateWindow == this )
+ s_macDeactivateWindow = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// wxNonOwnedWindow misc
+// ----------------------------------------------------------------------------
+
+bool wxNonOwnedWindow::ShowWithEffect(wxShowEffect effect,
+ unsigned timeout )
+{
+ if ( !wxWindow::Show(true) )
+ return false;
+
+ // because apps expect a size event to occur at this moment
+ wxSizeEvent event(GetSize() , m_windowId);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+
+
+ return m_nowpeer->ShowWithEffect(true, effect, timeout);
+}
+
+bool wxNonOwnedWindow::HideWithEffect(wxShowEffect effect,
+ unsigned timeout )
+{
+ if ( !wxWindow::Show(false) )
+ return false;
+
+ return m_nowpeer->ShowWithEffect(false, effect, timeout);
+}
+
+wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
+{
+ int left, top, width, height;
+ m_nowpeer->GetContentArea(left, top, width, height);
+ return wxPoint(left, top);
+}
+
+bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )
+{
+ if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
+ return false ;
+
+ if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
+ {
+ return m_nowpeer->SetBackgroundColour(c);
+ }
+ return true;
+}
+
+// Raise the window to the top of the Z order
+void wxNonOwnedWindow::Raise()
+{
+ m_nowpeer->Raise();
+}
+
+// Lower the window to the bottom of the Z order
+void wxNonOwnedWindow::Lower()
+{
+ m_nowpeer->Lower();
+}
+
+void wxNonOwnedWindow::MacDelayedDeactivation(long timestamp)
+{
+ if (s_macDeactivateWindow)
+ {
+ wxLogTrace(TRACE_ACTIVATE,
+ wxT("Doing delayed deactivation of %p"),
+ s_macDeactivateWindow);
+
+ s_macDeactivateWindow->MacActivate(timestamp, false);
+ }
+}
+
+void wxNonOwnedWindow::MacActivate( long timestamp , bool WXUNUSED(inIsActivating) )
+{
+ wxLogTrace(TRACE_ACTIVATE, wxT("TopLevel=%p::MacActivate"), this);
+
+ if (s_macDeactivateWindow == this)
+ s_macDeactivateWindow = NULL;
+
+ MacDelayedDeactivation(timestamp);
+}
+
+bool wxNonOwnedWindow::Show(bool show)
+{
+ if ( !wxWindow::Show(show) )
+ return false;
+
+ if ( m_nowpeer )
+ m_nowpeer->Show(show);
+
+ if ( show )
+ {
+ // because apps expect a size event to occur at this moment
+ wxSizeEvent event(GetSize() , m_windowId);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ }
+
+ return true ;
+}
+
+bool wxNonOwnedWindow::SetTransparent(wxByte alpha)
+{
+ return m_nowpeer->SetTransparent(alpha);
+}
+
+
+bool wxNonOwnedWindow::CanSetTransparent()
+{
+ return m_nowpeer->CanSetTransparent();
+}
+
+
+void wxNonOwnedWindow::SetExtraStyle(long exStyle)
+{
+ if ( GetExtraStyle() == exStyle )
+ return ;
+
+ wxWindow::SetExtraStyle( exStyle ) ;
+
+ if ( m_nowpeer )
+ m_nowpeer->SetExtraStyle(exStyle);
+}
+
+bool wxNonOwnedWindow::SetBackgroundStyle(wxBackgroundStyle style)
+{
+ if ( !wxWindow::SetBackgroundStyle(style) )
+ return false ;
+
+ return m_nowpeer->SetBackgroundStyle(style);
+}
+
+void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)
+{
+ m_cachedClippedRectValid = false ;
+
+ m_nowpeer->MoveWindow(x, y, width, height);
+ wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+}
+
+void wxNonOwnedWindow::DoGetPosition( int *x, int *y ) const
+{
+ int x1,y1 ;
+ m_nowpeer->GetPosition(x1, y1);
+
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
+}
+
+void wxNonOwnedWindow::DoGetSize( int *width, int *height ) const
+{
+ int w,h;
+
+ m_nowpeer->GetSize(w, h);
+
+ if (width)
+ *width = w ;
+ if (height)
+ *height = h ;
+}
+
+void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
+{
+ int left, top, w, h;
+ m_nowpeer->GetContentArea(left, top, w, h);
+
+ if (width)
+ *width = w ;
+ if (height)
+ *height = h ;
+}
+
+
+void wxNonOwnedWindow::Update()
+{
+ m_nowpeer->Update();
+}
+
+WXWindow wxNonOwnedWindow::GetWXWindow() const
+{
+ return m_nowpeer ? m_nowpeer->GetWXWindow() : NULL;
+}
+
+// ---------------------------------------------------------------------------
+// Shape implementation
+// ---------------------------------------------------------------------------
+
+
+bool wxNonOwnedWindow::SetShape(const wxRegion& region)
+{
+ wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
+ _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
+
+ // The empty region signifies that the shape
+ // should be removed from the window.
+ if ( region.IsEmpty() )
+ {
+ wxSize sz = GetClientSize();
+ wxRegion rgn(0, 0, sz.x, sz.y);
+ if ( rgn.IsEmpty() )
+ return false ;
+ else
+ return SetShape(rgn);
+ }
+
+ return m_nowpeer->SetShape(region);
+}
+
+//
+// TODO END move to nonowned_osx.cpp
+//
+
+#if wxOSX_USE_CARBON
+
+IMPLEMENT_DYNAMIC_CLASS( wxNonOwnedWindowCarbonImpl , wxNonOwnedWindowImpl )
+
+
+WXWindow wxNonOwnedWindowCarbonImpl::GetWXWindow() const
+{
+ return (WXWindow) m_macWindow;
+}
+void wxNonOwnedWindowCarbonImpl::Raise()
+{
+ ::SelectWindow( m_macWindow ) ;
+}
+
+void wxNonOwnedWindowCarbonImpl::Lower()
+{
+ ::SendBehind( m_macWindow , NULL ) ;
+}
+
+bool wxNonOwnedWindowCarbonImpl::Show(bool show)
+{
+ bool plainTransition = true;
+
+#if wxUSE_SYSTEM_OPTIONS
+ if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
+ plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;
+#endif
+
+ if (show)
+ {
+#if wxOSX_USE_CARBON
+ if ( plainTransition )
+ ::ShowWindow( (WindowRef)m_macWindow );
+ else
+ ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
+
+ ::SelectWindow( (WindowRef)m_macWindow ) ;
+#endif
+ }
+ else
+ {
+#if wxOSX_USE_CARBON
+ if ( plainTransition )
+ ::HideWindow( (WindowRef)m_macWindow );
+ else
+ ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL );
+#endif
+ }
+ return true;
+}
+
+void wxNonOwnedWindowCarbonImpl::Update()
+{
+ HIWindowFlush(m_macWindow) ;
+}
+
+bool wxNonOwnedWindowCarbonImpl::SetTransparent(wxByte alpha)
+{
+ OSStatus result = SetWindowAlpha((WindowRef)m_macWindow, (CGFloat)((alpha)/255.0));
+ return result == noErr;
+}
+
+bool wxNonOwnedWindowCarbonImpl::SetBackgroundColour(const wxColour& col )
+{
+ if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDocumentWindowBackground)) )
+ {
+ SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDocumentWindowBackground, false ) ;
+ SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+ }
+ else if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDialogBackgroundActive)) )
+ {
+ SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDialogBackgroundActive, false ) ;
+ SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+ }
+ return true;
+}
+
+void wxNonOwnedWindowCarbonImpl::SetExtraStyle( long exStyle )
+{
+ if ( m_macWindow != NULL )
+ {
+ bool metal = exStyle & wxFRAME_EX_METAL ;
+
+ if ( MacGetMetalAppearance() != metal )
+ {
+ if ( MacGetUnifiedAppearance() )
+ MacSetUnifiedAppearance( !metal ) ;
+
+ MacSetMetalAppearance( metal ) ;
+ }
+ }
+}
+
+bool wxNonOwnedWindowCarbonImpl::SetBackgroundStyle(wxBackgroundStyle style)
+{
+ if ( style == wxBG_STYLE_TRANSPARENT )
+ {
+ OSStatus err = HIWindowChangeFeatures( m_macWindow, 0, kWindowIsOpaque );
+ verify_noerr( err );
+ err = ReshapeCustomWindow( m_macWindow );
+ verify_noerr( err );
+ }
+
+ return true ;
+}
+
+bool wxNonOwnedWindowCarbonImpl::CanSetTransparent()
+{
+ return true;
+}
+
+void wxNonOwnedWindowCarbonImpl::GetContentArea( int &left , int &top , int &width , int &height ) const
+{
+ Rect content, structure ;
+
+ GetWindowBounds( m_macWindow, kWindowStructureRgn , &structure ) ;
+ GetWindowBounds( m_macWindow, kWindowContentRgn , &content ) ;
+
+ left = content.left - structure.left ;
+ top = content.top - structure.top ;
+ width = content.right - content.left ;
+ height = content.bottom - content.top ;
+}
+
+void wxNonOwnedWindowCarbonImpl::MoveWindow(int x, int y, int width, int height)
+{
+ Rect bounds = { y , x , y + height , x + width } ;
+ verify_noerr(SetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+}
+
+void wxNonOwnedWindowCarbonImpl::GetPosition( int &x, int &y ) const
+{
+ Rect bounds ;
+
+ verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+
+ x = bounds.left ;
+ y = bounds.top ;
+}
+
+void wxNonOwnedWindowCarbonImpl::GetSize( int &width, int &height ) const
+{
+ Rect bounds ;
+
+ verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+
+ width = bounds.right - bounds.left ;
+ height = bounds.bottom - bounds.top ;
+}
+
+bool wxNonOwnedWindowCarbonImpl::MacGetUnifiedAppearance() const
+{
+ return MacGetWindowAttributes() & kWindowUnifiedTitleAndToolbarAttribute ;
+}
+
+void wxNonOwnedWindowCarbonImpl::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear )
+{
+ ChangeWindowAttributes( m_macWindow, attributesToSet, attributesToClear ) ;
+}
+
+wxUint32 wxNonOwnedWindowCarbonImpl::MacGetWindowAttributes() const
+{
+ UInt32 attr = 0 ;
+ GetWindowAttributes( m_macWindow, &attr ) ;
+ return attr ;
+}
+
+void wxNonOwnedWindowCarbonImpl::MacSetMetalAppearance( bool set )
+{
+ if ( MacGetUnifiedAppearance() )
+ MacSetUnifiedAppearance( false ) ;
+
+ MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes ,
+ set ? kWindowNoAttributes : kWindowMetalAttribute ) ;
+}
+
+bool wxNonOwnedWindowCarbonImpl::MacGetMetalAppearance() const
+{
+ return MacGetWindowAttributes() & kWindowMetalAttribute ;
+}
+
+void wxNonOwnedWindowCarbonImpl::MacSetUnifiedAppearance( bool set )
+{
+ if ( MacGetMetalAppearance() )
+ MacSetMetalAppearance( false ) ;
+
+ MacChangeWindowAttributes( set ? kWindowUnifiedTitleAndToolbarAttribute : kWindowNoAttributes ,
+ set ? kWindowNoAttributes : kWindowUnifiedTitleAndToolbarAttribute) ;
+
+ // For some reason, Tiger uses white as the background color for this appearance,
+ // while most apps using it use the typical striped background. Restore that behavior
+ // for wx.
+ // TODO: Determine if we need this on Leopard as well. (should be harmless either way,
+ // though)
+ m_wxPeer->SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
+}
-// trace mask for activation tracing messages
-#define TRACE_ACTIVATE "activation"
// ----------------------------------------------------------------------------
// globals
// wxNonOwnedWindow implementation
// ============================================================================
+// unified title and toolbar constant - not in Tiger headers, so we duplicate it here
+#define kWindowUnifiedTitleAndToolbarAttribute (1 << 7)
+
// ---------------------------------------------------------------------------
// Carbon Events
// ---------------------------------------------------------------------------
// FindFocus does not return the actual focus window, but the enclosing window
wxWindow* focus = wxWindow::DoFindFocus();
if ( focus == NULL )
- focus = (wxNonOwnedWindow*) data ;
+ focus = data ? ((wxNonOwnedWindowImpl*) data)->GetWXPeer() : NULL ;
unsigned char charCode ;
wxChar uniChar[2] ;
//
// This handler can also be called from app level where data (ie target window) may be null or a non wx window
-wxWindow* g_MacLastWindow = NULL ;
-
EventMouseButton g_lastButton = 0 ;
bool g_lastButtonWasFakeRight = false ;
EventRef event,
void *data)
{
- wxNonOwnedWindow* toplevelWindow = (wxNonOwnedWindow*) data ;
+ wxNonOwnedWindow* toplevelWindow = data ? ((wxNonOwnedWindowImpl*) data)->GetWXPeer() : NULL ;
OSStatus result = eventNotHandledErr ;
if ( window )
{
- wxMacGlobalToLocal( window, &windowMouseLocation ) ;
+ QDGlobalToLocalPoint( GetWindowPort( window ), &windowMouseLocation );
if ( wxApp::s_captureWindow
#if !NEW_CAPTURE_HANDLING
// if there is no control below the mouse position, send the event to the toplevel window itself
if ( control == 0 )
{
- currentMouseWindow = (wxWindow*) data ;
+ currentMouseWindow = (wxWindow*) toplevelWindow ;
}
else
{
- currentMouseWindow = (wxWindow*) wxFindControlFromMacControl( control ) ;
+ currentMouseWindow = (wxWindow*) wxFindWindowFromWXWidget( (WXWidget) control ) ;
#ifndef __WXUNIVERSAL__
if ( currentMouseWindow == NULL && cEvent.GetKind() == kEventMouseMoved )
{
// instead of its children (wxToolBarTools)
ControlRef parent ;
GetSuperControl(control, &parent );
- wxWindow *wxParent = (wxWindow*) wxFindControlFromMacControl( parent ) ;
+ wxWindow *wxParent = (wxWindow*) wxFindWindowFromWXWidget((WXWidget) parent ) ;
if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) )
currentMouseWindow = wxParent ;
#endif
wxMacCarbonEvent cEvent( event ) ;
// WindowRef windowRef = cEvent.GetParameter<WindowRef>(kEventParamDirectObject) ;
- wxNonOwnedWindow* toplevelWindow = (wxNonOwnedWindow*) data ;
+ wxNonOwnedWindow* toplevelWindow = data ? ((wxNonOwnedWindowImpl*) data)->GetWXPeer() : NULL;
switch ( GetEventKind( event ) )
{
{
// all (Mac) rects are in content area coordinates, all wxRects in structure coordinates
int left , top , right , bottom ;
- toplevelWindow->MacGetContentAreaInset( left , top , right , bottom ) ;
+
+ toplevelWindow->GetNonOwnedPeer()->GetContentArea(left, top, right, bottom);
wxRect r(
newRect.left - left,
DEFINE_ONE_SHOT_HANDLER_GETTER( wxNonOwnedEventHandler )
// ---------------------------------------------------------------------------
-// wxWindowMac utility functions
+// Support functions for shaped windows, based on Apple's CustomWindow sample at
+// http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
// ---------------------------------------------------------------------------
-// Find an item given the Macintosh Window Reference
+static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
+{
+ GetWindowPortBounds(window, inRect);
+ Point pt = { inRect->top ,inRect->left };
+ QDLocalToGlobalPoint( GetWindowPort( window ), &pt );
+ inRect->bottom += pt.v - inRect->top;
+ inRect->right += pt.h - inRect->left;
+ inRect->top = pt.v;
+ inRect->left = pt.h;
+}
-WX_DECLARE_HASH_MAP(WindowRef, wxNonOwnedWindow*, wxPointerHash, wxPointerEqual, MacWindowMap);
+static SInt32 wxShapedMacWindowGetFeatures(WindowRef WXUNUSED(window), SInt32 param)
+{
+ /*------------------------------------------------------
+ Define which options your custom window supports.
+ --------------------------------------------------------*/
+ //just enable everything for our demo
+ *(OptionBits*)param =
+ //kWindowCanGrow |
+ //kWindowCanZoom |
+ kWindowCanCollapse |
+ //kWindowCanGetWindowRegion |
+ //kWindowHasTitleBar |
+ //kWindowSupportsDragHilite |
+ kWindowCanDrawInCurrentPort |
+ //kWindowCanMeasureTitle |
+ kWindowWantsDisposeAtProcessDeath |
+ kWindowSupportsGetGrowImageRegion |
+ kWindowDefSupportsColorGrafPort;
-static MacWindowMap wxWinMacWindowList;
+ return 1;
+}
-wxNonOwnedWindow *wxFindWinFromMacWindow(WindowRef inWindowRef)
+// The content region is left as a rectangle matching the window size, this is
+// so the origin in the paint event, and etc. still matches what the
+// programmer expects.
+static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
{
- MacWindowMap::iterator node = wxWinMacWindowList.find(inWindowRef);
-
- return (node == wxWinMacWindowList.end()) ? NULL : node->second;
+ SetEmptyRgn(rgn);
+ wxNonOwnedWindow* win = wxNonOwnedWindow::GetFromWXWindow((WXWindow)window);
+ if (win)
+ {
+ Rect r ;
+ wxShapedMacWindowGetPos( window, &r ) ;
+ RectRgn( rgn , &r ) ;
+ }
}
-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxNonOwnedWindow *win) ;
-void wxAssociateWinWithMacWindow(WindowRef inWindowRef, wxNonOwnedWindow *win)
+// The structure region is set to the shape given to the SetShape method.
+static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn)
{
- // adding NULL WindowRef is (first) surely a result of an error and
- // nothing else :-)
- wxCHECK_RET( inWindowRef != (WindowRef) NULL, wxT("attempt to add a NULL WindowRef to window list") );
+ RgnHandle cachedRegion = (RgnHandle) GetWRefCon(window);
- wxWinMacWindowList[inWindowRef] = win;
+ SetEmptyRgn(rgn);
+ if (cachedRegion)
+ {
+ Rect windowRect;
+ wxShapedMacWindowGetPos(window, &windowRect); // how big is the window
+ CopyRgn(cachedRegion, rgn); // make a copy of our cached region
+ OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window
+ //MapRgn(rgn, &mMaskSize, &windowRect); //scale it to our actual window size
+ }
}
-void wxRemoveMacWindowAssociation(wxNonOwnedWindow *win) ;
-void wxRemoveMacWindowAssociation(wxNonOwnedWindow *win)
+static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
{
- MacWindowMap::iterator it;
- for ( it = wxWinMacWindowList.begin(); it != wxWinMacWindowList.end(); ++it )
+ GetWindowRegionPtr rgnRec = (GetWindowRegionPtr)param;
+
+ if (rgnRec == NULL)
+ return paramErr;
+
+ switch (rgnRec->regionCode)
{
- if ( it->second == win )
- {
- wxWinMacWindowList.erase(it);
+ case kWindowStructureRgn:
+ wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
break;
- }
- }
-}
-// ----------------------------------------------------------------------------
-// wxNonOwnedWindow creation
-// ----------------------------------------------------------------------------
+ case kWindowContentRgn:
+ wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
+ break;
-wxNonOwnedWindow *wxNonOwnedWindow::s_macDeactivateWindow = NULL;
+ default:
+ SetEmptyRgn(rgnRec->winRgn);
+ break;
+ }
-void wxNonOwnedWindow::Init()
-{
- m_macWindow = NULL ;
- m_macEventHandler = NULL ;
+ return noErr;
}
-wxMacDeferredWindowDeleter::wxMacDeferredWindowDeleter( WindowRef windowRef )
+// Determine the region of the window which was hit
+//
+static SInt32 wxShapedMacWindowHitTest(WindowRef window, SInt32 param)
{
- m_macWindow = windowRef ;
-}
+ Point hitPoint;
+ static RgnHandle tempRgn = NULL;
-wxMacDeferredWindowDeleter::~wxMacDeferredWindowDeleter()
-{
- DisposeWindow( (WindowRef) m_macWindow ) ;
+ if (tempRgn == NULL)
+ tempRgn = NewRgn();
+
+ // get the point clicked
+ SetPt( &hitPoint, LoWord(param), HiWord(param) );
+
+ // Mac OS 8.5 or later
+ wxShapedMacWindowStructureRegion(window, tempRgn);
+ if (PtInRgn( hitPoint, tempRgn )) //in window content region?
+ return wInContent;
+
+ // no significant area was hit
+ return wNoHit;
}
-bool wxNonOwnedWindow::Create(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+static pascal long wxShapedMacWindowDef(short WXUNUSED(varCode), WindowRef window, SInt16 message, SInt32 param)
{
- // init our fields
- Init();
+ switch (message)
+ {
+ case kWindowMsgHitTest:
+ return wxShapedMacWindowHitTest(window, param);
- m_windowStyle = style;
+ case kWindowMsgGetFeatures:
+ return wxShapedMacWindowGetFeatures(window, param);
- SetName( name );
+ // kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
+ case kWindowMsgGetRegion:
+ return wxShapedMacWindowGetRegion(window, param);
- m_windowId = id == -1 ? NewControlId() : id;
+ default:
+ break;
+ }
- DoMacCreateRealWindow( parent, pos , size , style , name ) ;
+ return 0;
+}
- SetBackgroundColour(wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ));
+// implementation
- if (GetExtraStyle() & wxFRAME_EX_METAL)
- MacSetMetalAppearance(true);
+typedef struct
+{
+ wxPoint m_position ;
+ wxSize m_size ;
+ bool m_wasResizable ;
+} FullScreenData ;
- if ( parent )
- parent->AddChild(this);
+wxNonOwnedWindowCarbonImpl::wxNonOwnedWindowCarbonImpl()
+{
+}
- return true;
+wxNonOwnedWindowCarbonImpl::wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) : wxNonOwnedWindowImpl( nonownedwnd)
+{
+ m_macEventHandler = NULL;
+ m_macWindow = NULL;
+ m_macFullScreenData = NULL ;
}
-wxNonOwnedWindow::~wxNonOwnedWindow()
+wxNonOwnedWindowCarbonImpl::~wxNonOwnedWindowCarbonImpl()
{
- if ( m_macWindow )
- {
#if wxUSE_TOOLTIPS
wxToolTip::NotifyWindowDelete(m_macWindow) ;
#endif
- wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
- }
if ( m_macEventHandler )
{
m_macEventHandler = NULL ;
}
- wxRemoveMacWindowAssociation( this ) ;
-
- // avoid dangling refs
- if ( s_macDeactivateWindow == this )
- s_macDeactivateWindow = NULL;
-}
-
-// ----------------------------------------------------------------------------
-// wxNonOwnedWindow misc
-// ----------------------------------------------------------------------------
-
-wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
-{
- return wxPoint(0, 0) ;
-}
+ if ( m_macWindow )
+ DisposeWindow( m_macWindow );
-bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )
-{
- wxColour col = c;
- if ( col == wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) )
- col = wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDocumentWindowBackground));
- else if ( col == wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) )
- col = wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDialogBackgroundActive));
-
- if ( !wxWindow::SetBackgroundColour(col) && m_hasBgCol )
- return false ;
-
- if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
- {
- if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDocumentWindowBackground)) )
- {
- SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDocumentWindowBackground, false ) ;
- SetBackgroundStyle(wxBG_STYLE_SYSTEM);
- }
- else if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDialogBackgroundActive)) )
- {
- SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDialogBackgroundActive, false ) ;
- SetBackgroundStyle(wxBG_STYLE_SYSTEM);
- }
- }
- return true;
-}
+ FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+ delete data ;
+ m_macFullScreenData = NULL ;
+
+ m_macWindow = NULL;
+
+}
+
+void wxNonOwnedWindowCarbonImpl::Destroy()
+{
+ wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) ) ;
+}
void wxNonOwnedWindowInstallTopLevelWindowEventHandler(WindowRef window, EventHandlerRef* handler, void *ref)
{
GetEventTypeCount(eventList), eventList, ref, handler );
}
-void wxNonOwnedWindow::MacInstallTopLevelWindowEventHandler()
+bool wxNonOwnedWindowCarbonImpl::SetShape(const wxRegion& region)
+{
+ // Make a copy of the region
+ RgnHandle shapeRegion = NewRgn();
+ HIShapeGetAsQDRgn( region.GetWXHRGN(), shapeRegion );
+
+ // Dispose of any shape region we may already have
+ RgnHandle oldRgn = (RgnHandle)GetWRefCon( (WindowRef) m_wxPeer->GetWXWindow() );
+ if ( oldRgn )
+ DisposeRgn(oldRgn);
+
+ // Save the region so we can use it later
+ SetWRefCon((WindowRef) m_wxPeer->GetWXWindow(), (URefCon)shapeRegion);
+
+ // inform the window manager that the window has changed shape
+ ReshapeCustomWindow((WindowRef) m_wxPeer->GetWXWindow());
+
+ return true;
+}
+
+
+void wxNonOwnedWindowCarbonImpl::MacInstallTopLevelWindowEventHandler()
{
if ( m_macEventHandler != NULL )
{
wxNonOwnedWindowInstallTopLevelWindowEventHandler(MAC_WXHWND(m_macWindow),(EventHandlerRef *)&m_macEventHandler,this);
}
-void wxNonOwnedWindow::MacCreateRealWindow(
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name )
-{
- DoMacCreateRealWindow( NULL, pos, size, style, name );
-}
-
-void wxNonOwnedWindow::DoMacCreateRealWindow(
+void wxNonOwnedWindowCarbonImpl::Create(
wxWindow* parent,
const wxPoint& pos,
const wxSize& size,
- long style,
+ long style, long extraStyle,
const wxString& name )
{
+
OSStatus err = noErr ;
- SetName(name);
- m_windowStyle = style;
- m_isShown = false;
+ Rect theBoundsRect;
- // create frame.
int x = (int)pos.x;
int y = (int)pos.y;
- Rect theBoundsRect;
- wxRect display = wxGetClientDisplayRect() ;
-
- if ( x == wxDefaultPosition.x )
- x = display.x ;
-
- if ( y == wxDefaultPosition.y )
- y = display.y ;
-
- int w = WidthDefault(size.x);
- int h = HeightDefault(size.y);
+ int w = size.x;
+ int h = size.y;
::SetRect(&theBoundsRect, x, y , x + w, y + h);
bool activationScopeSet = false;
WindowActivationScope activationScope = kWindowActivationScopeNone;
- if ( HasFlag( wxFRAME_TOOL_WINDOW) )
+ if ( style & wxFRAME_TOOL_WINDOW )
{
if (
- HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
- HasFlag( wxSYSTEM_MENU ) || HasFlag( wxCAPTION ) ||
- HasFlag(wxTINY_CAPTION_HORIZ) || HasFlag(wxTINY_CAPTION_VERT)
+ ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) ||
+ ( style & wxSYSTEM_MENU ) || ( style & wxCAPTION ) ||
+ ( style &wxTINY_CAPTION_HORIZ) || ( style &wxTINY_CAPTION_VERT)
)
{
- if ( HasFlag( wxSTAY_ON_TOP ) )
+ if ( ( style & wxSTAY_ON_TOP ) )
wclass = kUtilityWindowClass;
else
wclass = kFloatingWindowClass ;
- if ( HasFlag(wxTINY_CAPTION_VERT) )
+ if ( ( style &wxTINY_CAPTION_VERT) )
attr |= kWindowSideTitlebarAttribute ;
}
else
activationScope = kWindowActivationScopeNone;
}
}
- else if ( HasFlag( wxPOPUP_WINDOW ) )
+ else if ( ( style & wxPOPUP_WINDOW ) )
{
- if ( HasFlag( wxBORDER_NONE ) )
+ if ( ( style & wxBORDER_NONE ) )
{
wclass = kHelpWindowClass ; // has no border
attr |= kWindowNoShadowAttribute;
activationScopeSet = true;
activationScope = kWindowActivationScopeNone;
}
- else if ( HasFlag( wxCAPTION ) )
+ else if ( ( style & wxCAPTION ) )
{
wclass = kDocumentWindowClass ;
attr |= kWindowInWindowMenuAttribute ;
}
- else if ( HasFlag( wxFRAME_DRAWER ) )
+ else if ( ( style & wxFRAME_DRAWER ) )
{
wclass = kDrawerWindowClass;
}
else
{
- if ( HasFlag( wxMINIMIZE_BOX ) || HasFlag( wxMAXIMIZE_BOX ) ||
- HasFlag( wxCLOSE_BOX ) || HasFlag( wxSYSTEM_MENU ) )
+ if ( ( style & wxMINIMIZE_BOX ) || ( style & wxMAXIMIZE_BOX ) ||
+ ( style & wxCLOSE_BOX ) || ( style & wxSYSTEM_MENU ) )
{
wclass = kDocumentWindowClass ;
}
- else if ( HasFlag( wxNO_BORDER ) )
+ else if ( ( style & wxNO_BORDER ) )
{
wclass = kSimpleWindowClass ;
}
if ( wclass != kPlainWindowClass )
{
- if ( HasFlag( wxMINIMIZE_BOX ) )
+ if ( ( style & wxMINIMIZE_BOX ) )
attr |= kWindowCollapseBoxAttribute ;
- if ( HasFlag( wxMAXIMIZE_BOX ) )
+ if ( ( style & wxMAXIMIZE_BOX ) )
attr |= kWindowFullZoomAttribute ;
- if ( HasFlag( wxRESIZE_BORDER ) )
+ if ( ( style & wxRESIZE_BORDER ) )
attr |= kWindowResizableAttribute ;
- if ( HasFlag( wxCLOSE_BOX) )
+ if ( ( style & wxCLOSE_BOX) )
attr |= kWindowCloseBoxAttribute ;
}
attr |= kWindowLiveResizeAttribute;
- if ( HasFlag(wxSTAY_ON_TOP) )
+ if ( ( style &wxSTAY_ON_TOP) )
group = GetWindowGroupOfClass(kUtilityWindowClass) ;
- if ( HasFlag( wxFRAME_FLOAT_ON_PARENT ) )
+ if ( ( style & wxFRAME_FLOAT_ON_PARENT ) )
group = GetWindowGroupOfClass(kFloatingWindowClass) ;
if ( group == NULL && parent != NULL )
}
attr |= kWindowCompositingAttribute;
-#if 0 // wxMAC_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
+#if 0 // wxOSX_USE_CORE_GRAPHICS ; TODO : decide on overall handling of high dpi screens (pixel vs userscale)
attr |= kWindowFrameworkScaledAttribute;
#endif
- if ( HasFlag(wxFRAME_SHAPED) )
+ if ( ( style &wxFRAME_SHAPED) )
{
WindowDefSpec customWindowDefSpec;
customWindowDefSpec.defType = kWindowDefProcPtr;
// the create commands are only for content rect,
// so we have to set the size again as structure bounds
- SetWindowBounds( (WindowRef) m_macWindow , kWindowStructureRgn , &theBoundsRect ) ;
-
- wxAssociateWinWithMacWindow( (WindowRef) m_macWindow , this ) ;
- m_peer = new wxMacControl(this , true /*isRootControl*/) ;
-
- // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
- // the content view, so we have to retrieve it explicitly
- HIViewFindByID( HIViewGetRoot( (WindowRef) m_macWindow ) , kHIViewWindowContentID ,
- m_peer->GetControlRefAddr() ) ;
- if ( !m_peer->Ok() )
- {
- // compatibility mode fallback
- GetRootControl( (WindowRef) m_macWindow , m_peer->GetControlRefAddr() ) ;
- }
-
- // the root control level handler
- MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() ) ;
+ SetWindowBounds( m_macWindow , kWindowStructureRgn , &theBoundsRect ) ;
// Causes the inner part of the window not to be metal
// if the style is used before window creation.
}
HIViewRef growBoxRef = 0 ;
- err = HIViewFindByID( HIViewGetRoot( (WindowRef)m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef );
+ err = HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowGrowBoxID, &growBoxRef );
if ( err == noErr && growBoxRef != 0 )
HIGrowBoxViewSetTransparent( growBoxRef, true ) ;
// the frame window event handler
- InstallStandardEventHandler( GetWindowEventTarget(MAC_WXHWND(m_macWindow)) ) ;
+ InstallStandardEventHandler( GetWindowEventTarget(m_macWindow) ) ;
MacInstallTopLevelWindowEventHandler() ;
- DoSetWindowVariant( m_windowVariant ) ;
-
- m_macFocus = NULL ;
+ if ( extraStyle & wxFRAME_EX_METAL)
+ MacSetMetalAppearance(true);
- if ( HasFlag(wxFRAME_SHAPED) )
+ if ( ( style &wxFRAME_SHAPED) )
{
// default shape matches the window size
wxRegion rgn( 0, 0, w, h );
SetShape( rgn );
}
-
- wxWindowCreateEvent event(this);
- HandleWindowEvent(event);
-}
-
-// Raise the window to the top of the Z order
-void wxNonOwnedWindow::Raise()
-{
- ::SelectWindow( (WindowRef)m_macWindow ) ;
-}
-
-// Lower the window to the bottom of the Z order
-void wxNonOwnedWindow::Lower()
-{
- ::SendBehind( (WindowRef)m_macWindow , NULL ) ;
-}
-
-void wxNonOwnedWindow::MacDelayedDeactivation(long timestamp)
-{
- if (s_macDeactivateWindow)
- {
- wxLogTrace(TRACE_ACTIVATE,
- wxT("Doing delayed deactivation of %p"),
- s_macDeactivateWindow);
-
- s_macDeactivateWindow->MacActivate(timestamp, false);
- }
-}
-
-void wxNonOwnedWindow::MacActivate( long timestamp , bool WXUNUSED(inIsActivating) )
-{
- wxLogTrace(TRACE_ACTIVATE, wxT("TopLevel=%p::MacActivate"), this);
-
- if (s_macDeactivateWindow == this)
- s_macDeactivateWindow = NULL;
-
- MacDelayedDeactivation(timestamp);
-}
-
-bool wxNonOwnedWindow::Show(bool show)
-{
- if ( !wxWindow::Show(show) )
- return false;
-
- bool plainTransition = true;
-
-#if wxUSE_SYSTEM_OPTIONS
- if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
- plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;
-#endif
-
- if (show)
- {
- if ( plainTransition )
- ::ShowWindow( (WindowRef)m_macWindow );
- else
- ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
-
- ::SelectWindow( (WindowRef)m_macWindow ) ;
-
- // because apps expect a size event to occur at this moment
- wxSizeEvent event(GetSize() , m_windowId);
- event.SetEventObject(this);
- HandleWindowEvent(event);
- }
- else
- {
- if ( plainTransition )
- ::HideWindow( (WindowRef)m_macWindow );
- else
- ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowHideTransitionAction, NULL );
- }
-
- return true ;
}
-bool wxNonOwnedWindow::MacShowWithEffect(bool show,
+bool wxNonOwnedWindowCarbonImpl::ShowWithEffect(bool show,
wxShowEffect effect,
unsigned timeout)
{
- if ( !wxWindow::Show(show) )
- return false;
-
WindowTransitionEffect transition = 0 ;
switch( effect )
{
TransitionWindowOptions options;
options.version = 0;
options.duration = timeout / 1000.0;
- options.window = transition == kWindowSheetTransitionEffect ? (WindowRef) GetParent()->MacGetTopLevelWindowRef() :0;
+ options.window = transition == kWindowSheetTransitionEffect ? (WindowRef) m_wxPeer->GetParent()->MacGetTopLevelWindowRef() :0;
options.userData = 0;
wxSize size = wxGetDisplaySize();
- Rect bounds;
- GetWindowBounds( (WindowRef)m_macWindow, kWindowStructureRgn, &bounds );
- CGRect hiBounds = CGRectMake( bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top );
-
- switch ( effect )
- {
- case wxSHOW_EFFECT_ROLL_TO_RIGHT:
- case wxSHOW_EFFECT_SLIDE_TO_RIGHT:
- hiBounds.origin.x = 0;
- hiBounds.size.width = 0;
- break;
-
- case wxSHOW_EFFECT_ROLL_TO_LEFT:
- case wxSHOW_EFFECT_SLIDE_TO_LEFT:
- hiBounds.origin.x = size.x;
- hiBounds.size.width = 0;
- break;
-
- case wxSHOW_EFFECT_ROLL_TO_TOP:
- case wxSHOW_EFFECT_SLIDE_TO_TOP:
- hiBounds.origin.y = size.y;
- hiBounds.size.height = 0;
- break;
-
- case wxSHOW_EFFECT_ROLL_TO_BOTTOM:
- case wxSHOW_EFFECT_SLIDE_TO_BOTTOM:
- hiBounds.origin.y = 0;
- hiBounds.size.height = 0;
- break;
-
- default:
- break; // direction doesn't make sense
- }
-
- ::TransitionWindowWithOptions
- (
- (WindowRef)m_macWindow,
- transition,
- show ? kWindowShowTransitionAction : kWindowHideTransitionAction,
- transition == kWindowGenieTransitionEffect ? &hiBounds : NULL,
- false,
- &options
- );
-
- if ( show )
- {
- ::SelectWindow( (WindowRef)m_macWindow ) ;
-
- // because apps expect a size event to occur at this moment
- wxSizeEvent event(GetSize() , m_windowId);
- event.SetEventObject(this);
- HandleWindowEvent(event);
- }
-
- return true;
-}
-
-bool wxNonOwnedWindow::SetTransparent(wxByte alpha)
-{
- OSStatus result = SetWindowAlpha((WindowRef)m_macWindow, (CGFloat)((alpha)/255.0));
- return result == noErr;
-}
-
-
-bool wxNonOwnedWindow::CanSetTransparent()
-{
- return true;
-}
-
-
-void wxNonOwnedWindow::SetExtraStyle(long exStyle)
-{
- if ( GetExtraStyle() == exStyle )
- return ;
-
- wxWindow::SetExtraStyle( exStyle ) ;
-
- if ( m_macWindow != NULL )
- {
- bool metal = GetExtraStyle() & wxFRAME_EX_METAL ;
-
- if ( MacGetMetalAppearance() != metal )
- {
- if ( MacGetUnifiedAppearance() )
- MacSetUnifiedAppearance( !metal ) ;
-
- MacSetMetalAppearance( metal ) ;
- }
- }
-}
-
-bool wxNonOwnedWindow::SetBackgroundStyle(wxBackgroundStyle style)
-{
- if ( !wxWindow::SetBackgroundStyle(style) )
- return false ;
-
- WindowRef windowRef = HIViewGetWindow( (HIViewRef)GetHandle() );
-
- if ( GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
- {
- OSStatus err = HIWindowChangeFeatures( windowRef, 0, kWindowIsOpaque );
- verify_noerr( err );
- err = ReshapeCustomWindow( windowRef );
- verify_noerr( err );
- }
-
- return true ;
-}
-
-// TODO: switch to structure bounds -
-// we are still using coordinates of the content view
-//
-void wxNonOwnedWindow::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
-{
- Rect content, structure ;
-
- GetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &structure ) ;
- GetWindowBounds( (WindowRef) m_macWindow, kWindowContentRgn , &content ) ;
-
- left = content.left - structure.left ;
- top = content.top - structure.top ;
- right = structure.right - content.right ;
- bottom = structure.bottom - content.bottom ;
-}
-
-void wxNonOwnedWindow::DoMoveWindow(int x, int y, int width, int height)
-{
- m_cachedClippedRectValid = false ;
- Rect bounds = { y , x , y + height , x + width } ;
- verify_noerr(SetWindowBounds( (WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
- wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
-}
-
-void wxNonOwnedWindow::DoGetPosition( int *x, int *y ) const
-{
- Rect bounds ;
-
- verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
-
- if (x)
- *x = bounds.left ;
- if (y)
- *y = bounds.top ;
-}
+ Rect bounds;
+ GetWindowBounds( (WindowRef)m_macWindow, kWindowStructureRgn, &bounds );
+ CGRect hiBounds = CGRectMake( bounds.left, bounds.top, bounds.right - bounds.left, bounds.bottom - bounds.top );
-void wxNonOwnedWindow::DoGetSize( int *width, int *height ) const
-{
- Rect bounds ;
+ switch ( effect )
+ {
+ case wxSHOW_EFFECT_ROLL_TO_RIGHT:
+ case wxSHOW_EFFECT_SLIDE_TO_RIGHT:
+ hiBounds.origin.x = 0;
+ hiBounds.size.width = 0;
+ break;
- verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowStructureRgn , &bounds )) ;
+ case wxSHOW_EFFECT_ROLL_TO_LEFT:
+ case wxSHOW_EFFECT_SLIDE_TO_LEFT:
+ hiBounds.origin.x = size.x;
+ hiBounds.size.width = 0;
+ break;
- if (width)
- *width = bounds.right - bounds.left ;
- if (height)
- *height = bounds.bottom - bounds.top ;
-}
+ case wxSHOW_EFFECT_ROLL_TO_TOP:
+ case wxSHOW_EFFECT_SLIDE_TO_TOP:
+ hiBounds.origin.y = size.y;
+ hiBounds.size.height = 0;
+ break;
-void wxNonOwnedWindow::DoGetClientSize( int *width, int *height ) const
-{
- Rect bounds ;
+ case wxSHOW_EFFECT_ROLL_TO_BOTTOM:
+ case wxSHOW_EFFECT_SLIDE_TO_BOTTOM:
+ hiBounds.origin.y = 0;
+ hiBounds.size.height = 0;
+ break;
- verify_noerr(GetWindowBounds((WindowRef) m_macWindow, kWindowContentRgn , &bounds )) ;
+ default:
+ break; // direction doesn't make sense
+ }
- if (width)
- *width = bounds.right - bounds.left ;
- if (height)
- *height = bounds.bottom - bounds.top ;
-}
+ ::TransitionWindowWithOptions
+ (
+ (WindowRef)m_macWindow,
+ transition,
+ show ? kWindowShowTransitionAction : kWindowHideTransitionAction,
+ transition == kWindowGenieTransitionEffect ? &hiBounds : NULL,
+ false,
+ &options
+ );
-void wxNonOwnedWindow::MacSetMetalAppearance( bool set )
-{
- if ( MacGetUnifiedAppearance() )
- MacSetUnifiedAppearance( false ) ;
+ if ( show )
+ {
+ ::SelectWindow( (WindowRef)m_macWindow ) ;
+ }
- MacChangeWindowAttributes( set ? kWindowMetalAttribute : kWindowNoAttributes ,
- set ? kWindowNoAttributes : kWindowMetalAttribute ) ;
+ return true;
}
-bool wxNonOwnedWindow::MacGetMetalAppearance() const
+void wxNonOwnedWindowCarbonImpl::SetTitle( const wxString& title, wxFontEncoding encoding )
{
- return MacGetWindowAttributes() & kWindowMetalAttribute ;
+ SetWindowTitleWithCFString( m_macWindow , wxCFStringRef( title , encoding ) ) ;
}
-
-void wxNonOwnedWindow::MacSetUnifiedAppearance( bool set )
+
+bool wxNonOwnedWindowCarbonImpl::IsMaximized() const
{
- if ( MacGetMetalAppearance() )
- MacSetMetalAppearance( false ) ;
-
- MacChangeWindowAttributes( set ? kWindowUnifiedTitleAndToolbarAttribute : kWindowNoAttributes ,
- set ? kWindowNoAttributes : kWindowUnifiedTitleAndToolbarAttribute) ;
-
- // For some reason, Tiger uses white as the background color for this appearance,
- // while most apps using it use the typical striped background. Restore that behavior
- // for wx.
- // TODO: Determine if we need this on Leopard as well. (should be harmless either way,
- // though)
- SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
+ return IsWindowInStandardState( m_macWindow , NULL , NULL ) ;
}
-
-bool wxNonOwnedWindow::MacGetUnifiedAppearance() const
+
+bool wxNonOwnedWindowCarbonImpl::IsIconized() const
{
- return MacGetWindowAttributes() & kWindowUnifiedTitleAndToolbarAttribute ;
+ return IsWindowCollapsed((WindowRef)GetWXWindow() ) ;
}
-
-void wxNonOwnedWindow::MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear )
+
+void wxNonOwnedWindowCarbonImpl::Iconize( bool iconize )
{
- ChangeWindowAttributes( (WindowRef)m_macWindow, attributesToSet, attributesToClear ) ;
+ if ( IsWindowCollapsable( m_macWindow ) )
+ CollapseWindow( m_macWindow , iconize ) ;
}
-
-wxUint32 wxNonOwnedWindow::MacGetWindowAttributes() const
+
+void wxNonOwnedWindowCarbonImpl::Maximize(bool maximize)
{
- UInt32 attr = 0 ;
- GetWindowAttributes( (WindowRef) m_macWindow, &attr ) ;
-
- return attr ;
+ Point idealSize = { 0 , 0 } ;
+ if ( maximize )
+ {
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+ HIRect bounds ;
+ HIWindowGetAvailablePositioningBounds(kCGNullDirectDisplay,kHICoordSpace72DPIGlobal,
+ &bounds);
+ idealSize.h = bounds.size.width;
+ idealSize.v = bounds.size.height;
+#else
+ Rect rect ;
+ GetAvailableWindowPositioningBounds(GetMainDevice(),&rect) ;
+ idealSize.h = rect.right - rect.left ;
+ idealSize.v = rect.bottom - rect.top ;
+#endif
+ }
+ ZoomWindowIdeal( (WindowRef)GetWXWindow() , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
}
-
-void wxNonOwnedWindow::MacPerformUpdates()
+
+bool wxNonOwnedWindowCarbonImpl::IsFullScreen() const
{
- // for composited windows this also triggers a redraw of all
- // invalid views in the window
- HIWindowFlush((WindowRef) m_macWindow) ;
+ return m_macFullScreenData != NULL ;
}
-
-// ---------------------------------------------------------------------------
-// Shape implementation
-// ---------------------------------------------------------------------------
-
-
-bool wxNonOwnedWindow::SetShape(const wxRegion& region)
+
+bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
{
- wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,
- _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
-
- // The empty region signifies that the shape
- // should be removed from the window.
- if ( region.IsEmpty() )
+ if ( show )
{
- wxSize sz = GetClientSize();
- wxRegion rgn(0, 0, sz.x, sz.y);
- if ( rgn.IsEmpty() )
- return false ;
- else
- return SetShape(rgn);
- }
-
- // Make a copy of the region
- RgnHandle shapeRegion = NewRgn();
- HIShapeGetAsQDRgn( region.GetWXHRGN(), shapeRegion );
+ FullScreenData *data = (FullScreenData *)m_macFullScreenData ;
+ delete data ;
+ data = new FullScreenData() ;
+
+ m_macFullScreenData = data ;
+ data->m_position = m_wxPeer->GetPosition() ;
+ data->m_size = m_wxPeer->GetSize() ;
+#if wxOSX_USE_CARBON
+ WindowAttributes attr = 0;
+ GetWindowAttributes((WindowRef) GetWXWindow(), &attr);
+ data->m_wasResizable = attr & kWindowResizableAttribute;
+ if ( style & wxFULLSCREEN_NOMENUBAR )
+ HideMenuBar() ;
+#endif
- // Dispose of any shape region we may already have
- RgnHandle oldRgn = (RgnHandle)GetWRefCon( (WindowRef)MacGetWindowRef() );
- if ( oldRgn )
- DisposeRgn(oldRgn);
+ wxRect client = wxGetClientDisplayRect() ;
- // Save the region so we can use it later
- SetWRefCon((WindowRef)MacGetWindowRef(), (URefCon)shapeRegion);
+ int left , top , right , bottom ;
+ int x, y, w, h ;
- // inform the window manager that the window has changed shape
- ReshapeCustomWindow((WindowRef)MacGetWindowRef());
+ x = client.x ;
+ y = client.y ;
+ w = client.width ;
+ h = client.height ;
- return true;
-}
+ GetContentArea( left , top , right , bottom ) ;
-// ---------------------------------------------------------------------------
-// Support functions for shaped windows, based on Apple's CustomWindow sample at
-// http://developer.apple.com/samplecode/Sample_Code/Human_Interface_Toolbox/Mac_OS_High_Level_Toolbox/CustomWindow.htm
-// ---------------------------------------------------------------------------
+ if ( style & wxFULLSCREEN_NOCAPTION )
+ {
+ y -= top ;
+ h += top ;
+ }
-static void wxShapedMacWindowGetPos(WindowRef window, Rect* inRect)
-{
- GetWindowPortBounds(window, inRect);
- Point pt = { inRect->top ,inRect->left };
- wxMacLocalToGlobal( window, &pt ) ;
- inRect->bottom += pt.v - inRect->top;
- inRect->right += pt.h - inRect->left;
- inRect->top = pt.v;
- inRect->left = pt.h;
-}
+ if ( style & wxFULLSCREEN_NOBORDER )
+ {
+ x -= left ;
+ w += left + right ;
+ h += bottom ;
+ }
-static SInt32 wxShapedMacWindowGetFeatures(WindowRef WXUNUSED(window), SInt32 param)
-{
- /*------------------------------------------------------
- Define which options your custom window supports.
- --------------------------------------------------------*/
- //just enable everything for our demo
- *(OptionBits*)param =
- //kWindowCanGrow |
- //kWindowCanZoom |
- kWindowCanCollapse |
- //kWindowCanGetWindowRegion |
- //kWindowHasTitleBar |
- //kWindowSupportsDragHilite |
- kWindowCanDrawInCurrentPort |
- //kWindowCanMeasureTitle |
- kWindowWantsDisposeAtProcessDeath |
- kWindowSupportsGetGrowImageRegion |
- kWindowDefSupportsColorGrafPort;
+ if ( style & wxFULLSCREEN_NOTOOLBAR )
+ {
+ // TODO
+ }
- return 1;
-}
+ if ( style & wxFULLSCREEN_NOSTATUSBAR )
+ {
+ // TODO
+ }
-// The content region is left as a rectangle matching the window size, this is
-// so the origin in the paint event, and etc. still matches what the
-// programmer expects.
-static void wxShapedMacWindowContentRegion(WindowRef window, RgnHandle rgn)
-{
- SetEmptyRgn(rgn);
- wxNonOwnedWindow* win = wxFindWinFromMacWindow(window);
- if (win)
+ m_wxPeer->SetSize( x , y , w, h ) ;
+ if ( data->m_wasResizable )
+ {
+#if wxOSX_USE_CARBON
+ ChangeWindowAttributes( (WindowRef) GetWXWindow() , kWindowNoAttributes , kWindowResizableAttribute ) ;
+#endif
+ }
+ }
+ else if ( m_macFullScreenData != NULL )
{
- Rect r ;
- wxShapedMacWindowGetPos( window, &r ) ;
- RectRgn( rgn , &r ) ;
+ FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
+#if wxOSX_USE_CARBON
+ ShowMenuBar() ;
+ if ( data->m_wasResizable )
+ ChangeWindowAttributes( (WindowRef) GetWXWindow() , kWindowResizableAttribute , kWindowNoAttributes ) ;
+#endif
+ m_wxPeer->SetPosition( data->m_position ) ;
+ m_wxPeer->SetSize( data->m_size ) ;
+
+ delete data ;
+ m_macFullScreenData = NULL ;
}
+
+ return true;
}
-// The structure region is set to the shape given to the SetShape method.
-static void wxShapedMacWindowStructureRegion(WindowRef window, RgnHandle rgn)
-{
- RgnHandle cachedRegion = (RgnHandle) GetWRefCon(window);
+// Attracts the users attention to this window if the application is
+// inactive (should be called when a background event occurs)
- SetEmptyRgn(rgn);
- if (cachedRegion)
- {
- Rect windowRect;
- wxShapedMacWindowGetPos(window, &windowRect); // how big is the window
- CopyRgn(cachedRegion, rgn); // make a copy of our cached region
- OffsetRgn(rgn, windowRect.left, windowRect.top); // position it over window
- //MapRgn(rgn, &mMaskSize, &windowRect); //scale it to our actual window size
- }
+static pascal void wxMacNMResponse( NMRecPtr ptr )
+{
+ NMRemove( ptr ) ;
+ DisposePtr( (Ptr)ptr ) ;
}
-static SInt32 wxShapedMacWindowGetRegion(WindowRef window, SInt32 param)
+void wxNonOwnedWindowCarbonImpl::RequestUserAttention(int WXUNUSED(flags))
{
- GetWindowRegionPtr rgnRec = (GetWindowRegionPtr)param;
-
- if (rgnRec == NULL)
- return paramErr;
-
- switch (rgnRec->regionCode)
- {
- case kWindowStructureRgn:
- wxShapedMacWindowStructureRegion(window, rgnRec->winRgn);
- break;
+ NMRecPtr notificationRequest = (NMRecPtr) NewPtr( sizeof( NMRec) ) ;
- case kWindowContentRgn:
- wxShapedMacWindowContentRegion(window, rgnRec->winRgn);
- break;
-
- default:
- SetEmptyRgn(rgnRec->winRgn);
- break;
- }
+ memset( notificationRequest , 0 , sizeof(*notificationRequest) ) ;
+ notificationRequest->qType = nmType ;
+ notificationRequest->nmMark = 1 ;
+ notificationRequest->nmIcon = 0 ;
+ notificationRequest->nmSound = 0 ;
+ notificationRequest->nmStr = NULL ;
+ notificationRequest->nmResp = wxMacNMResponse ;
- return noErr;
+ verify_noerr( NMInstall( notificationRequest ) ) ;
}
-// Determine the region of the window which was hit
-//
-static SInt32 wxShapedMacWindowHitTest(WindowRef window, SInt32 param)
+void wxNonOwnedWindowCarbonImpl::ScreenToWindow( int *x, int *y )
{
- Point hitPoint;
- static RgnHandle tempRgn = NULL;
-
- if (tempRgn == NULL)
- tempRgn = NewRgn();
-
- // get the point clicked
- SetPt( &hitPoint, LoWord(param), HiWord(param) );
-
- // Mac OS 8.5 or later
- wxShapedMacWindowStructureRegion(window, tempRgn);
- if (PtInRgn( hitPoint, tempRgn )) //in window content region?
- return wInContent;
-
- // no significant area was hit
- return wNoHit;
+ HIPoint p = CGPointMake( (x ? *x : 0), (y ? *y : 0) );
+ HIViewRef contentView ;
+ // TODO check toolbar offset
+ HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
+ HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
+ if ( x )
+ *x = p.x;
+ if ( y )
+ *y = p.y;
}
-static pascal long wxShapedMacWindowDef(short WXUNUSED(varCode), WindowRef window, SInt16 message, SInt32 param)
+void wxNonOwnedWindowCarbonImpl::WindowToScreen( int *x, int *y )
{
- switch (message)
- {
- case kWindowMsgHitTest:
- return wxShapedMacWindowHitTest(window, param);
-
- case kWindowMsgGetFeatures:
- return wxShapedMacWindowGetFeatures(window, param);
-
- // kWindowMsgGetRegion is sent during CreateCustomWindow and ReshapeCustomWindow
- case kWindowMsgGetRegion:
- return wxShapedMacWindowGetRegion(window, param);
-
- default:
- break;
- }
-
- return 0;
+ HIPoint p = CGPointMake( (x ? *x : 0), (y ? *y : 0) );
+ HIViewRef contentView ;
+ // TODO check toolbar offset
+ HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
+ HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
+ if ( x )
+ *x = p.x;
+ if ( y )
+ *y = p.y;
}
-
-
+#endif // wxOSX_USE_CARBON
#include "wx/dnd.h"
#endif
+#if wxOSX_USE_CARBON
#include "wx/osx/uma.h"
+#else
+#include "wx/osx/private.h"
+#endif
#define MAC_SCROLLBAR_SIZE 15
#define MAC_SMALL_SCROLLBAR_SIZE 11
#define wxMAC_DEBUG_REDRAW 0
#endif
+//
+// TODO BEGIN move to window_osx.cpp
+//
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+WX_DECLARE_HASH_MAP(WXWidget, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
+
+static MacControlMap wxWinMacControlList;
+
+wxWindowMac *wxFindWindowFromWXWidget(WXWidget inControl )
+{
+ MacControlMap::iterator node = wxWinMacControlList.find(inControl);
+
+ return (node == wxWinMacControlList.end()) ? NULL : node->second;
+}
+
+void wxAssociateWindowWithWXWidget(WXWidget inControl, wxWindow *control)
+{
+ // adding NULL ControlRef is (first) surely a result of an error and
+ // (secondly) breaks native event processing
+ wxCHECK_RET( inControl != (WXWidget) NULL, wxT("attempt to add a NULL WindowRef to window list") );
+
+ wxWinMacControlList[inControl] = control;
+}
+
+void wxRemoveWXWidgetAssociation(wxWindow *control)
+{
+ // iterate over all the elements in the class
+ // is the iterator stable ? as we might have two associations pointing to the same wxWindow
+ // we should go on...
+
+ bool found = true ;
+ while ( found )
+ {
+ found = false ;
+ MacControlMap::iterator it;
+ for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
+ {
+ if ( it->second == control )
+ {
+ wxWinMacControlList.erase(it);
+ found = true ;
+ break;
+ }
+ }
+ }
+}
+
+// ----------------------------------------------------------------------------
+ // constructors and such
+// ----------------------------------------------------------------------------
+
+wxWindowMac::wxWindowMac()
+{
+ Init();
+}
+
+wxWindowMac::wxWindowMac(wxWindowMac *parent,
+ wxWindowID id,
+ const wxPoint& pos ,
+ const wxSize& size ,
+ long style ,
+ const wxString& name )
+{
+ Init();
+ Create(parent, id, pos, size, style, name);
+}
+
+void wxWindowMac::Init()
+{
+ m_peer = NULL ;
+ m_macAlpha = 255 ;
+ m_cgContextRef = NULL ;
+
+ // as all windows are created with WS_VISIBLE style...
+ m_isShown = true;
+
+ m_hScrollBar = NULL ;
+ m_vScrollBar = NULL ;
+ m_hScrollBarAlwaysShown = false;
+ m_vScrollBarAlwaysShown = false;
+
+ m_macIsUserPane = true;
+ m_clipChildren = false ;
+ m_cachedClippedRectValid = false ;
+}
+
+wxWindowMac::~wxWindowMac()
+{
+ SendDestroyEvent();
+
+ m_isBeingDeleted = true;
+
+ MacInvalidateBorders() ;
+
+#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 )
+ frame->SetLastFocus((wxWindow*)NULL);
+ break;
+ }
+ }
+#endif
+
+ // destroy children before destroying this window itself
+ DestroyChildren();
+
+ // wxRemoveMacControlAssociation( this ) ;
+ // If we delete an item, we should initialize the parent panel,
+ // because it could now be invalid.
+ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent((wxWindow*)this), wxTopLevelWindow);
+ if ( tlw )
+ {
+ if ( tlw->GetDefaultItem() == (wxButton*) this)
+ tlw->SetDefaultItem(NULL);
+ }
+
+ if ( m_peer && m_peer->IsOk() )
+ {
+ m_peer->Destroy() ;
+ }
+
+ if ( g_MacLastWindow == this )
+ g_MacLastWindow = NULL ;
+
+#ifndef __WXUNIVERSAL__
+ wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( (wxWindow*)this ) , wxFrame ) ;
+ if ( frame )
+ {
+ if ( frame->GetLastFocus() == this )
+ frame->SetLastFocus( NULL ) ;
+ }
+#endif
+
+ // 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
+
+ delete m_peer ;
+}
+
+WXWidget wxWindowMac::GetHandle() const
+{
+ return (WXWidget) m_peer->GetWXWidget() ;
+}
+
+//
+// TODO END move to window_osx.cpp
+//
+
// ---------------------------------------------------------------------------
// Utility Routines to move between different coordinate systems
// ---------------------------------------------------------------------------
*/
//
-// originating from native control
//
-
-void wxMacNativeToWindow( const wxWindow* window , RgnHandle handle )
+// Constructor
+bool wxWindowMac::Create(wxWindowMac *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
{
- OffsetRgn( handle , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
-}
+ wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") );
-void wxMacNativeToWindow( const wxWindow* window , Rect *rect )
-{
- OffsetRect( rect , window->MacGetLeftBorderSize() , window->MacGetTopBorderSize() ) ;
-}
+ if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
+ return false;
-//
-// directed towards native control
-//
+ m_windowVariant = parent->GetWindowVariant() ;
-void wxMacWindowToNative( const wxWindow* window , RgnHandle handle )
-{
- OffsetRgn( handle , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() );
+ if ( m_macIsUserPane )
+ {
+#if wxOSX_USE_CARBON
+ m_peer = (wxMacControl*) wxWidgetImpl::CreateUserPane( this, pos, size , style, GetExtraStyle() , name );
+#else
+ m_peer = wxWidgetImpl::CreateUserPane( this, pos, size , style, GetExtraStyle() , name );
+#endif
+ MacPostControlCreate(pos, size) ;
+ }
+
+#ifndef __WXUNIVERSAL__
+ // Don't give scrollbars to wxControls unless they ask for them
+ if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
+ || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
+ {
+ MacCreateScrollBars( style ) ;
+ }
+#endif
+
+ wxWindowCreateEvent event((wxWindow*)this);
+ GetEventHandler()->AddPendingEvent(event);
+
+ return true;
}
-void wxMacWindowToNative( const wxWindow* window , Rect *rect )
+void wxWindowMac::MacChildAdded()
{
- OffsetRect( rect , -window->MacGetLeftBorderSize() , -window->MacGetTopBorderSize() ) ;
+ if ( m_vScrollBar )
+ m_vScrollBar->Raise() ;
+ if ( m_hScrollBar )
+ m_hScrollBar->Raise() ;
}
-// ---------------------------------------------------------------------------
-// Carbon Events
-// ---------------------------------------------------------------------------
-
-static const EventTypeSpec eventList[] =
+void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size)
{
- { kEventClassCommand, kEventProcessCommand } ,
- { kEventClassCommand, kEventCommandUpdateStatus } ,
-
- { kEventClassControl , kEventControlGetClickActivation } ,
- { kEventClassControl , kEventControlHit } ,
-
- { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
- { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
+ wxASSERT_MSG( m_peer != NULL && m_peer->IsOk() , wxT("No valid mac control") ) ;
- { kEventClassControl , kEventControlDraw } ,
+#if wxOSX_USE_CARBON
+ m_peer->SetReference( (URefCon) this ) ;
+#endif
- { kEventClassControl , kEventControlVisibilityChanged } ,
- { kEventClassControl , kEventControlEnabledStateChanged } ,
- { kEventClassControl , kEventControlHiliteChanged } ,
+ GetParent()->AddChild( this );
- { kEventClassControl , kEventControlActivate } ,
- { kEventClassControl , kEventControlDeactivate } ,
+#if wxOSX_USE_CARBON
+ m_peer->InstallEventHandler();
- { kEventClassControl , kEventControlSetFocusPart } ,
- { kEventClassControl , kEventControlFocusPartChanged } ,
+ ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+ ::EmbedControl( m_peer->GetControlRef() , container ) ;
+#endif
+ GetParent()->MacChildAdded() ;
- { kEventClassService , kEventServiceGetTypes },
- { kEventClassService , kEventServiceCopy },
- { kEventClassService , kEventServicePaste },
+ // adjust font, controlsize etc
+ DoSetWindowVariant( m_windowVariant ) ;
+#if wxOSX_USE_CARBON
+ m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
+#endif
+ if (!m_macIsUserPane)
+ SetInitialSize(size);
-// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
-// { kEventClassControl , kEventControlBoundsChanged } ,
-} ;
+ SetCursor( *wxSTANDARD_CURSOR ) ;
+}
-static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
{
- OSStatus result = eventNotHandledErr ;
- static wxWindowMac* targetFocusWindow = NULL;
- static wxWindowMac* formerFocusWindow = NULL;
+ // Don't assert, in case we set the window variant before
+ // the window is created
+ // wxASSERT( m_peer->Ok() ) ;
- wxMacCarbonEvent cEvent( event ) ;
+ m_windowVariant = variant ;
- ControlRef controlRef ;
- wxWindowMac* thisWindow = (wxWindowMac*) data ;
+ if (m_peer == NULL || !m_peer->IsOk())
+ return;
- cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+#if wxOSX_USE_COCOA_OR_CARBON
- switch ( GetEventKind( event ) )
- {
- case kEventControlDraw :
- {
- RgnHandle updateRgn = NULL ;
- RgnHandle allocatedRgn = NULL ;
- wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
+ ControlSize size ;
+ ThemeFontID themeFont = kThemeSystemFont ;
- if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
- {
- HIShapeGetAsQDRgn( visRegion.GetWXHRGN(), updateRgn );
- }
- else
- {
- if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
- {
- // as this update region is in native window locals we must adapt it to wx window local
- allocatedRgn = NewRgn() ;
- CopyRgn( updateRgn , allocatedRgn ) ;
+ // we will get that from the settings later
+ // and make this NORMAL later, but first
+ // we have a few calculations that we must fix
- // hide the given region by the new region that must be shifted
- wxMacNativeToWindow( thisWindow , allocatedRgn ) ;
- updateRgn = allocatedRgn ;
- }
- }
+ switch ( variant )
+ {
+ case wxWINDOW_VARIANT_NORMAL :
+ size = kControlSizeNormal;
+ themeFont = kThemeSystemFont ;
+ break ;
-#if wxMAC_DEBUG_REDRAW
- if ( thisWindow->MacIsUserPane() )
- {
- static float color = 0.5 ;
- static int channel = 0 ;
- HIRect bounds;
- CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
+ case wxWINDOW_VARIANT_SMALL :
+ size = kControlSizeSmall;
+ themeFont = kThemeSmallSystemFont ;
+ break ;
- 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
+ case wxWINDOW_VARIANT_MINI :
+ // not always defined in the headers
+ size = 3 ;
+ themeFont = 109 ;
+ break ;
- {
- bool created = false ;
- CGContextRef cgContext = NULL ;
- OSStatus err = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) ;
- if ( err != noErr )
- {
- wxFAIL_MSG("Unable to retrieve CGContextRef");
- }
+ case wxWINDOW_VARIANT_LARGE :
+ size = kControlSizeLarge;
+ themeFont = kThemeSystemFont ;
+ break ;
- thisWindow->MacSetCGContextRef( cgContext ) ;
+ default:
+ wxFAIL_MSG(_T("unexpected window variant"));
+ break ;
+ }
- {
- wxMacCGContextStateSaver sg( cgContext ) ;
- CGFloat alpha = (CGFloat)1.0 ;
- {
- wxWindow* iter = thisWindow ;
- while ( iter )
- {
- alpha *= (CGFloat)( iter->GetTransparent()/255.0 ) ;
- if ( iter->IsTopLevel() )
- iter = NULL ;
- else
- iter = iter->GetParent() ;
- }
- }
- CGContextSetAlpha( cgContext , alpha ) ;
+#if wxOSX_USE_CARBON
+ m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
+#endif
- if ( thisWindow->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
- {
- HIRect bounds;
- HIViewGetBounds( controlRef, &bounds );
- CGContextClearRect( cgContext, bounds );
- }
+ wxFont font ;
+ font.MacCreateFromThemeFont( themeFont ) ;
+ SetFont( font ) ;
+#endif
+}
+void wxWindowMac::MacUpdateControlFont()
+{
+#if wxOSX_USE_CARBON
+ m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
+#endif
+ // do not trigger refreshes upon invisible and possible partly created objects
+ if ( IsShownOnScreen() )
+ Refresh() ;
+}
+bool wxWindowMac::SetFont(const wxFont& font)
+{
+ bool retval = wxWindowBase::SetFont( font );
- if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
- result = noErr ;
+ MacUpdateControlFont() ;
- thisWindow->MacSetCGContextRef( NULL ) ;
- }
+ return retval;
+}
- if ( created )
- CGContextRelease( cgContext ) ;
- }
+bool wxWindowMac::SetForegroundColour(const wxColour& col )
+{
+ bool retval = wxWindowBase::SetForegroundColour( col );
- if ( allocatedRgn )
- DisposeRgn( allocatedRgn ) ;
- }
- break ;
+ if (retval)
+ MacUpdateControlFont();
- case kEventControlVisibilityChanged :
- // we might have two native controls attributed to the same wxWindow instance
- // eg a scrollview and an embedded textview, make sure we only fire for the 'outer'
- // control, as otherwise native and wx visibility are different
- if ( thisWindow->GetPeer() != NULL && thisWindow->GetPeer()->GetControlRef() == controlRef )
- {
- thisWindow->MacVisibilityChanged() ;
- }
- break ;
+ return retval;
+}
- case kEventControlEnabledStateChanged :
- thisWindow->MacEnabledStateChanged();
- break ;
+bool wxWindowMac::SetBackgroundColour(const wxColour& col )
+{
+ if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
+ return false ;
- case kEventControlHiliteChanged :
- thisWindow->MacHiliteChanged() ;
- break ;
+ if ( m_peer )
+ m_peer->SetBackgroundColour( col ) ;
- case kEventControlActivate :
- case kEventControlDeactivate :
- // FIXME: we should have a virtual function for this!
-#if wxUSE_TREECTRL
- if ( thisWindow->IsKindOf( CLASSINFO( wxTreeCtrl ) ) )
- thisWindow->Refresh();
-#endif
-#if wxUSE_LISTCTRL
- if ( thisWindow->IsKindOf( CLASSINFO( wxListCtrl ) ) )
- thisWindow->Refresh();
-#endif
- break ;
+ return true ;
+}
- //
- // focus handling
- // different handling on OS X
- //
+void wxWindowMac::SetFocus()
+{
+ if ( !AcceptsFocus() )
+ return ;
- case kEventControlFocusPartChanged :
- // the event is emulated by wxmac for systems lower than 10.5
- {
- if ( UMAGetSystemVersion() < 0x1050 )
- {
- // as it is synthesized here, we have to manually avoid propagation
- result = noErr;
- }
- ControlPartCode previousControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPreviousPart , typeControlPartCode );
- ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlCurrentPart , typeControlPartCode );
+ wxWindow* former = FindFocus() ;
+ if ( former == this )
+ return ;
- if ( thisWindow->MacGetTopLevelWindow() && thisWindow->GetPeer()->NeedsFocusRect() )
- {
- thisWindow->MacInvalidateBorders();
- }
+ m_peer->SetFocus() ;
+}
- if ( currentControlPart == 0 )
- {
- // kill focus
-#if wxUSE_CARET
- if ( thisWindow->GetCaret() )
- thisWindow->GetCaret()->OnKillFocus();
-#endif
+void wxWindowMac::DoCaptureMouse()
+{
+ wxApp::s_captureWindow = (wxWindow*) this ;
+}
- wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+wxWindow * wxWindowBase::GetCapture()
+{
+ return wxApp::s_captureWindow ;
+}
- // remove this as soon as posting the synthesized event works properly
- static bool inKillFocusEvent = false ;
+void wxWindowMac::DoReleaseMouse()
+{
+ wxApp::s_captureWindow = NULL ;
+}
- if ( !inKillFocusEvent )
- {
- inKillFocusEvent = true ;
- wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
- event.SetEventObject(thisWindow);
- event.SetWindow(targetFocusWindow);
- thisWindow->HandleWindowEvent(event) ;
- inKillFocusEvent = false ;
- targetFocusWindow = NULL;
- }
- }
- else if ( previousControlPart == 0 )
- {
- // set focus
- // panel wants to track the window which was the last to have focus in it
- wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
- wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
- thisWindow->HandleWindowEvent(eventFocus);
+#if wxUSE_DRAG_AND_DROP
+
+void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
+{
+ if ( m_dropTarget != NULL )
+ delete m_dropTarget;
+
+ m_dropTarget = pDropTarget;
+ if ( m_dropTarget != NULL )
+ {
+ // TODO:
+ }
+}
-#if wxUSE_CARET
- if ( thisWindow->GetCaret() )
- thisWindow->GetCaret()->OnSetFocus();
#endif
- wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
- event.SetEventObject(thisWindow);
- event.SetWindow(formerFocusWindow);
- thisWindow->HandleWindowEvent(event) ;
- formerFocusWindow = NULL;
- }
- }
- break;
- case kEventControlSetFocusPart :
- {
- Boolean focusEverything = false ;
- if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
- {
- // put a breakpoint here to catch focus everything events
- }
- ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
- if ( controlPart != kControlFocusNoPart )
- {
- targetFocusWindow = thisWindow;
- wxLogTrace(_T("Focus"), _T("focus to be set(%p)"), wx_static_cast(void*, thisWindow));
- }
- else
- {
- formerFocusWindow = thisWindow;
- wxLogTrace(_T("Focus"), _T("focus to be lost(%p)"), wx_static_cast(void*, thisWindow));
- }
-
- ControlPartCode previousControlPart = 0;
- verify_noerr( HIViewGetFocusPart(controlRef, &previousControlPart));
+// Old-style File Manager Drag & Drop
+void wxWindowMac::DragAcceptFiles(bool WXUNUSED(accept))
+{
+ // TODO:
+}
- if ( thisWindow->MacIsUserPane() )
- {
- if ( controlPart != kControlFocusNoPart )
- cEvent.SetParameter<ControlPartCode>( kEventParamControlPart, typeControlPartCode, 1 ) ;
- result = noErr ;
- }
- else
- result = CallNextEventHandler(handler, event);
+// From a wx position / size calculate the appropriate size of the native control
- if ( UMAGetSystemVersion() < 0x1050 )
- {
-// set back to 0 if problems arise
-#if 1
- if ( result == noErr )
- {
- ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
- // synthesize the event focus changed event
- EventRef evRef = NULL ;
+bool wxWindowMac::MacGetBoundsForControl(
+ const wxPoint& pos,
+ const wxSize& size,
+ int& x, int& y,
+ int& w, int& h , bool adjustOrigin ) const
+{
+ // the desired size, minus the border pixels gives the correct size of the control
+ x = (int)pos.x;
+ y = (int)pos.y;
- OSStatus err = MacCreateEvent(
- NULL , kEventClassControl , kEventControlFocusPartChanged , TicksToEventTime( TickCount() ) ,
- kEventAttributeUserEvent , &evRef );
- verify_noerr( err );
+ // TODO: the default calls may be used as soon as PostCreateControl Is moved here
+ w = wxMax(size.x, 0) ; // WidthDefault( size.x );
+ h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
- wxMacCarbonEvent iEvent( evRef ) ;
- iEvent.SetParameter<ControlRef>( kEventParamDirectObject , controlRef );
- iEvent.SetParameter<EventTargetRef>( kEventParamPostTarget, typeEventTargetRef, GetControlEventTarget( controlRef ) );
- iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart );
- iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart );
-
-#if 1
- // TODO test this first, avoid double posts etc...
- PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh );
-#else
- wxMacWindowControlEventHandler( NULL , evRef , data ) ;
-#endif
- ReleaseEvent( evRef ) ;
- }
-#else
- // old implementation, to be removed if the new one works
- if ( controlPart == kControlFocusNoPart )
- {
-#if wxUSE_CARET
- if ( thisWindow->GetCaret() )
- thisWindow->GetCaret()->OnKillFocus();
-#endif
+ x += MacGetLeftBorderSize() ;
+ y += MacGetTopBorderSize() ;
+ w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ;
- wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+ if ( adjustOrigin )
+ AdjustForParentClientOrigin( x , y ) ;
- static bool inKillFocusEvent = false ;
+ // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border
+ if ( !GetParent()->IsTopLevel() )
+ {
+ x -= GetParent()->MacGetLeftBorderSize() ;
+ y -= GetParent()->MacGetTopBorderSize() ;
+ }
- if ( !inKillFocusEvent )
- {
- inKillFocusEvent = true ;
- wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
- event.SetEventObject(thisWindow);
- thisWindow->HandleWindowEvent(event) ;
- inKillFocusEvent = false ;
- }
- }
- else
- {
- // panel wants to track the window which was the last to have focus in it
- wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
- wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
- thisWindow->HandleWindowEvent(eventFocus);
+ return true ;
+}
- #if wxUSE_CARET
- if ( thisWindow->GetCaret() )
- thisWindow->GetCaret()->OnSetFocus();
- #endif
+// Get window size (not client size)
+void wxWindowMac::DoGetSize(int *x, int *y) const
+{
+ int width, height;
+ m_peer->GetSize( width, height );
- wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
- event.SetEventObject(thisWindow);
- thisWindow->HandleWindowEvent(event) ;
- }
-#endif
- }
- }
- break ;
+ if (x)
+ *x = width + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ if (y)
+ *y = height + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+}
- case kEventControlHit :
- result = thisWindow->MacControlHit( handler , event ) ;
- break ;
+// get the position of the bounds of this window in client coordinates of its parent
+void wxWindowMac::DoGetPosition(int *x, int *y) const
+{
+ int x1, y1;
+
+ m_peer->GetPosition( x1, y1 ) ;
- case kEventControlGetClickActivation :
- {
- // fix to always have a proper activation for DataBrowser controls (stay in bkgnd otherwise)
- WindowRef owner = cEvent.GetParameter<WindowRef>(kEventParamWindowRef);
- if ( !IsWindowActive(owner) )
- {
- cEvent.SetParameter(kEventParamClickActivation,(UInt32) kActivateAndIgnoreClick) ;
- result = noErr ;
- }
- }
- break ;
+ // get the wx window position from the native one
+ x1 -= MacGetLeftBorderSize() ;
+ y1 -= MacGetTopBorderSize() ;
- default :
- break ;
+ if ( !IsTopLevel() )
+ {
+ wxWindow *parent = GetParent();
+ if ( parent )
+ {
+ // we must first adjust it to be in window coordinates of the parent,
+ // as otherwise it gets lost by the ClientAreaOrigin fix
+ x1 += parent->MacGetLeftBorderSize() ;
+ y1 += parent->MacGetTopBorderSize() ;
+
+ // and now to client coordinates
+ wxPoint pt(parent->GetClientAreaOrigin());
+ x1 -= pt.x ;
+ y1 -= pt.y ;
+ }
}
- return result ;
+ if (x)
+ *x = x1 ;
+ if (y)
+ *y = y1 ;
}
-static pascal OSStatus
-wxMacWindowServiceEventHandler(EventHandlerCallRef WXUNUSED(handler),
- EventRef event,
- void *data)
+void wxWindowMac::DoScreenToClient(int *x, int *y) const
{
- OSStatus result = eventNotHandledErr ;
+ wxNonOwnedWindow* tlw = MacGetTopLevelWindow() ;
+ wxCHECK_RET( tlw , wxT("TopLevel Window missing") ) ;
+ tlw->GetNonOwnedPeer()->ScreenToWindow( x, y);
+ MacRootWindowToWindow( x , y ) ;
- wxMacCarbonEvent cEvent( event ) ;
+ wxPoint origin = GetClientAreaOrigin() ;
+ if (x)
+ *x -= origin.x ;
+ if (y)
+ *y -= origin.y ;
+}
- ControlRef controlRef ;
- wxWindowMac* thisWindow = (wxWindowMac*) data ;
- wxTextCtrl* textCtrl = wxDynamicCast( thisWindow , wxTextCtrl ) ;
- cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+void wxWindowMac::DoClientToScreen(int *x, int *y) const
+{
+ wxNonOwnedWindow* tlw = MacGetTopLevelWindow() ;
+ wxCHECK_RET( tlw , wxT("TopLevel window missing") ) ;
- switch ( GetEventKind( event ) )
- {
- case kEventServiceGetTypes :
- if ( textCtrl )
- {
- long from, to ;
- textCtrl->GetSelection( &from , &to ) ;
+ wxPoint origin = GetClientAreaOrigin() ;
+ if (x)
+ *x += origin.x ;
+ if (y)
+ *y += origin.y ;
- CFMutableArrayRef copyTypes = 0 , pasteTypes = 0;
- if ( from != to )
- copyTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServiceCopyTypes , typeCFMutableArrayRef ) ;
- if ( textCtrl->IsEditable() )
- pasteTypes = cEvent.GetParameter< CFMutableArrayRef >( kEventParamServicePasteTypes , typeCFMutableArrayRef ) ;
+ MacWindowToRootWindow( x , y ) ;
+ tlw->GetNonOwnedPeer()->WindowToScreen( x , y );
+}
- 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) ;
+void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
+{
+ wxPoint origin = GetClientAreaOrigin() ;
+ if (x)
+ *x += origin.x ;
+ if (y)
+ *y += origin.y ;
- CFRelease( typestring ) ;
- }
- }
+ MacWindowToRootWindow( x , y ) ;
+}
- result = noErr ;
- }
- break ;
+void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
+{
+ wxPoint pt ;
- case kEventServiceCopy :
- if ( textCtrl )
- {
- long from, to ;
+ if (x)
+ pt.x = *x ;
+ if (y)
+ pt.y = *y ;
- textCtrl->GetSelection( &from , &to ) ;
- wxString val = textCtrl->GetValue() ;
- val = val.Mid( from , to - from ) ;
- PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( kEventParamPasteboardRef, typePasteboardRef );
- verify_noerr( PasteboardClear( pasteboard ) ) ;
- PasteboardSynchronize( pasteboard );
- // TODO add proper conversion
- CFDataRef data = CFDataCreate( kCFAllocatorDefault, (const UInt8*)val.c_str(), val.length() );
- PasteboardPutItemFlavor( pasteboard, (PasteboardItemID) 1, CFSTR("com.apple.traditional-mac-plain-text"), data, 0);
- CFRelease( data );
- result = noErr ;
- }
- break ;
+ if ( !IsTopLevel() )
+ {
+ wxNonOwnedWindow* top = MacGetTopLevelWindow();
+ if (top)
+ {
+ pt.x -= MacGetLeftBorderSize() ;
+ pt.y -= MacGetTopBorderSize() ;
+ wxWidgetImpl::Convert( &pt , m_peer , top->m_peer ) ;
+ }
+ }
- case kEventServicePaste :
- if ( textCtrl )
- {
- PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( kEventParamPasteboardRef, typePasteboardRef );
- PasteboardSynchronize( pasteboard );
- ItemCount itemCount;
- verify_noerr( PasteboardGetItemCount( pasteboard, &itemCount ) );
- for( UInt32 itemIndex = 1; itemIndex <= itemCount; itemIndex++ )
- {
- PasteboardItemID itemID;
- if ( PasteboardGetItemIdentifier( pasteboard, itemIndex, &itemID ) == noErr )
- {
- CFDataRef flavorData = NULL;
- if ( PasteboardCopyItemFlavorData( pasteboard, itemID, CFSTR("com.apple.traditional-mac-plain-text"), &flavorData ) == noErr )
- {
- CFIndex flavorDataSize = CFDataGetLength( flavorData );
- char *content = new char[flavorDataSize+1] ;
- memcpy( content, CFDataGetBytePtr( flavorData ), flavorDataSize );
- content[flavorDataSize]=0;
- CFRelease( flavorData );
-#if wxUSE_UNICODE
- textCtrl->WriteText( wxString( content , wxConvLocal ) );
-#else
- textCtrl->WriteText( wxString( content ) ) ;
-#endif
+ if (x)
+ *x = (int) pt.x ;
+ if (y)
+ *y = (int) pt.y ;
+}
- delete[] content ;
- result = noErr ;
- }
- }
- }
- }
- break ;
+void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
+{
+ wxPoint pt ;
- default:
- break ;
+ if (x)
+ pt.x = *x ;
+ if (y)
+ pt.y = *y ;
+
+ if ( !IsTopLevel() )
+ {
+ wxNonOwnedWindow* top = MacGetTopLevelWindow();
+ if (top)
+ {
+ wxWidgetImpl::Convert( &pt , top->m_peer , m_peer ) ;
+ pt.x += MacGetLeftBorderSize() ;
+ pt.y += MacGetTopBorderSize() ;
+ }
}
- return result ;
+ if (x)
+ *x = (int) pt.x ;
+ if (y)
+ *y = (int) pt.y ;
}
-pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const
{
- OSStatus result = eventNotHandledErr ;
- wxWindowMac* focus = (wxWindowMac*) data ;
+ wxSize sizeTotal = size;
- wchar_t* uniChars = NULL ;
- UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+ int innerwidth, innerheight;
+ int left, top;
+ int outerwidth, outerheight;
+
+ m_peer->GetContentArea( left, top, innerwidth, innerheight );
+ m_peer->GetSize( outerwidth, outerheight );
+
+ sizeTotal.x += left + (outerwidth-innerwidth);
+ sizeTotal.y += top + (outerheight-innerheight);
+
+ sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
+ sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
- UniChar* charBuf = NULL;
- ByteCount dataSize = 0 ;
- int numChars = 0 ;
- UniChar buf[2] ;
- if ( GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr )
- {
- numChars = dataSize / sizeof( UniChar) + 1;
- charBuf = buf ;
+ return sizeTotal;
+}
- if ( (size_t) numChars * 2 > sizeof(buf) )
- charBuf = new UniChar[ numChars ] ;
- else
- charBuf = buf ;
+// Get size *available for subwindows* i.e. excluding menu bar etc.
+void wxWindowMac::DoGetClientSize( int *x, int *y ) const
+{
+ int ww, hh;
- uniChars = new wchar_t[ numChars ] ;
- GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
- charBuf[ numChars - 1 ] = 0;
-#if SIZEOF_WCHAR_T == 2
- uniChars = (wchar_t*) charBuf ;
-/* memcpy( uniChars , charBuf , numChars * 2 ) ;*/ // is there any point in copying charBuf over itself? (in fact, memcpy isn't even guaranteed to work correctly if the source and destination ranges overlap...)
-#else
- // the resulting string will never have more chars than the utf16 version, so this is safe
- wxMBConvUTF16 converter ;
- numChars = converter.MB2WC( uniChars , (const char*)charBuf , numChars ) ;
-#endif
- }
+ int left, top;
+
+ m_peer->GetContentArea( left, top, ww, hh );
- switch ( GetEventKind( event ) )
- {
- case kEventTextInputUpdateActiveInputArea :
- {
- // An IME input event may return several characters, but we need to send one char at a time to
- // EVT_CHAR
- for (int pos=0 ; pos < numChars ; pos++)
- {
- WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
- WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
- wxTheApp->MacSetCurrentEvent( event , handler ) ;
+ if (m_hScrollBar && m_hScrollBar->IsShown() )
+ hh -= m_hScrollBar->GetSize().y ;
- UInt32 message = uniChars[pos] < 128 ? (char)uniChars[pos] : '?';
-/*
- NB: faking a charcode here is problematic. The kEventTextInputUpdateActiveInputArea event is sent
- multiple times to update the active range during inline input, so this handler will often receive
- uncommited text, which should usually not trigger side effects. It might be a good idea to check the
- kEventParamTextInputSendFixLen parameter and verify if input is being confirmed (see CarbonEvents.h).
- On the other hand, it can be useful for some applications to react to uncommitted text (for example,
- to update a status display), as long as it does not disrupt the inline input session. Ideally, wx
- should add new event types to support advanced text input. For now, I would keep things as they are.
+ if (m_vScrollBar && m_vScrollBar->IsShown() )
+ ww -= m_vScrollBar->GetSize().x ;
- However, the code that was being used caused additional problems:
- UInt32 message = (0 << 8) + ((char)uniChars[pos] );
- Since it simply truncated the unichar to the last byte, it ended up causing weird bugs with inline
- input, such as switching to another field when one attempted to insert the character U+4E09 (the kanji
- for "three"), because it was truncated to 09 (kTabCharCode), which was later "converted" to WXK_TAB
- (still 09) in wxMacTranslateKey; or triggering the default button when one attempted to insert U+840D
- (the kanji for "name"), which got truncated to 0D and interpreted as a carriage return keypress.
- Note that even single-byte characters could have been misinterpreted, since MacRoman charcodes only
- overlap with Unicode within the (7-bit) ASCII range.
- But simply passing a NUL charcode would disable text updated events, because wxTextCtrl::OnChar checks
- for codes within a specific range. Therefore I went for the solution seen above, which keeps ASCII
- characters as they are and replaces the rest with '?', ensuring that update events are triggered.
- It would be better to change wxTextCtrl::OnChar to look at the actual unicode character instead, but
- I don't have time to look into that right now.
- -- CL
-*/
- if ( wxTheApp->MacSendCharEvent(
- focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
- {
- result = noErr ;
- }
+ if (x)
+ *x = ww;
+ if (y)
+ *y = hh;
+}
- wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
- }
- }
- break ;
- case kEventTextInputUnicodeForKeyEvent :
- {
- UInt32 keyCode, modifiers ;
- Point point ;
- EventRef rawEvent ;
- unsigned char charCode ;
+bool wxWindowMac::SetCursor(const wxCursor& cursor)
+{
+ if (m_cursor.IsSameAs(cursor))
+ return false;
- GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ;
- GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
- GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
- GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
- GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
+ if (!cursor.IsOk())
+ {
+ if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
+ return false ;
+ }
+ else
+ {
+ if ( ! wxWindowBase::SetCursor( cursor ) )
+ return false ;
+ }
- UInt32 message = (keyCode << 8) + charCode;
+ wxASSERT_MSG( m_cursor.Ok(),
+ wxT("cursor must be valid after call to the base version"));
- // An IME input event may return several characters, but we need to send one char at a time to
- // EVT_CHAR
- for (int pos=0 ; pos < numChars ; pos++)
- {
- WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
- WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
- wxTheApp->MacSetCurrentEvent( event , handler ) ;
+ wxWindowMac *mouseWin = 0 ;
+#if wxOSX_USE_CARBON
+ {
+ wxNonOwnedWindow *tlw = MacGetTopLevelWindow() ;
+ WindowRef window = (WindowRef) ( tlw ? tlw->GetWXWindow() : 0 ) ;
- if ( wxTheApp->MacSendCharEvent(
- focus , message , modifiers , when , point.h , point.v , uniChars[pos] ) )
- {
- result = noErr ;
- }
+ ControlPartCode part ;
+ ControlRef control ;
+ Point pt ;
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+ HIPoint hiPoint ;
+ HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
+ pt.h = hiPoint.x;
+ pt.v = hiPoint.y;
+ #else
+ GetGlobalMouse( &pt );
+ int x = pt.h;
+ int y = pt.v;
+ ScreenToClient(&x, &y);
+ pt.h = x;
+ pt.v = y;
+#endif
+ control = FindControlUnderMouse( pt , window , &part ) ;
+ if ( control )
+ mouseWin = wxFindWindowFromWXWidget( (WXWidget) control ) ;
- wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
- }
- }
- break;
- default:
- break ;
}
+#endif
- delete [] uniChars ;
- if ( charBuf != buf )
- delete [] charBuf ;
+ if ( mouseWin == this && !wxIsBusy() )
+ m_cursor.MacInstall() ;
- return result ;
+ return true ;
}
-static pascal OSStatus
-wxMacWindowCommandEventHandler(EventHandlerCallRef WXUNUSED(handler),
- EventRef event,
- void *data)
+#if wxUSE_MENUS
+bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{
- OSStatus result = eventNotHandledErr ;
- wxWindowMac* focus = (wxWindowMac*) data ;
-
- HICommand command ;
-
- wxMacCarbonEvent cEvent( event ) ;
- cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;
-
- wxMenuItem* item = NULL ;
- wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ;
- int id = wxMacCommandToId( command.commandID ) ;
+#ifndef __WXUNIVERSAL__
+ menu->SetInvokingWindow((wxWindow*)this);
+ menu->UpdateUI();
- if ( item )
+ if ( x == wxDefaultCoord && y == wxDefaultCoord )
{
- wxASSERT( itemMenu != NULL ) ;
+ wxPoint mouse = wxGetMousePosition();
+ x = mouse.x;
+ y = mouse.y;
+ }
+ else
+ {
+ ClientToScreen( &x , &y ) ;
+ }
- switch ( cEvent.GetKind() )
+ menu->MacBeforeDisplay( true ) ;
+ long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
+ if ( HiWord(menuResult) != 0 )
+ {
+ MenuCommand macid;
+ GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid );
+ int id = wxMacCommandToId( macid );
+ wxMenuItem* item = NULL ;
+ wxMenu* realmenu ;
+ item = menu->FindItem( id, &realmenu ) ;
+ if ( item )
{
- case kEventProcessCommand :
- result = itemMenu->MacHandleCommandProcess( item, id, focus );
- break ;
-
- case kEventCommandUpdateStatus:
- result = itemMenu->MacHandleCommandUpdateStatus( item, id, focus );
- break ;
+ if (item->IsCheckable())
+ item->Check( !item->IsChecked() ) ;
- default :
- break ;
+ menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
}
}
- return result ;
-}
-
-pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
-{
- EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
- EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
- wxTheApp->MacSetCurrentEvent( event , handler ) ;
- OSStatus result = eventNotHandledErr ;
-
- switch ( GetEventClass( event ) )
- {
- case kEventClassCommand :
- result = wxMacWindowCommandEventHandler( handler , event , data ) ;
- break ;
- case kEventClassControl :
- result = wxMacWindowControlEventHandler( handler, event, data ) ;
- break ;
+ menu->MacAfterDisplay( true ) ;
+ menu->SetInvokingWindow( NULL );
- case kEventClassService :
- result = wxMacWindowServiceEventHandler( handler, event , data ) ;
- break ;
+ return true;
+#else
+ // actually this shouldn't be called, because universal is having its own implementation
+ return false;
+#endif
+}
+#endif
- case kEventClassTextInput :
- result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
- break ;
+// ----------------------------------------------------------------------------
+// tooltips
+// ----------------------------------------------------------------------------
- default :
- break ;
- }
+#if wxUSE_TOOLTIPS
- wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
+void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
+{
+ wxWindowBase::DoSetToolTip(tooltip);
- return result ;
+ if ( m_tooltip )
+ m_tooltip->SetWindow(this);
}
-DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
-
-// ---------------------------------------------------------------------------
-// Scrollbar Tracking for all
-// ---------------------------------------------------------------------------
+#endif
-pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
-pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
+void wxWindowMac::MacInvalidateBorders()
{
- if ( partCode != 0)
- {
- wxWindow* wx = wxFindControlFromMacControl( control ) ;
- if ( wx )
- wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
- }
-}
-wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
-
-// ===========================================================================
-// implementation
-// ===========================================================================
+ if ( m_peer == NULL )
+ return ;
-WX_DECLARE_HASH_MAP(ControlRef, wxWindow*, wxPointerHash, wxPointerEqual, MacControlMap);
+ bool vis = IsShownOnScreen() ;
+ if ( !vis )
+ return ;
-static MacControlMap wxWinMacControlList;
+ int outerBorder = MacGetLeftBorderSize() ;
+#if wxOSX_USE_CARBON
+ if ( m_peer->NeedsFocusRect() /* && m_peer->HasFocus() */ )
+ outerBorder += 4 ;
+#endif
-wxWindow *wxFindControlFromMacControl(ControlRef inControl )
-{
- MacControlMap::iterator node = wxWinMacControlList.find(inControl);
+ if ( outerBorder == 0 )
+ return ;
- return (node == wxWinMacControlList.end()) ? NULL : node->second;
-}
+ // now we know that we have something to do at all
+
-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") );
+ int tx,ty,tw,th;
+
+ m_peer->GetSize( tw, th );
+ m_peer->GetPosition( tx, ty );
- wxWinMacControlList[inControl] = control;
+ wxRect leftupdate( tx-outerBorder,ty,outerBorder,th );
+ wxRect rightupdate( tx+tw, ty, outerBorder, th );
+ wxRect topupdate( tx-outerBorder, ty-outerBorder, tw + 2 * outerBorder, outerBorder );
+ wxRect bottomupdate( tx-outerBorder, ty + th, tw + 2 * outerBorder, outerBorder );
+
+ GetParent()->m_peer->SetNeedsDisplay(&leftupdate);
+ GetParent()->m_peer->SetNeedsDisplay(&rightupdate);
+ GetParent()->m_peer->SetNeedsDisplay(&topupdate);
+ GetParent()->m_peer->SetNeedsDisplay(&bottomupdate);
}
-void wxRemoveMacControlAssociation(wxWindow *control)
+void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
{
- // iterate over all the elements in the class
- // is the iterator stable ? as we might have two associations pointing to the same wxWindow
- // we should go on...
+ // this is never called for a toplevel window, so we know we have a parent
+ int former_x , former_y , former_w, former_h ;
- bool found = true ;
- while ( found )
+ // Get true coordinates of former position
+ DoGetPosition( &former_x , &former_y ) ;
+ DoGetSize( &former_w , &former_h ) ;
+
+ wxWindow *parent = GetParent();
+ if ( parent )
{
- found = false ;
- MacControlMap::iterator it;
- for ( it = wxWinMacControlList.begin(); it != wxWinMacControlList.end(); ++it )
- {
- if ( it->second == control )
- {
- wxWinMacControlList.erase(it);
- found = true ;
- break;
- }
- }
+ wxPoint pt(parent->GetClientAreaOrigin());
+ former_x += pt.x ;
+ former_y += pt.y ;
}
-}
-
-// ----------------------------------------------------------------------------
- // constructors and such
-// ----------------------------------------------------------------------------
-
-wxWindowMac::wxWindowMac()
-{
- Init();
-}
-
-wxWindowMac::wxWindowMac(wxWindowMac *parent,
- wxWindowID id,
- const wxPoint& pos ,
- const wxSize& size ,
- long style ,
- const wxString& name )
-{
- Init();
- Create(parent, id, pos, size, style, name);
-}
-void wxWindowMac::Init()
-{
- m_peer = NULL ;
- m_macAlpha = 255 ;
- m_cgContextRef = NULL ;
+ int actualWidth = width ;
+ int actualHeight = height ;
+ int actualX = x;
+ int actualY = y;
- // as all windows are created with WS_VISIBLE style...
- m_isShown = true;
+ if ((m_minWidth != -1) && (actualWidth < m_minWidth))
+ actualWidth = m_minWidth;
+ if ((m_minHeight != -1) && (actualHeight < m_minHeight))
+ actualHeight = m_minHeight;
+ if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
+ actualWidth = m_maxWidth;
+ if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
+ actualHeight = m_maxHeight;
- m_hScrollBar = NULL ;
- m_vScrollBar = NULL ;
- m_hScrollBarAlwaysShown = false;
- m_vScrollBarAlwaysShown = false;
+ bool doMove = false, doResize = false ;
- m_macIsUserPane = true;
- m_clipChildren = false ;
- m_cachedClippedRectValid = false ;
-}
+ if ( actualX != former_x || actualY != former_y )
+ doMove = true ;
-wxWindowMac::~wxWindowMac()
-{
- SendDestroyEvent();
+ if ( actualWidth != former_w || actualHeight != former_h )
+ doResize = true ;
- m_isBeingDeleted = true;
+ if ( doMove || doResize )
+ {
+ // as the borders are drawn outside the native control, we adjust now
- MacInvalidateBorders() ;
+ wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ),
+ wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
+ actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
-#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 ( !GetParent()->IsTopLevel() )
{
- if ( frame->GetLastFocus() == this )
- frame->SetLastFocus((wxWindow*)NULL);
- break;
+ bounds.Offset( -GetParent()->MacGetLeftBorderSize(), -GetParent()->MacGetTopBorderSize() );
}
- }
-#endif
- // destroy children before destroying this window itself
- DestroyChildren();
+ MacInvalidateBorders() ;
- // wxRemoveMacControlAssociation( this ) ;
- // If we delete an item, we should initialize the parent panel,
- // because it could now be invalid.
- wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
- if ( tlw )
- {
- if ( tlw->GetDefaultItem() == (wxButton*) this)
- tlw->SetDefaultItem(NULL);
- }
+ m_cachedClippedRectValid = false ;
+
+ m_peer->Move( bounds.x, bounds.y, bounds.width, bounds.height);
- if ( m_peer && m_peer->Ok() )
- {
- // in case the callback might be called during destruction
- wxRemoveMacControlAssociation( this) ;
- ::RemoveEventHandler( (EventHandlerRef ) m_macControlEventHandler ) ;
- // we currently are not using this hook
- // ::SetControlColorProc( *m_peer , NULL ) ;
- m_peer->Dispose() ;
- }
+ wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
- if ( g_MacLastWindow == this )
- g_MacLastWindow = NULL ;
+ MacInvalidateBorders() ;
-#ifndef __WXUNIVERSAL__
- wxFrame* frame = wxDynamicCast( wxGetTopLevelParent( (wxWindow*)this ) , wxFrame ) ;
- if ( frame )
- {
- if ( frame->GetLastFocus() == this )
- frame->SetLastFocus( NULL ) ;
+ MacRepositionScrollBars() ;
+ if ( doMove )
+ {
+ wxPoint point(actualX, actualY);
+ wxMoveEvent event(point, m_windowId);
+ event.SetEventObject(this);
+ HandleWindowEvent(event) ;
+ }
+
+ if ( doResize )
+ {
+ MacRepositionScrollBars() ;
+ wxSize size(actualWidth, actualHeight);
+ wxSizeEvent event(size, m_windowId);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ }
}
-#endif
+}
- // delete our drop target if we've got one
-#if wxUSE_DRAG_AND_DROP
- if ( m_dropTarget != NULL )
+wxSize wxWindowMac::DoGetBestSize() const
+{
+ if ( m_macIsUserPane || IsTopLevel() )
{
- delete m_dropTarget;
- m_dropTarget = NULL;
+ return wxWindowBase::DoGetBestSize() ;
}
+ else
+ {
+
+ Rect bestsize = { 0 , 0 , 0 , 0 } ;
+ int bestWidth, bestHeight ;
+
+#if wxOSX_USE_COCOA_OR_CARBON
+#if wxOSX_USE_CARBON
+ m_peer->GetBestRect( &bestsize ) ;
#endif
+ if ( EmptyRect( &bestsize ) )
+ {
+ bestsize.left =
+ bestsize.top = 0 ;
+ bestsize.right =
+ bestsize.bottom = 16 ;
- delete m_peer ;
-}
+ if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
+ {
+ bestsize.bottom = 16 ;
+ }
+ #if wxUSE_SPINBTN
+ else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
+ {
+ bestsize.bottom = 24 ;
+ }
+ #endif
+ else
+ {
+ // return wxWindowBase::DoGetBestSize() ;
+ }
+ }
+#endif
+ bestWidth = bestsize.right - bestsize.left + MacGetLeftBorderSize() +
+ MacGetRightBorderSize();
+ bestHeight = bestsize.bottom - bestsize.top + MacGetTopBorderSize() +
+ MacGetBottomBorderSize();
+ if ( bestHeight < 10 )
+ bestHeight = 13 ;
-WXWidget wxWindowMac::GetHandle() const
-{
- return (WXWidget) m_peer->GetControlRef() ;
+ return wxSize(bestWidth, bestHeight);
+ }
}
-void wxWindowMac::MacInstallEventHandler( WXWidget control )
+// 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
+// which case -1 is a valid value for x and y)
+//
+// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
+// the width/height to best suit our contents, otherwise we reuse the current
+// width/height
+void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
- wxAssociateControlWithMacControl( (ControlRef) control , this ) ;
- InstallControlEventHandler( (ControlRef)control , GetwxMacWindowEventHandlerUPP(),
- GetEventTypeCount(eventList), eventList, this,
- (EventHandlerRef *)&m_macControlEventHandler);
-}
+ // get the current size and position...
+ int currentX, currentY;
+ int currentW, currentH;
-// Constructor
-bool wxWindowMac::Create(wxWindowMac *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- wxCHECK_MSG( parent, false, wxT("can't create wxWindowMac without parent") );
+ GetPosition(¤tX, ¤tY);
+ GetSize(¤tW, ¤tH);
- if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) )
- return false;
+ // ... and don't do anything (avoiding flicker) if it's already ok
+ if ( x == currentX && y == currentY &&
+ width == currentW && height == currentH && ( height != -1 && width != -1 ) )
+ {
+ // TODO: REMOVE
+ MacRepositionScrollBars() ; // we might have a real position shift
- m_windowVariant = parent->GetWindowVariant() ;
+ return;
+ }
- if ( m_macIsUserPane )
+ if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
{
- Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+ if ( x == wxDefaultCoord )
+ x = currentX;
+ if ( y == wxDefaultCoord )
+ y = currentY;
+ }
- UInt32 features = 0
- | kControlSupportsEmbedding
- | kControlSupportsLiveFeedback
- | kControlGetsFocusOnClick
-// | kControlHasSpecialBackground
-// | kControlSupportsCalcBestRect
- | kControlHandlesTracking
- | kControlSupportsFocus
- | kControlWantsActivate
- | kControlWantsIdle ;
+ AdjustForParentClientOrigin( x, y, sizeFlags );
+
+ wxSize size = wxDefaultSize;
+ if ( width == wxDefaultCoord )
+ {
+ if ( sizeFlags & wxSIZE_AUTO_WIDTH )
+ {
+ size = DoGetBestSize();
+ width = size.x;
+ }
+ else
+ {
+ // just take the current one
+ width = currentW;
+ }
+ }
- m_peer = new wxMacControl(this) ;
- OSStatus err =::CreateUserPaneControl( MAC_WXHWND(GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , m_peer->GetControlRefAddr() );
- verify_noerr( err );
+ if ( height == wxDefaultCoord )
+ {
+ if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
+ {
+ if ( size.x == wxDefaultCoord )
+ size = DoGetBestSize();
+ // else: already called DoGetBestSize() above
- MacPostControlCreate(pos, size) ;
+ height = size.y;
+ }
+ else
+ {
+ // just take the current one
+ height = currentH;
+ }
}
-#ifndef __WXUNIVERSAL__
- // Don't give scrollbars to wxControls unless they ask for them
- if ( (! IsKindOf(CLASSINFO(wxControl)) && ! IsKindOf(CLASSINFO(wxStatusBar)))
- || (IsKindOf(CLASSINFO(wxControl)) && ((style & wxHSCROLL) || (style & wxVSCROLL))))
+ DoMoveWindow( x, y, width, height );
+}
+
+wxPoint wxWindowMac::GetClientAreaOrigin() const
+{
+#if wxOSX_USE_CARBON
+ RgnHandle rgn = NewRgn() ;
+ Rect content ;
+ if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
{
- MacCreateScrollBars( style ) ;
+ GetRegionBounds( rgn , &content ) ;
+ }
+ else
+ {
+ content.left =
+ content.top = 0 ;
}
-#endif
- wxWindowCreateEvent event(this);
- GetEventHandler()->AddPendingEvent(event);
+ DisposeRgn( rgn ) ;
- return true;
+ return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() );
+#else
+ return wxPoint(0,0);
+#endif
}
-void wxWindowMac::MacChildAdded()
+void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
{
- if ( m_vScrollBar )
- m_vScrollBar->Raise() ;
- if ( m_hScrollBar )
- m_hScrollBar->Raise() ;
+ if ( clientwidth != wxDefaultCoord || clientheight != wxDefaultCoord )
+ {
+ int currentclientwidth , currentclientheight ;
+ int currentwidth , currentheight ;
+
+ GetClientSize( ¤tclientwidth , ¤tclientheight ) ;
+ GetSize( ¤twidth , ¤theight ) ;
+
+ DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth ,
+ currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
+ }
}
-void wxWindowMac::MacPostControlCreate(const wxPoint& WXUNUSED(pos), const wxSize& size)
+void wxWindowMac::SetLabel(const wxString& title)
{
- wxASSERT_MSG( m_peer != NULL && m_peer->Ok() , wxT("No valid mac control") ) ;
-
- m_peer->SetReference( (URefCon) this ) ;
- GetParent()->AddChild( this );
+ m_label = title ;
- MacInstallEventHandler( (WXWidget) m_peer->GetControlRef() );
+#if wxOSX_USE_CARBON
+ if ( m_peer && m_peer->IsOk() )
+ m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
+#endif
- ControlRef container = (ControlRef) GetParent()->GetHandle() ;
- wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
- ::EmbedControl( m_peer->GetControlRef() , container ) ;
- GetParent()->MacChildAdded() ;
+ // do not trigger refreshes upon invisible and possible partly created objects
+ if ( IsShownOnScreen() )
+ Refresh() ;
+}
- // adjust font, controlsize etc
- DoSetWindowVariant( m_windowVariant ) ;
+wxString wxWindowMac::GetLabel() const
+{
+ return m_label ;
+}
- m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
+bool wxWindowMac::Show(bool show)
+{
+ if ( !wxWindowBase::Show(show) )
+ return false;
- if (!m_macIsUserPane)
- SetInitialSize(size);
+ if ( m_peer )
+ m_peer->SetVisibility( show ) ;
- SetCursor( *wxSTANDARD_CURSOR ) ;
+ return true;
}
-void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
+void wxWindowMac::DoEnable(bool enable)
{
- // Don't assert, in case we set the window variant before
- // the window is created
- // wxASSERT( m_peer->Ok() ) ;
+#if wxOSX_USE_CARBON
+ m_peer->Enable( enable ) ;
+#endif
+}
- m_windowVariant = variant ;
+//
+// status change notifications
+//
- if (m_peer == NULL || !m_peer->Ok())
- return;
+void wxWindowMac::MacVisibilityChanged()
+{
+}
- ControlSize size ;
- ThemeFontID themeFont = kThemeSystemFont ;
+void wxWindowMac::MacHiliteChanged()
+{
+}
- // we will get that from the settings later
- // and make this NORMAL later, but first
- // we have a few calculations that we must fix
+void wxWindowMac::MacEnabledStateChanged()
+{
+#if wxOSX_USE_CARBON
+ OnEnabled( m_peer->IsEnabled() );
+#endif
+}
- switch ( variant )
- {
- case wxWINDOW_VARIANT_NORMAL :
- size = kControlSizeNormal;
- themeFont = kThemeSystemFont ;
- break ;
-
- case wxWINDOW_VARIANT_SMALL :
- size = kControlSizeSmall;
- themeFont = kThemeSmallSystemFont ;
- break ;
-
- case wxWINDOW_VARIANT_MINI :
- // not always defined in the headers
- size = 3 ;
- themeFont = 109 ;
- break ;
-
- case wxWINDOW_VARIANT_LARGE :
- size = kControlSizeLarge;
- themeFont = kThemeSystemFont ;
- break ;
-
- default:
- wxFAIL_MSG(_T("unexpected window variant"));
- break ;
- }
-
- m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
-
- wxFont font ;
- font.MacCreateFromThemeFont( themeFont ) ;
- SetFont( font ) ;
-}
+//
+// status queries on the inherited window's state
+//
-void wxWindowMac::MacUpdateControlFont()
+bool wxWindowMac::MacIsReallyEnabled()
{
- m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
- // do not trigger refreshes upon invisible and possible partly created objects
- if ( IsShownOnScreen() )
- Refresh() ;
+#if wxOSX_USE_CARBON
+ return m_peer->IsEnabled() ;
+#endif
}
-bool wxWindowMac::SetFont(const wxFont& font)
+bool wxWindowMac::MacIsReallyHilited()
{
- bool retval = wxWindowBase::SetFont( font );
-
- MacUpdateControlFont() ;
-
- return retval;
+#if wxOSX_USE_CARBON
+ return m_peer->IsActive();
+#endif
}
-bool wxWindowMac::SetForegroundColour(const wxColour& col )
+int wxWindowMac::GetCharHeight() const
{
- bool retval = wxWindowBase::SetForegroundColour( col );
-
- if (retval)
- MacUpdateControlFont();
+ wxClientDC dc( (wxWindow*)this ) ;
- return retval;
+ return dc.GetCharHeight() ;
}
-bool wxWindowMac::SetBackgroundColour(const wxColour& col )
+int wxWindowMac::GetCharWidth() const
{
- if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
- return false ;
+ wxClientDC dc( (wxWindow*)this ) ;
- m_peer->SetBackgroundColour( col ) ;
-
- return true ;
+ return dc.GetCharWidth() ;
}
-bool wxWindowMac::MacCanFocus() const
+void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
+ int *descent, int *externalLeading, const wxFont *theFont ) const
{
- // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so
- // CAUTION : the value returned currently is 0 or 2, I've also found values of 1 having the same meaning,
- // but the value range is nowhere documented
- Boolean keyExistsAndHasValidFormat ;
- CFIndex fullKeyboardAccess = CFPreferencesGetAppIntegerValue( CFSTR("AppleKeyboardUIMode" ) ,
- kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat );
-
- if ( keyExistsAndHasValidFormat && fullKeyboardAccess > 0 )
+ const wxFont *fontToUse = theFont;
+ wxFont tempFont;
+ if ( !fontToUse )
{
- return true ;
+ tempFont = GetFont();
+ fontToUse = &tempFont;
}
- else
- {
- UInt32 features = 0 ;
- m_peer->GetFeatures( &features ) ;
- return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
- }
+ wxClientDC dc( (wxWindow*) this ) ;
+ wxCoord lx,ly,ld,le ;
+ dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
+ if ( externalLeading )
+ *externalLeading = le ;
+ if ( descent )
+ *descent = ld ;
+ if ( x )
+ *x = lx ;
+ if ( y )
+ *y = ly ;
}
-void wxWindowMac::SetFocus()
-{
- if ( !AcceptsFocus() )
- return ;
+/*
+ * 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
+ */
- wxWindow* former = FindFocus() ;
- if ( former == this )
+void wxWindowMac::Refresh(bool WXUNUSED(eraseBack), const wxRect *rect)
+{
+ if ( m_peer == NULL )
return ;
- // as we cannot rely on the control features to find out whether we are in full keyboard mode,
- // we can only leave in case of an error
- wxLogTrace(_T("Focus"), _T("before wxWindow::SetFocus(%p) %d"), wx_static_cast(void*, this), GetName().c_str());
- OSStatus err = m_peer->SetFocus( kControlFocusNextPart ) ;
- if ( err == errCouldntSetFocus )
- {
- wxLogTrace(_T("Focus"), _T("in wxWindow::SetFocus(%p) errCouldntSetFocus"), wx_static_cast(void*, this));
+ if ( !IsShownOnScreen() )
return ;
- }
- wxLogTrace(_T("Focus"), _T("after wxWindow::SetFocus(%p)"), wx_static_cast(void*, this));
-
- SetUserFocusWindow( (WindowRef)MacGetTopLevelWindowRef() );
+
+ m_peer->SetNeedsDisplay( rect ) ;
}
-void wxWindowMac::DoCaptureMouse()
+void wxWindowMac::DoFreeze()
{
- wxApp::s_captureWindow = this ;
+#if wxOSX_USE_CARBON
+ if ( m_peer && m_peer->IsOk() )
+ m_peer->SetDrawingEnabled( false ) ;
+#endif
}
-wxWindow * wxWindowBase::GetCapture()
+void wxWindowMac::DoThaw()
{
- return wxApp::s_captureWindow ;
+#if wxOSX_USE_CARBON
+ if ( m_peer && m_peer->IsOk() )
+ {
+ m_peer->SetDrawingEnabled( true ) ;
+ m_peer->InvalidateWithChildren() ;
+ }
+#endif
}
-void wxWindowMac::DoReleaseMouse()
+wxWindow *wxGetActiveWindow()
{
- wxApp::s_captureWindow = NULL ;
+ // actually this is a windows-only concept
+ return NULL;
}
-#if wxUSE_DRAG_AND_DROP
-
-void wxWindowMac::SetDropTarget(wxDropTarget *pDropTarget)
+// Coordinates relative to the window
+void wxWindowMac::WarpPointer(int WXUNUSED(x_pos), int WXUNUSED(y_pos))
{
- if ( m_dropTarget != NULL )
- delete m_dropTarget;
+ // We really don't move the mouse programmatically under Mac.
+}
- m_dropTarget = pDropTarget;
- if ( m_dropTarget != NULL )
+void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
+{
+ if ( MacGetTopLevelWindow() == NULL )
+ return ;
+/*
+#if TARGET_API_MAC_OSX
+ if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
{
- // TODO:
}
-}
-
+ else
#endif
-
-// Old-style File Manager Drag & Drop
-void wxWindowMac::DragAcceptFiles(bool WXUNUSED(accept))
-{
- // TODO:
+*/
+ if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )
+ {
+ event.GetDC()->Clear() ;
+ }
+ else if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
+ {
+ // don't skip the event here, custom background means that the app
+ // is drawing it itself in its OnPaint(), so don't draw it at all
+ // now to avoid flicker
+ }
+ else
+ {
+ event.Skip() ;
+ }
}
-// Returns the size of the native control. In the case of the toplevel window
-// this is the content area root control
-
-void wxWindowMac::MacGetPositionAndSizeFromControl(int& WXUNUSED(x),
- int& WXUNUSED(y),
- int& WXUNUSED(w),
- int& WXUNUSED(h)) const
+void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
{
- wxFAIL_MSG( wxT("Not currently supported") ) ;
+ event.Skip() ;
}
-// From a wx position / size calculate the appropriate size of the native control
-
-bool wxWindowMac::MacGetBoundsForControl(
- const wxPoint& pos,
- const wxSize& size,
- int& x, int& y,
- int& w, int& h , bool adjustOrigin ) const
+int wxWindowMac::GetScrollPos(int orient) const
{
- // the desired size, minus the border pixels gives the correct size of the control
- x = (int)pos.x;
- y = (int)pos.y;
-
- // TODO: the default calls may be used as soon as PostCreateControl Is moved here
- w = wxMax(size.x, 0) ; // WidthDefault( size.x );
- h = wxMax(size.y, 0) ; // HeightDefault( size.y ) ;
-
- x += MacGetLeftBorderSize() ;
- y += MacGetTopBorderSize() ;
- w -= MacGetLeftBorderSize() + MacGetRightBorderSize() ;
- h -= MacGetTopBorderSize() + MacGetBottomBorderSize() ;
-
- if ( adjustOrigin )
- AdjustForParentClientOrigin( x , y ) ;
-
- // this is in window relative coordinate, as this parent may have a border, its physical position is offset by this border
- if ( !GetParent()->IsTopLevel() )
+ if ( orient == wxHORIZONTAL )
{
- x -= GetParent()->MacGetLeftBorderSize() ;
- y -= GetParent()->MacGetTopBorderSize() ;
+ if ( m_hScrollBar )
+ return m_hScrollBar->GetThumbPosition() ;
+ }
+ else
+ {
+ if ( m_vScrollBar )
+ return m_vScrollBar->GetThumbPosition() ;
}
- return true ;
+ return 0;
}
-// Get window size (not client size)
-void wxWindowMac::DoGetSize(int *x, int *y) const
+// This now returns the whole range, not just the number
+// of positions that we can scroll.
+int wxWindowMac::GetScrollRange(int orient) const
{
- Rect bounds ;
- m_peer->GetRect( &bounds ) ;
+ if ( orient == wxHORIZONTAL )
+ {
+ if ( m_hScrollBar )
+ return m_hScrollBar->GetRange() ;
+ }
+ else
+ {
+ if ( m_vScrollBar )
+ return m_vScrollBar->GetRange() ;
+ }
- if (x)
- *x = bounds.right - bounds.left + MacGetLeftBorderSize() + MacGetRightBorderSize() ;
- if (y)
- *y = bounds.bottom - bounds.top + MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+ return 0;
}
-// get the position of the bounds of this window in client coordinates of its parent
-void wxWindowMac::DoGetPosition(int *x, int *y) const
+int wxWindowMac::GetScrollThumb(int orient) const
{
- Rect bounds ;
- m_peer->GetRect( &bounds ) ;
-
- int x1 = bounds.left ;
- int y1 = bounds.top ;
+ if ( orient == wxHORIZONTAL )
+ {
+ if ( m_hScrollBar )
+ return m_hScrollBar->GetThumbSize() ;
+ }
+ else
+ {
+ if ( m_vScrollBar )
+ return m_vScrollBar->GetThumbSize() ;
+ }
- // get the wx window position from the native one
- x1 -= MacGetLeftBorderSize() ;
- y1 -= MacGetTopBorderSize() ;
+ return 0;
+}
- if ( !IsTopLevel() )
+void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
+{
+ if ( orient == wxHORIZONTAL )
{
- wxWindow *parent = GetParent();
- if ( parent )
- {
- // we must first adjust it to be in window coordinates of the parent,
- // as otherwise it gets lost by the ClientAreaOrigin fix
- x1 += parent->MacGetLeftBorderSize() ;
- y1 += parent->MacGetTopBorderSize() ;
-
- // and now to client coordinates
- wxPoint pt(parent->GetClientAreaOrigin());
- x1 -= pt.x ;
- y1 -= pt.y ;
- }
+ if ( m_hScrollBar )
+ m_hScrollBar->SetThumbPosition( pos ) ;
+ }
+ else
+ {
+ if ( m_vScrollBar )
+ m_vScrollBar->SetThumbPosition( pos ) ;
}
-
- if (x)
- *x = x1 ;
- if (y)
- *y = y1 ;
}
-void wxWindowMac::DoScreenToClient(int *x, int *y) const
+void
+wxWindowMac::AlwaysShowScrollbars(bool hflag, bool vflag)
{
- WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
- wxCHECK_RET( window , wxT("TopLevel Window missing") ) ;
-
- Point localwhere = { 0, 0 } ;
-
- if (x)
- localwhere.h = *x ;
- if (y)
- localwhere.v = *y ;
-
- wxMacGlobalToLocal( window , &localwhere ) ;
+ bool needVisibilityUpdate = false;
- if (x)
- *x = localwhere.h ;
- if (y)
- *y = localwhere.v ;
+ if ( m_hScrollBarAlwaysShown != hflag )
+ {
+ m_hScrollBarAlwaysShown = hflag;
+ needVisibilityUpdate = true;
+ }
- MacRootWindowToWindow( x , y ) ;
+ if ( m_vScrollBarAlwaysShown != vflag )
+ {
+ m_vScrollBarAlwaysShown = vflag;
+ needVisibilityUpdate = true;
+ }
- wxPoint origin = GetClientAreaOrigin() ;
- if (x)
- *x -= origin.x ;
- if (y)
- *y -= origin.y ;
+ if ( needVisibilityUpdate )
+ DoUpdateScrollbarVisibility();
}
-void wxWindowMac::DoClientToScreen(int *x, int *y) const
+//
+// we draw borders and grow boxes, are already set up and clipped in the current port / cgContextRef
+// our own window origin is at leftOrigin/rightOrigin
+//
+
+void wxWindowMac::MacPaintGrowBox()
{
- WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
- wxCHECK_RET( window , wxT("TopLevel window missing") ) ;
+ if ( IsTopLevel() )
+ return ;
- wxPoint origin = GetClientAreaOrigin() ;
- if (x)
- *x += origin.x ;
- if (y)
- *y += origin.y ;
+ if ( MacHasScrollBarCorner() )
+ {
+ CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
+ wxASSERT( cgContext ) ;
- MacWindowToRootWindow( x , y ) ;
+ int tx,ty,tw,th;
+
+ m_peer->GetSize( tw, th );
+ m_peer->GetPosition( tx, ty );
- Point localwhere = { 0, 0 };
- if (x)
- localwhere.h = *x ;
- if (y)
- localwhere.v = *y ;
+ Rect rect = { ty,tx, ty+th, tx+tw };
- wxMacLocalToGlobal( window, &localwhere ) ;
- if (x)
- *x = localwhere.h ;
- if (y)
- *y = localwhere.v ;
+ int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
+ CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
+ CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
+ CGContextSaveGState( cgContext );
+
+ if ( m_backgroundColour.Ok() )
+ {
+ CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
+ }
+ else
+ {
+ CGContextSetRGBFillColor( cgContext, (CGFloat) 1.0, (CGFloat)1.0 ,(CGFloat) 1.0 , (CGFloat)1.0 );
+ }
+ CGContextFillRect( cgContext, cgrect );
+ CGContextRestoreGState( cgContext );
+ }
}
-void wxWindowMac::MacClientToRootWindow( int *x , int *y ) const
+void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )
{
- wxPoint origin = GetClientAreaOrigin() ;
- if (x)
- *x += origin.x ;
- if (y)
- *y += origin.y ;
+ if ( IsTopLevel() )
+ return ;
- MacWindowToRootWindow( x , y ) ;
-}
+ bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
-void wxWindowMac::MacRootWindowToClient( int *x , int *y ) const
-{
- MacRootWindowToWindow( x , y ) ;
+ // back to the surrounding frame rectangle
+ int tx,ty,tw,th;
+
+ m_peer->GetSize( tw, th );
+ m_peer->GetPosition( tx, ty );
- wxPoint origin = GetClientAreaOrigin() ;
- if (x)
- *x -= origin.x ;
- if (y)
- *y -= origin.y ;
-}
+ Rect rect = { ty,tx, ty+th, tx+tw };
-void wxWindowMac::MacWindowToRootWindow( int *x , int *y ) const
-{
- wxPoint pt ;
+#if wxOSX_USE_COCOA_OR_CARBON
- if (x)
- pt.x = *x ;
- if (y)
- pt.y = *y ;
+ InsetRect( &rect, -1 , -1 ) ;
- if ( !IsTopLevel() )
{
- wxNonOwnedWindow* top = MacGetTopLevelWindow();
- if (top)
+ CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
+ rect.bottom - rect.top ) ;
+
+ HIThemeFrameDrawInfo info ;
+ memset( &info, 0 , sizeof(info) ) ;
+
+ info.version = 0 ;
+ info.kind = 0 ;
+ info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+ info.isFocused = hasFocus ;
+
+ CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
+ wxASSERT( cgContext ) ;
+
+ if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
{
- pt.x -= MacGetLeftBorderSize() ;
- pt.y -= MacGetTopBorderSize() ;
- wxMacControl::Convert( &pt , m_peer , top->m_peer ) ;
+ info.kind = kHIThemeFrameTextFieldSquare ;
+ HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+ }
+ else if ( HasFlag(wxSIMPLE_BORDER) )
+ {
+ info.kind = kHIThemeFrameListBox ;
+ HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
+ }
+ else if ( hasFocus )
+ {
+ HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
+ }
+#if 0 // TODO REMOVE now done in a separate call earlier in drawing the window itself
+ m_peer->GetRect( &rect ) ;
+ if ( MacHasScrollBarCorner() )
+ {
+ int variant = (m_hScrollBar == NULL ? m_vScrollBar : m_hScrollBar ) ->GetWindowVariant();
+ int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
+ CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
+ CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
+ HIThemeGrowBoxDrawInfo info ;
+ memset( &info, 0, sizeof(info) ) ;
+ info.version = 0 ;
+ info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
+ info.kind = kHIThemeGrowBoxKindNone ;
+ // contrary to the docs ...SizeSmall does not work
+ info.size = kHIThemeGrowBoxSizeNormal ;
+ info.direction = 0 ;
+ HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
}
+#endif
}
-
- if (x)
- *x = (int) pt.x ;
- if (y)
- *y = (int) pt.y ;
+#endif // wxOSX_USE_COCOA_OR_CARBON
}
-void wxWindowMac::MacWindowToRootWindow( short *x , short *y ) const
+void wxWindowMac::RemoveChild( wxWindowBase *child )
{
- int x1 , y1 ;
-
- if (x)
- x1 = *x ;
- if (y)
- y1 = *y ;
-
- MacWindowToRootWindow( &x1 , &y1 ) ;
+ if ( child == m_hScrollBar )
+ m_hScrollBar = NULL ;
+ if ( child == m_vScrollBar )
+ m_vScrollBar = NULL ;
- if (x)
- *x = x1 ;
- if (y)
- *y = y1 ;
+ wxWindowBase::RemoveChild( child ) ;
}
-void wxWindowMac::MacRootWindowToWindow( int *x , int *y ) const
+void wxWindowMac::DoUpdateScrollbarVisibility()
{
- wxPoint pt ;
+ bool triggerSizeEvent = false;
- if (x)
- pt.x = *x ;
- if (y)
- pt.y = *y ;
+ if ( m_hScrollBar )
+ {
+ bool showHScrollBar = m_hScrollBarAlwaysShown || m_hScrollBar->IsNeeded();
- if ( !IsTopLevel() )
+ if ( m_hScrollBar->IsShown() != showHScrollBar )
+ {
+ m_hScrollBar->Show( showHScrollBar );
+ triggerSizeEvent = true;
+ }
+ }
+
+ if ( m_vScrollBar)
{
- wxNonOwnedWindow* top = MacGetTopLevelWindow();
- if (top)
+ bool showVScrollBar = m_vScrollBarAlwaysShown || m_vScrollBar->IsNeeded();
+
+ if ( m_vScrollBar->IsShown() != showVScrollBar )
{
- wxMacControl::Convert( &pt , top->m_peer , m_peer ) ;
- pt.x += MacGetLeftBorderSize() ;
- pt.y += MacGetTopBorderSize() ;
+ m_vScrollBar->Show( showVScrollBar ) ;
+ triggerSizeEvent = true;
}
}
- if (x)
- *x = (int) pt.x ;
- if (y)
- *y = (int) pt.y ;
+ MacRepositionScrollBars() ;
+ if ( triggerSizeEvent )
+ {
+ wxSizeEvent event(GetSize(), m_windowId);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ }
}
-void wxWindowMac::MacRootWindowToWindow( short *x , short *y ) const
+// New function that will replace some of the above.
+void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
+ int range, bool refresh)
{
- int x1 , y1 ;
-
- if (x)
- x1 = *x ;
- if (y)
- y1 = *y ;
-
- MacRootWindowToWindow( &x1 , &y1 ) ;
+ if ( orient == wxHORIZONTAL && m_hScrollBar )
+ m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
+ else if ( orient == wxVERTICAL && m_vScrollBar )
+ m_vScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
- if (x)
- *x = x1 ;
- if (y)
- *y = y1 ;
+ DoUpdateScrollbarVisibility();
}
-void wxWindowMac::MacGetContentAreaInset( int &left , int &top , int &right , int &bottom )
+// Does a physical scroll
+void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{
- RgnHandle rgn = NewRgn() ;
+ if ( dx == 0 && dy == 0 )
+ return ;
- if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
- {
- Rect structure, content ;
+ int width , height ;
+ GetClientSize( &width , &height ) ;
- GetRegionBounds( rgn , &content ) ;
- m_peer->GetRect( &structure ) ;
- OffsetRect( &structure, -structure.left , -structure.top ) ;
+ {
+ wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
+ if ( rect )
+ scrollrect.Intersect( *rect ) ;
+ // as the native control might be not a 0/0 wx window coordinates, we have to offset
+ scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
- left = content.left - structure.left ;
- top = content.top - structure.top ;
- right = structure.right - content.right ;
- bottom = structure.bottom - content.bottom ;
+ m_peer->ScrollRect( &scrollrect, dx, dy );
}
- else
+
+ wxWindowMac *child;
+ int x, y, w, h;
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
{
- left = top = right = bottom = 0 ;
- }
+ child = node->GetData();
+ if (child == NULL)
+ continue;
+ if (child == m_vScrollBar)
+ continue;
+ if (child == m_hScrollBar)
+ continue;
+ if (child->IsTopLevel())
+ continue;
- DisposeRgn( rgn ) ;
+ child->GetPosition( &x, &y );
+ child->GetSize( &w, &h );
+ if (rect)
+ {
+ wxRect rc( x, y, w, h );
+ if (rect->Intersects( rc ))
+ child->SetSize( x + dx, y + dy, w, h, wxSIZE_AUTO|wxSIZE_ALLOW_MINUS_ONE );
+ }
+ else
+ {
+ child->SetSize( x + dx, y + dy, w, h, wxSIZE_AUTO|wxSIZE_ALLOW_MINUS_ONE );
+ }
+ }
}
-wxSize wxWindowMac::DoGetSizeFromClientSize( const wxSize & size ) const
+void wxWindowMac::MacOnScroll( wxScrollEvent &event )
{
- wxSize sizeTotal = size;
-
- RgnHandle rgn = NewRgn() ;
- if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
+ if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
{
- Rect content, structure ;
- GetRegionBounds( rgn , &content ) ;
- m_peer->GetRect( &structure ) ;
+ wxScrollWinEvent wevent;
+ wevent.SetPosition(event.GetPosition());
+ wevent.SetOrientation(event.GetOrientation());
+ wevent.SetEventObject(this);
- // structure is in parent coordinates, but we only need width and height, so it's ok
+ if (event.GetEventType() == wxEVT_SCROLL_TOP)
+ wevent.SetEventType( wxEVT_SCROLLWIN_TOP );
+ else if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
+ wevent.SetEventType( wxEVT_SCROLLWIN_BOTTOM );
+ else if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
+ wevent.SetEventType( wxEVT_SCROLLWIN_LINEUP );
+ else if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
+ wevent.SetEventType( wxEVT_SCROLLWIN_LINEDOWN );
+ else if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
+ wevent.SetEventType( wxEVT_SCROLLWIN_PAGEUP );
+ else if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
+ wevent.SetEventType( wxEVT_SCROLLWIN_PAGEDOWN );
+ else if (event.GetEventType() == wxEVT_SCROLL_THUMBTRACK)
+ wevent.SetEventType( wxEVT_SCROLLWIN_THUMBTRACK );
+ else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE)
+ wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE );
- sizeTotal.x += (structure.right - structure.left) - (content.right - content.left) ;
- sizeTotal.y += (structure.bottom - structure.top) - (content.bottom - content.top) ;
+ HandleWindowEvent(wevent);
}
+}
- DisposeRgn( rgn ) ;
+// Get the window with the focus
+wxWindow *wxWindowBase::DoFindFocus()
+{
+#if wxOSX_USE_CARBON
+ ControlRef control ;
+ GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
+ return wxFindWindowFromWXWidget( (WXWidget) control ) ;
+#else
+ return NULL;
+#endif
+}
- sizeTotal.x += MacGetLeftBorderSize() + MacGetRightBorderSize() ;
- sizeTotal.y += MacGetTopBorderSize() + MacGetBottomBorderSize() ;
+void wxWindowMac::OnInternalIdle()
+{
+ // This calls the UI-update mechanism (querying windows for
+ // menu/toolbar/control state information)
+ if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
+ UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+}
- return sizeTotal;
+// Raise the window to the top of the Z order
+void wxWindowMac::Raise()
+{
+ m_peer->Raise();
}
-// Get size *available for subwindows* i.e. excluding menu bar etc.
-void wxWindowMac::DoGetClientSize( int *x, int *y ) const
+// Lower the window to the bottom of the Z order
+void wxWindowMac::Lower()
{
- int ww, hh;
+ m_peer->Lower();
+}
- RgnHandle rgn = NewRgn() ;
- Rect content ;
- if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
- GetRegionBounds( rgn , &content ) ;
- else
- m_peer->GetRect( &content ) ;
- DisposeRgn( rgn ) ;
+// static wxWindow *gs_lastWhich = NULL;
- ww = content.right - content.left ;
- hh = content.bottom - content.top ;
+bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
+{
+ // first trigger a set cursor event
- if (m_hScrollBar && m_hScrollBar->IsShown() )
- hh -= m_hScrollBar->GetSize().y ;
+ wxPoint clientorigin = GetClientAreaOrigin() ;
+ wxSize clientsize = GetClientSize() ;
+ wxCursor cursor ;
+ if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
+ {
+ wxSetCursorEvent event( pt.x , pt.y );
- if (m_vScrollBar && m_vScrollBar->IsShown() )
- ww -= m_vScrollBar->GetSize().x ;
+ bool processedEvtSetCursor = HandleWindowEvent(event);
+ if ( processedEvtSetCursor && event.HasCursor() )
+ {
+ cursor = event.GetCursor() ;
+ }
+ else
+ {
+ // the test for processedEvtSetCursor is here to prevent using m_cursor
+ // if the user code caught EVT_SET_CURSOR() and returned nothing from
+ // it - this is a way to say that our cursor shouldn't be used for this
+ // point
+ if ( !processedEvtSetCursor && m_cursor.Ok() )
+ cursor = m_cursor ;
- if (x)
- *x = ww;
- if (y)
- *y = hh;
+ if ( !wxIsBusy() && !GetParent() )
+ cursor = *wxSTANDARD_CURSOR ;
+ }
+
+ if ( cursor.Ok() )
+ cursor.MacInstall() ;
+ }
+
+ return cursor.Ok() ;
}
-bool wxWindowMac::SetCursor(const wxCursor& cursor)
+wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )
{
- if (m_cursor.IsSameAs(cursor))
- return false;
+#if wxUSE_TOOLTIPS
+ if ( m_tooltip )
+ return m_tooltip->GetTip() ;
+#endif
- if (!cursor.IsOk())
- {
- if ( ! wxWindowBase::SetCursor( *wxSTANDARD_CURSOR ) )
- return false ;
- }
- else
+ return wxEmptyString ;
+}
+
+void wxWindowMac::ClearBackground()
+{
+ Refresh() ;
+ Update() ;
+}
+
+void wxWindowMac::Update()
+{
+ wxNonOwnedWindow* top = MacGetTopLevelWindow();
+ if (top)
+ top->Update() ;
+}
+
+wxNonOwnedWindow* wxWindowMac::MacGetTopLevelWindow() const
+{
+ wxWindowMac *iter = (wxWindowMac*)this ;
+
+ while ( iter )
{
- if ( ! wxWindowBase::SetCursor( cursor ) )
- return false ;
+ if ( iter->IsTopLevel() )
+ {
+ wxTopLevelWindow* toplevel = wxDynamicCast(iter,wxTopLevelWindow);
+ if ( toplevel )
+ return toplevel;
+#if wxUSE_POPUPWIN
+ wxPopupWindow* popupwin = wxDynamicCast(iter,wxPopupWindow);
+ if ( popupwin )
+ return popupwin;
+#endif
+ }
+ iter = iter->GetParent() ;
}
- wxASSERT_MSG( m_cursor.Ok(),
- wxT("cursor must be valid after call to the base version"));
+ return NULL ;
+}
- wxWindowMac *mouseWin = 0 ;
- {
- wxNonOwnedWindow *tlw = MacGetTopLevelWindow() ;
- WindowRef window = (WindowRef) ( tlw ? tlw->MacGetWindowRef() : 0 ) ;
+const wxRect& wxWindowMac::MacGetClippedClientRect() const
+{
+ MacUpdateClippedRects() ;
- ControlPartCode part ;
- ControlRef control ;
- Point pt ;
- #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
- HIPoint hiPoint ;
- HIGetMousePosition(kHICoordSpaceWindow, window, &hiPoint);
- pt.h = hiPoint.x;
- pt.v = hiPoint.y;
- #else
- GetGlobalMouse( &pt );
- int x = pt.h;
- int y = pt.v;
- ScreenToClient(&x, &y);
- pt.h = x;
- pt.v = y;
-#endif
- control = FindControlUnderMouse( pt , window , &part ) ;
- if ( control )
- mouseWin = wxFindControlFromMacControl( control ) ;
+ return m_cachedClippedClientRect ;
+}
- }
+const wxRect& wxWindowMac::MacGetClippedRect() const
+{
+ MacUpdateClippedRects() ;
- if ( mouseWin == this && !wxIsBusy() )
- m_cursor.MacInstall() ;
+ return m_cachedClippedRect ;
+}
- return true ;
+const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const
+{
+ MacUpdateClippedRects() ;
+
+ return m_cachedClippedRectWithOuterStructure ;
}
-#if wxUSE_MENUS
-bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
+const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
{
-#ifndef __WXUNIVERSAL__
- menu->SetInvokingWindow((wxWindow*)this);
- menu->UpdateUI();
+ static wxRegion emptyrgn ;
- if ( x == wxDefaultCoord && y == wxDefaultCoord )
+ if ( !m_isBeingDeleted && IsShownOnScreen() )
{
- wxPoint mouse = wxGetMousePosition();
- x = mouse.x;
- y = mouse.y;
+ MacUpdateClippedRects() ;
+ if ( includeOuterStructures )
+ return m_cachedClippedRegionWithOuterStructure ;
+ else
+ return m_cachedClippedRegion ;
}
else
{
- ClientToScreen( &x , &y ) ;
+ return emptyrgn ;
}
+}
- menu->MacBeforeDisplay( true ) ;
- long menuResult = ::PopUpMenuSelect((MenuHandle) menu->GetHMenu() , y, x, 0) ;
- if ( HiWord(menuResult) != 0 )
- {
- MenuCommand macid;
- GetMenuItemCommandID( GetMenuHandle(HiWord(menuResult)) , LoWord(menuResult) , &macid );
- int id = wxMacCommandToId( macid );
- wxMenuItem* item = NULL ;
- wxMenu* realmenu ;
- item = menu->FindItem( id, &realmenu ) ;
- if ( item )
- {
- if (item->IsCheckable())
- item->Check( !item->IsChecked() ) ;
+void wxWindowMac::MacUpdateClippedRects() const
+{
+#if wxOSX_USE_CARBON
+ if ( m_cachedClippedRectValid )
+ return ;
- menu->SendEvent( id , item->IsCheckable() ? item->IsChecked() : -1 ) ;
- }
- }
+ // includeOuterStructures is true if we try to draw somthing like a focus ring etc.
+ // also a window dc uses this, in this case we only clip in the hierarchy for hard
+ // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
+ // to add focus borders everywhere
- menu->MacAfterDisplay( true ) ;
- menu->SetInvokingWindow( NULL );
+ Rect rIncludingOuterStructures ;
- return true;
-#else
- // actually this shouldn't be called, because universal is having its own implementation
- return false;
-#endif
-}
-#endif
+ int tx,ty,tw,th;
+
+ m_peer->GetSize( tw, th );
+ m_peer->GetPosition( tx, ty );
-// ----------------------------------------------------------------------------
-// tooltips
-// ----------------------------------------------------------------------------
+ Rect r = { ty,tx, ty+th, tx+tw };
-#if wxUSE_TOOLTIPS
+ r.left -= MacGetLeftBorderSize() ;
+ r.top -= MacGetTopBorderSize() ;
+ r.bottom += MacGetBottomBorderSize() ;
+ r.right += MacGetRightBorderSize() ;
-void wxWindowMac::DoSetToolTip(wxToolTip *tooltip)
-{
- wxWindowBase::DoSetToolTip(tooltip);
+ r.right -= r.left ;
+ r.bottom -= r.top ;
+ r.left = 0 ;
+ r.top = 0 ;
- if ( m_tooltip )
- m_tooltip->SetWindow(this);
-}
+ rIncludingOuterStructures = r ;
+ InsetRect( &rIncludingOuterStructures , -4 , -4 ) ;
-#endif
+ wxRect cl = GetClientRect() ;
+ Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ;
-void wxWindowMac::MacInvalidateBorders()
-{
- if ( m_peer == NULL )
- return ;
+ int x , y ;
+ wxSize size ;
+ const wxWindow* child = (wxWindow*) this ;
+ const wxWindow* parent = NULL ;
- bool vis = IsShownOnScreen() ;
- if ( !vis )
- return ;
+ while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL )
+ {
+ if ( parent->MacIsChildOfClientArea(child) )
+ {
+ size = parent->GetClientSize() ;
+ wxPoint origin = parent->GetClientAreaOrigin() ;
+ x = origin.x ;
+ y = origin.y ;
+ }
+ else
+ {
+ // this will be true for scrollbars, toolbars etc.
+ size = parent->GetSize() ;
+ y = parent->MacGetTopBorderSize() ;
+ x = parent->MacGetLeftBorderSize() ;
+ size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ;
+ size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ;
+ }
- int outerBorder = MacGetLeftBorderSize() ;
- if ( m_peer->NeedsFocusRect() /* && m_peer->HasFocus() */ )
- outerBorder += 4 ;
+ parent->MacWindowToRootWindow( &x, &y ) ;
+ MacRootWindowToWindow( &x , &y ) ;
- if ( outerBorder == 0 )
- return ;
+ Rect rparent = { y , x , y + size.y , x + size.x } ;
- // now we know that we have something to do at all
+ // the wxwindow and client rects will always be clipped
+ SectRect( &r , &rparent , &r ) ;
+ SectRect( &rClient , &rparent , &rClient ) ;
- // as the borders are drawn on the parent we have to properly invalidate all these areas
- RgnHandle updateInner , updateOuter;
- Rect rect ;
+ // the structure only at 'hard' borders
+ if ( parent->MacClipChildren() ||
+ ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) )
+ {
+ SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ;
+ }
- // this rectangle is in HIViewCoordinates under OSX and in Window Coordinates under Carbon
- updateInner = NewRgn() ;
- updateOuter = NewRgn() ;
+ child = parent ;
+ }
- m_peer->GetRect( &rect ) ;
- RectRgn( updateInner, &rect ) ;
- InsetRect( &rect , -outerBorder , -outerBorder ) ;
- RectRgn( updateOuter, &rect ) ;
- DiffRgn( updateOuter, updateInner , updateOuter ) ;
+ m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ;
+ m_cachedClippedClientRect = wxRect( rClient.left , rClient.top ,
+ rClient.right - rClient.left , rClient.bottom - rClient.top ) ;
+ m_cachedClippedRectWithOuterStructure = wxRect(
+ rIncludingOuterStructures.left , rIncludingOuterStructures.top ,
+ rIncludingOuterStructures.right - rIncludingOuterStructures.left ,
+ rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ;
- GetParent()->m_peer->SetNeedsDisplay( updateOuter ) ;
+ m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ;
+ m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ;
+ m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ;
- DisposeRgn( updateOuter ) ;
- DisposeRgn( updateInner ) ;
+ m_cachedClippedRectValid = true ;
+#endif
}
-void wxWindowMac::DoMoveWindow(int x, int y, int width, int height)
+/*
+ This function must not change the updatergn !
+ */
+bool wxWindowMac::MacDoRedraw( void* updatergnr , long time )
{
- // this is never called for a toplevel window, so we know we have a parent
- int former_x , former_y , former_w, former_h ;
+ bool handled = false ;
+#if wxOSX_USE_CARBON
+ Rect updatebounds ;
+ RgnHandle updatergn = (RgnHandle) updatergnr ;
+ GetRegionBounds( updatergn , &updatebounds ) ;
- // Get true coordinates of former position
- DoGetPosition( &former_x , &former_y ) ;
- DoGetSize( &former_w , &former_h ) ;
+ // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
- wxWindow *parent = GetParent();
- if ( parent )
+ if ( !EmptyRgn(updatergn) )
{
- wxPoint pt(parent->GetClientAreaOrigin());
- former_x += pt.x ;
- former_y += pt.y ;
- }
-
- 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))
- actualHeight = m_minHeight;
- if ((m_maxWidth != -1) && (actualWidth > m_maxWidth))
- actualWidth = m_maxWidth;
- if ((m_maxHeight != -1) && (actualHeight > m_maxHeight))
- actualHeight = m_maxHeight;
-
- bool doMove = false, doResize = false ;
-
- if ( actualX != former_x || actualY != former_y )
- doMove = true ;
+ RgnHandle newupdate = NewRgn() ;
+ wxSize point = GetClientSize() ;
+ wxPoint origin = GetClientAreaOrigin() ;
+ SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;
+ SectRgn( newupdate , updatergn , newupdate ) ;
- if ( actualWidth != former_w || actualHeight != former_h )
- doResize = true ;
+ // first send an erase event to the entire update area
+ {
+ // for the toplevel window this really is the entire area
+ // for all the others only their client area, otherwise they
+ // might be drawing with full alpha and eg put blue into
+ // the grow-box area of a scrolled window (scroll sample)
+ wxDC* dc = new wxWindowDC(this);
+ if ( IsTopLevel() )
+ dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));
+ else
+ dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));
- if ( doMove || doResize )
- {
- // as the borders are drawn outside the native control, we adjust now
+ wxEraseEvent eevent( GetId(), dc );
+ eevent.SetEventObject( this );
+ HandleWindowEvent( eevent );
+ delete dc ;
+ }
- wxRect bounds( wxPoint( actualX + MacGetLeftBorderSize() ,actualY + MacGetTopBorderSize() ),
- wxSize( actualWidth - (MacGetLeftBorderSize() + MacGetRightBorderSize()) ,
- actualHeight - (MacGetTopBorderSize() + MacGetBottomBorderSize()) ) ) ;
+ MacPaintGrowBox();
- Rect r ;
- wxMacRectToNative( &bounds , &r ) ;
+ // calculate a client-origin version of the update rgn and set m_updateRegion to that
+ OffsetRgn( newupdate , -origin.x , -origin.y ) ;
+ m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;
+ DisposeRgn( newupdate ) ;
- if ( !GetParent()->IsTopLevel() )
- wxMacWindowToNative( GetParent() , &r ) ;
+ if ( !m_updateRegion.Empty() )
+ {
+ // paint the window itself
- MacInvalidateBorders() ;
+ wxPaintEvent event;
+ event.SetTimestamp(time);
+ event.SetEventObject(this);
+ HandleWindowEvent(event);
+ handled = true ;
+ }
- m_cachedClippedRectValid = false ;
- m_peer->SetRect( &r ) ;
+ // now we cannot rely on having its borders drawn by a window itself, as it does not
+ // get the updateRgn wide enough to always do so, so we do it from the parent
+ // this would also be the place to draw any custom backgrounds for native controls
+ // in Composited windowing
+ wxPoint clientOrigin = GetClientAreaOrigin() ;
- wxWindowMac::MacSuperChangedPosition() ; // like this only children will be notified
+ wxWindowMac *child;
+ int x, y, w, h;
+ for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+ {
+ child = node->GetData();
+ if (child == NULL)
+ continue;
+ if (child == m_vScrollBar)
+ continue;
+ if (child == m_hScrollBar)
+ continue;
+ if (child->IsTopLevel())
+ continue;
+ if (!child->IsShown())
+ continue;
- MacInvalidateBorders() ;
+ // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
- MacRepositionScrollBars() ;
- if ( doMove )
- {
- wxPoint point(actualX, actualY);
- wxMoveEvent event(point, m_windowId);
- event.SetEventObject(this);
- HandleWindowEvent(event) ;
- }
+ child->GetPosition( &x, &y );
+ child->GetSize( &w, &h );
+ Rect childRect = { y , x , y + h , x + w } ;
+ OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
+ InsetRect( &childRect , -10 , -10) ;
- if ( doResize )
- {
- MacRepositionScrollBars() ;
- wxSize size(actualWidth, actualHeight);
- wxSizeEvent event(size, m_windowId);
- event.SetEventObject(this);
- HandleWindowEvent(event);
+ if ( RectInRgn( &childRect , updatergn ) )
+ {
+ // paint custom borders
+ wxNcPaintEvent eventNc( child->GetId() );
+ eventNc.SetEventObject( child );
+ if ( !child->HandleWindowEvent( eventNc ) )
+ {
+ child->MacPaintBorders(0, 0) ;
+ }
+ }
}
}
+#endif
+ return handled ;
}
-wxSize wxWindowMac::DoGetBestSize() const
+
+WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
{
- if ( m_macIsUserPane || IsTopLevel() )
+ wxNonOwnedWindow* tlw = MacGetTopLevelWindow();
+ return tlw ? tlw->GetWXWindow() : NULL ;
+}
+
+bool wxWindowMac::MacHasScrollBarCorner() const
+{
+ /* Returns whether the scroll bars in a wxScrolledWindow should be
+ * shortened. Scroll bars should be shortened if either:
+ *
+ * - both scroll bars are visible, or
+ *
+ * - there is a resize box in the parent frame's corner and this
+ * window shares the bottom and right edge with the parent
+ * frame.
+ */
+
+ if ( m_hScrollBar == NULL && m_vScrollBar == NULL )
+ return false;
+
+ if ( ( m_hScrollBar && m_hScrollBar->IsShown() )
+ && ( m_vScrollBar && m_vScrollBar->IsShown() ) )
{
- return wxWindowBase::DoGetBestSize() ;
+ // Both scroll bars visible
+ return true;
}
else
{
- Rect bestsize = { 0 , 0 , 0 , 0 } ;
- int bestWidth, bestHeight ;
+ wxPoint thisWindowBottomRight = GetScreenRect().GetBottomRight();
- m_peer->GetBestRect( &bestsize ) ;
- if ( EmptyRect( &bestsize ) )
+ for ( const wxWindow *win = (wxWindow*)this; win; win = win->GetParent() )
{
- bestsize.left =
- bestsize.top = 0 ;
- bestsize.right =
- bestsize.bottom = 16 ;
-
- if ( IsKindOf( CLASSINFO( wxScrollBar ) ) )
- {
- bestsize.bottom = 16 ;
- }
- #if wxUSE_SPINBTN
- else if ( IsKindOf( CLASSINFO( wxSpinButton ) ) )
- {
- bestsize.bottom = 24 ;
- }
- #endif
- else
+ const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
+ if ( frame )
{
- // return wxWindowBase::DoGetBestSize() ;
+ if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER )
+ {
+ // Parent frame has resize handle
+ wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
+
+ // Note: allow for some wiggle room here as wxMac's
+ // window rect calculations seem to be imprecise
+ if ( abs( thisWindowBottomRight.x - frameBottomRight.x ) <= 2
+ && abs( thisWindowBottomRight.y - frameBottomRight.y ) <= 2 )
+ {
+ // Parent frame has resize handle and shares
+ // right bottom corner
+ return true ;
+ }
+ else
+ {
+ // Parent frame has resize handle but doesn't
+ // share right bottom corner
+ return false ;
+ }
+ }
+ else
+ {
+ // Parent frame doesn't have resize handle
+ return false ;
+ }
}
}
- bestWidth = bestsize.right - bestsize.left + MacGetLeftBorderSize() +
- MacGetRightBorderSize();
- bestHeight = bestsize.bottom - bestsize.top + MacGetTopBorderSize() +
- MacGetBottomBorderSize();
- if ( bestHeight < 10 )
- bestHeight = 13 ;
-
- return wxSize(bestWidth, bestHeight);
+ // No parent frame found
+ return false ;
}
}
-// 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
-// which case -1 is a valid value for x and y)
-//
-// If sizeFlags contains wxSIZE_AUTO_WIDTH/HEIGHT flags (default), we calculate
-// the width/height to best suit our contents, otherwise we reuse the current
-// width/height
-void wxWindowMac::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxWindowMac::MacCreateScrollBars( long style )
{
- // get the current size and position...
- int currentX, currentY;
- int currentW, currentH;
-
- GetPosition(¤tX, ¤tY);
- GetSize(¤tW, ¤tH);
+ wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
- // ... and don't do anything (avoiding flicker) if it's already ok
- if ( x == currentX && y == currentY &&
- width == currentW && height == currentH && ( height != -1 && width != -1 ) )
+ if ( style & ( wxVSCROLL | wxHSCROLL ) )
{
- // TODO: REMOVE
- MacRepositionScrollBars() ; // we might have a real position shift
-
- return;
- }
+ int scrlsize = MAC_SCROLLBAR_SIZE ;
+ if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
+ {
+ scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
+ }
- if ( !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE) )
- {
- if ( x == wxDefaultCoord )
- x = currentX;
- if ( y == wxDefaultCoord )
- y = currentY;
- }
+ int adjust = MacHasScrollBarCorner() ? scrlsize - 1: 0 ;
+ int width, height ;
+ GetClientSize( &width , &height ) ;
- AdjustForParentClientOrigin( x, y, sizeFlags );
+ wxPoint vPoint(width - scrlsize, 0) ;
+ wxSize vSize(scrlsize, height - adjust) ;
+ wxPoint hPoint(0, height - scrlsize) ;
+ wxSize hSize(width - adjust, scrlsize) ;
- wxSize size = wxDefaultSize;
- if ( width == wxDefaultCoord )
- {
- if ( sizeFlags & wxSIZE_AUTO_WIDTH )
- {
- size = DoGetBestSize();
- width = size.x;
- }
- else
+ // we have to set the min size to a smaller value, otherwise they cannot get smaller (InitialSize sets MinSize)
+ if ( style & wxVSCROLL )
{
- // just take the current one
- width = currentW;
+ m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL);
+ m_vScrollBar->SetMinSize( wxDefaultSize );
}
- }
- if ( height == wxDefaultCoord )
- {
- if ( sizeFlags & wxSIZE_AUTO_HEIGHT )
- {
- if ( size.x == wxDefaultCoord )
- size = DoGetBestSize();
- // else: already called DoGetBestSize() above
-
- height = size.y;
- }
- else
+ if ( style & wxHSCROLL )
{
- // just take the current one
- height = currentH;
+ m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
+ m_hScrollBar->SetMinSize( wxDefaultSize );
}
}
- DoMoveWindow( x, y, width, height );
+ // because the create does not take into account the client area origin
+ // we might have a real position shift
+ MacRepositionScrollBars() ;
}
-wxPoint wxWindowMac::GetClientAreaOrigin() const
+bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
{
- RgnHandle rgn = NewRgn() ;
- Rect content ;
- if ( m_peer->GetRegion( kControlContentMetaPart , rgn ) == noErr )
- {
- GetRegionBounds( rgn , &content ) ;
- }
- else
- {
- content.left =
- content.top = 0 ;
- }
-
- DisposeRgn( rgn ) ;
+ bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
- return wxPoint( content.left + MacGetLeftBorderSize() , content.top + MacGetTopBorderSize() );
+ return result ;
}
-void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
+void wxWindowMac::MacRepositionScrollBars()
{
- if ( clientwidth != wxDefaultCoord || clientheight != wxDefaultCoord )
- {
- int currentclientwidth , currentclientheight ;
- int currentwidth , currentheight ;
+ if ( !m_hScrollBar && !m_vScrollBar )
+ return ;
- GetClientSize( ¤tclientwidth , ¤tclientheight ) ;
- GetSize( ¤twidth , ¤theight ) ;
+ int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
+ int adjust = MacHasScrollBarCorner() ? scrlsize - 1 : 0 ;
- DoSetSize( wxDefaultCoord , wxDefaultCoord , currentwidth + clientwidth - currentclientwidth ,
- currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
- }
-}
+ // get real client area
+ int width, height ;
+ GetSize( &width , &height );
-void wxWindowMac::SetLabel(const wxString& title)
-{
- m_label = title ;
+ width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
+ height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
- if ( m_peer && m_peer->Ok() )
- m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
+ wxPoint vPoint( width - scrlsize, 0 ) ;
+ wxSize vSize( scrlsize, height - adjust ) ;
+ wxPoint hPoint( 0 , height - scrlsize ) ;
+ wxSize hSize( width - adjust, scrlsize ) ;
- // do not trigger refreshes upon invisible and possible partly created objects
- if ( IsShownOnScreen() )
- Refresh() ;
+ if ( m_vScrollBar )
+ m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );
+ if ( m_hScrollBar )
+ m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );
}
-wxString wxWindowMac::GetLabel() const
+bool wxWindowMac::AcceptsFocus() const
{
- return m_label ;
+ return m_peer->CanFocus() && wxWindowBase::AcceptsFocus();
}
-bool wxWindowMac::Show(bool show)
+void wxWindowMac::MacSuperChangedPosition()
{
- if ( !wxWindowBase::Show(show) )
- return false;
+ // only window-absolute structures have to be moved i.e. controls
- if ( m_peer )
- m_peer->SetVisibility( show , true ) ;
+ m_cachedClippedRectValid = false ;
- return true;
+ wxWindowMac *child;
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ while ( node )
+ {
+ child = node->GetData();
+ child->MacSuperChangedPosition() ;
+
+ node = node->GetNext();
+ }
}
-void wxWindowMac::DoEnable(bool enable)
+void wxWindowMac::MacTopLevelWindowChangedPosition()
{
- m_peer->Enable( enable ) ;
-}
+ // only screen-absolute structures have to be moved i.e. glcanvas
-//
-// status change notifications
-//
+ wxWindowMac *child;
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+ while ( node )
+ {
+ child = node->GetData();
+ child->MacTopLevelWindowChangedPosition() ;
-void wxWindowMac::MacVisibilityChanged()
-{
+ node = node->GetNext();
+ }
}
-void wxWindowMac::MacHiliteChanged()
+long wxWindowMac::MacGetLeftBorderSize() const
{
-}
+ if ( IsTopLevel() )
+ return 0 ;
-void wxWindowMac::MacEnabledStateChanged()
-{
- OnEnabled( m_peer->IsEnabled() );
-}
+ SInt32 border = 0 ;
-//
-// status queries on the inherited window's state
-//
+ if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
+ {
+#if wxOSX_USE_COCOA_OR_CARBON
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
+ border += 1;
+#else
+ border += 2;
+#endif
+ }
+ else if (HasFlag(wxSIMPLE_BORDER))
+ {
+#if wxOSX_USE_COCOA_OR_CARBON
+ // this metric is only the 'outset' outside the simple frame rect
+ GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
+ border += 1;
+#else
+ border += 1;
+#endif
+ }
-bool wxWindowMac::MacIsReallyEnabled()
-{
- return m_peer->IsEnabled() ;
+ return border ;
}
-bool wxWindowMac::MacIsReallyHilited()
+long wxWindowMac::MacGetRightBorderSize() const
{
- return m_peer->IsActive();
+ // they are all symmetric in mac themes
+ return MacGetLeftBorderSize() ;
}
-void wxWindowMac::MacFlashInvalidAreas()
+long wxWindowMac::MacGetTopBorderSize() const
{
-#if TARGET_API_MAC_OSX
- HIViewFlashDirtyArea( (WindowRef) MacGetTopLevelWindowRef() ) ;
-#endif
+ // they are all symmetric in mac themes
+ return MacGetLeftBorderSize() ;
}
-int wxWindowMac::GetCharHeight() const
+long wxWindowMac::MacGetBottomBorderSize() const
{
- wxClientDC dc( (wxWindowMac*)this ) ;
-
- return dc.GetCharHeight() ;
+ // they are all symmetric in mac themes
+ return MacGetLeftBorderSize() ;
}
-int wxWindowMac::GetCharWidth() const
+long wxWindowMac::MacRemoveBordersFromStyle( long style )
{
- wxClientDC dc( (wxWindowMac*)this ) ;
-
- return dc.GetCharWidth() ;
+ return style & ~wxBORDER_MASK ;
}
-void wxWindowMac::GetTextExtent(const wxString& string, int *x, int *y,
- int *descent, int *externalLeading, const wxFont *theFont ) const
+// Find the wxWindowMac at the current mouse position, returning the mouse
+// position.
+wxWindow * wxFindWindowAtPointer( wxPoint& pt )
{
- const wxFont *fontToUse = theFont;
- wxFont tempFont;
- if ( !fontToUse )
- {
- tempFont = GetFont();
- fontToUse = &tempFont;
- }
+ pt = wxGetMousePosition();
+ wxWindowMac* found = wxFindWindowAtPoint(pt);
- wxClientDC dc( (wxWindowMac*) this ) ;
- wxCoord lx,ly,ld,le ;
- dc.GetTextExtent( string , &lx , &ly , &ld, &le, (wxFont *)fontToUse ) ;
- if ( externalLeading )
- *externalLeading = le ;
- if ( descent )
- *descent = ld ;
- if ( x )
- *x = lx ;
- if ( y )
- *y = ly ;
+ return (wxWindow*) found;
}
-/*
- * 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 WXUNUSED(eraseBack), const wxRect *rect)
+// Get the current mouse position.
+wxPoint wxGetMousePosition()
{
- if ( m_peer == NULL )
- return ;
+ int x, y;
- if ( !IsShownOnScreen() )
- return ;
+ wxGetMousePosition( &x, &y );
+
+ return wxPoint(x, y);
+}
- if ( rect )
+void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
+{
+ if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
{
- Rect r ;
+ // copied from wxGTK : CS
+ // VZ: shouldn't we move this to base class then?
- wxMacRectToNative( rect , &r ) ;
- m_peer->SetNeedsDisplay( &r ) ;
+ // 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()));
+ evtCtx.SetEventObject(this);
+ if ( ! HandleWindowEvent(evtCtx) )
+ event.Skip() ;
}
else
{
- m_peer->SetNeedsDisplay() ;
+ event.Skip() ;
}
}
-void wxWindowMac::DoFreeze()
-{
-#if TARGET_API_MAC_OSX
- if ( m_peer && m_peer->Ok() )
- m_peer->SetDrawingEnabled( false ) ;
-#endif
-}
-
-void wxWindowMac::DoThaw()
+void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )
{
-#if TARGET_API_MAC_OSX
- if ( m_peer && m_peer->Ok() )
+#if wxOSX_USE_COCOA_OR_CARBON
+ // for native controls: call their native paint method
+ if ( !MacIsUserPane() || ( IsTopLevel() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) )
{
- m_peer->SetDrawingEnabled( true ) ;
- m_peer->InvalidateWithChildren() ;
+ if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
+ && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
+ CallNextEventHandler(
+ (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
+ (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
}
#endif
}
-wxWindowMac *wxGetActiveWindow()
+void wxWindowMac::MacHandleControlClick(WXWidget WXUNUSED(control),
+ wxInt16 WXUNUSED(controlpart),
+ bool WXUNUSED(mouseStillDown))
{
- // actually this is a windows-only concept
- return NULL;
}
-// Coordinates relative to the window
-void wxWindowMac::WarpPointer(int WXUNUSED(x_pos), int WXUNUSED(y_pos))
+Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
{
- // We really don't move the mouse programmatically under Mac.
+ int x, y, w, h ;
+
+ window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
+ Rect bounds = { y, x, y + h, x + w };
+
+ return bounds ;
}
-void wxWindowMac::OnEraseBackground(wxEraseEvent& event)
+wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
{
- if ( MacGetTopLevelWindow() == NULL )
- return ;
-/*
-#if TARGET_API_MAC_OSX
- if ( !m_backgroundColour.Ok() || GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
- {
- }
- else
+#if wxOSX_USE_COCOA_OR_CARBON
+ return eventNotHandledErr ;
+#else
+ return 0;
#endif
-*/
- if ( GetBackgroundStyle() == wxBG_STYLE_COLOUR )
- {
- event.GetDC()->Clear() ;
- }
- else if ( GetBackgroundStyle() == wxBG_STYLE_CUSTOM )
- {
- // don't skip the event here, custom background means that the app
- // is drawing it itself in its OnPaint(), so don't draw it at all
- // now to avoid flicker
- }
- else
- {
- event.Skip() ;
- }
}
-void wxWindowMac::OnNcPaint( wxNcPaintEvent& event )
+bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
{
- event.Skip() ;
+ wxWindowMac *newParent = (wxWindowMac *)newParentBase;
+ if ( !wxWindowBase::Reparent(newParent) )
+ return false;
+
+ m_peer->RemoveFromParent();
+ m_peer->Embed( GetParent()->GetPeer() );
+ return true;
}
-int wxWindowMac::GetScrollPos(int orient) const
+bool wxWindowMac::SetTransparent(wxByte alpha)
{
- if ( orient == wxHORIZONTAL )
- {
- if ( m_hScrollBar )
- return m_hScrollBar->GetThumbPosition() ;
- }
- else
+ SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
+
+ if ( alpha != m_macAlpha )
{
- if ( m_vScrollBar )
- return m_vScrollBar->GetThumbPosition() ;
+ m_macAlpha = alpha ;
+ Refresh() ;
}
-
- return 0;
+ return true ;
}
-// This now returns the whole range, not just the number
-// of positions that we can scroll.
-int wxWindowMac::GetScrollRange(int orient) const
-{
- if ( orient == wxHORIZONTAL )
- {
- if ( m_hScrollBar )
- return m_hScrollBar->GetRange() ;
- }
- else
- {
- if ( m_vScrollBar )
- return m_vScrollBar->GetRange() ;
- }
- return 0;
+bool wxWindowMac::CanSetTransparent()
+{
+ return true ;
}
-int wxWindowMac::GetScrollThumb(int orient) const
+wxByte wxWindowMac::GetTransparent() const
{
- if ( orient == wxHORIZONTAL )
- {
- if ( m_hScrollBar )
- return m_hScrollBar->GetThumbSize() ;
- }
- else
- {
- if ( m_vScrollBar )
- return m_vScrollBar->GetThumbSize() ;
- }
-
- return 0;
+ return m_macAlpha ;
}
-void wxWindowMac::SetScrollPos(int orient, int pos, bool WXUNUSED(refresh))
+bool wxWindowMac::IsShownOnScreen() const
{
- if ( orient == wxHORIZONTAL )
- {
- if ( m_hScrollBar )
- m_hScrollBar->SetThumbPosition( pos ) ;
- }
- else
+ if ( m_peer && m_peer->IsOk() )
{
- if ( m_vScrollBar )
- m_vScrollBar->SetThumbPosition( pos ) ;
+ bool peerVis = m_peer->IsVisible();
+ bool wxVis = wxWindowBase::IsShownOnScreen();
+ if( peerVis != wxVis )
+ {
+ // CS : put a breakpoint here to investigate differences
+ // between native an wx visibilities
+ // the only place where I've encountered them until now
+ // are the hiding/showing sequences where the vis-changed event is
+ // first sent to the innermost control, while wx does things
+ // from the outmost control
+ wxVis = wxWindowBase::IsShownOnScreen();
+ return wxVis;
+ }
+
+ return m_peer->IsVisible();
}
+ return wxWindowBase::IsShownOnScreen();
}
-void
-wxWindowMac::AlwaysShowScrollbars(bool hflag, bool vflag)
-{
- bool needVisibilityUpdate = false;
+#if wxOSX_USE_CARBON
+//
+// impl
+//
- if ( m_hScrollBarAlwaysShown != hflag )
- {
- m_hScrollBarAlwaysShown = hflag;
- needVisibilityUpdate = true;
- }
- if ( m_vScrollBarAlwaysShown != vflag )
- {
- m_vScrollBarAlwaysShown = vflag;
- needVisibilityUpdate = true;
- }
+// ---------------------------------------------------------------------------
+// Carbon Events
+// ---------------------------------------------------------------------------
- if ( needVisibilityUpdate )
- DoUpdateScrollbarVisibility();
-}
+static const EventTypeSpec eventList[] =
+{
+ { kEventClassCommand, kEventProcessCommand } ,
+ { kEventClassCommand, kEventCommandUpdateStatus } ,
-//
-// we draw borders and grow boxes, are already set up and clipped in the current port / cgContextRef
-// our own window origin is at leftOrigin/rightOrigin
-//
+ { kEventClassControl , kEventControlGetClickActivation } ,
+ { kEventClassControl , kEventControlHit } ,
-void wxWindowMac::MacPaintGrowBox()
-{
- if ( IsTopLevel() )
- return ;
+ { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent } ,
+ { kEventClassTextInput, kEventTextInputUpdateActiveInputArea } ,
- if ( MacHasScrollBarCorner() )
- {
- Rect rect ;
+ { kEventClassControl , kEventControlDraw } ,
- CGContextRef cgContext = (CGContextRef) MacGetCGContextRef() ;
- wxASSERT( cgContext ) ;
+ { kEventClassControl , kEventControlVisibilityChanged } ,
+ { kEventClassControl , kEventControlEnabledStateChanged } ,
+ { kEventClassControl , kEventControlHiliteChanged } ,
- m_peer->GetRect( &rect ) ;
+ { kEventClassControl , kEventControlActivate } ,
+ { kEventClassControl , kEventControlDeactivate } ,
- int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
- CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
- CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
- CGContextSaveGState( cgContext );
+ { kEventClassControl , kEventControlSetFocusPart } ,
+ { kEventClassControl , kEventControlFocusPartChanged } ,
- if ( m_backgroundColour.Ok() )
- {
- CGContextSetFillColorWithColor( cgContext, m_backgroundColour.GetCGColor() );
- }
- else
- {
- CGContextSetRGBFillColor( cgContext, (CGFloat) 1.0, (CGFloat)1.0 ,(CGFloat) 1.0 , (CGFloat)1.0 );
- }
- CGContextFillRect( cgContext, cgrect );
- CGContextRestoreGState( cgContext );
- }
-}
+ { kEventClassService , kEventServiceGetTypes },
+ { kEventClassService , kEventServiceCopy },
+ { kEventClassService , kEventServicePaste },
-void wxWindowMac::MacPaintBorders( int WXUNUSED(leftOrigin) , int WXUNUSED(rightOrigin) )
+// { kEventClassControl , kEventControlInvalidateForSizeChange } , // 10.3 only
+// { kEventClassControl , kEventControlBoundsChanged } ,
+} ;
+
+static pascal OSStatus wxMacWindowControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
- if ( IsTopLevel() )
- return ;
+ OSStatus result = eventNotHandledErr ;
+ static wxWindowMac* targetFocusWindow = NULL;
+ static wxWindowMac* formerFocusWindow = NULL;
- Rect rect ;
- bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
+ wxMacCarbonEvent cEvent( event ) ;
- // back to the surrounding frame rectangle
- m_peer->GetRect( &rect ) ;
- InsetRect( &rect, -1 , -1 ) ;
+ ControlRef controlRef ;
+ wxWindowMac* thisWindow = (wxWindowMac*) data ;
+
+ cEvent.GetParameter( kEventParamDirectObject , &controlRef ) ;
+ switch ( GetEventKind( event ) )
{
- CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
- rect.bottom - rect.top ) ;
+ case kEventControlDraw :
+ {
+ RgnHandle updateRgn = NULL ;
+ RgnHandle allocatedRgn = NULL ;
+ wxRegion visRegion = thisWindow->MacGetVisibleRegion() ;
- HIThemeFrameDrawInfo info ;
- memset( &info, 0 , sizeof(info) ) ;
+ if ( cEvent.GetParameter<RgnHandle>(kEventParamRgnHandle, &updateRgn) != noErr )
+ {
+ HIShapeGetAsQDRgn( visRegion.GetWXHRGN(), updateRgn );
+ }
+ else
+ {
+ if ( thisWindow->MacGetLeftBorderSize() != 0 || thisWindow->MacGetTopBorderSize() != 0 )
+ {
+ // as this update region is in native window locals we must adapt it to wx window local
+ allocatedRgn = NewRgn() ;
+ CopyRgn( updateRgn , allocatedRgn ) ;
- info.version = 0 ;
- info.kind = 0 ;
- info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
- info.isFocused = hasFocus ;
+ // hide the given region by the new region that must be shifted
+ OffsetRgn( allocatedRgn , thisWindow->MacGetLeftBorderSize() , thisWindow->MacGetTopBorderSize() ) ;
+ updateRgn = allocatedRgn ;
+ }
+ }
- CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
- wxASSERT( cgContext ) ;
+#if wxMAC_DEBUG_REDRAW
+ if ( thisWindow->MacIsUserPane() )
+ {
+ static float color = 0.5 ;
+ static int channel = 0 ;
+ HIRect bounds;
+ CGContextRef cgContext = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef) ;
- if ( HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER) )
- {
- info.kind = kHIThemeFrameTextFieldSquare ;
- HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
- }
- else if ( HasFlag(wxSIMPLE_BORDER) )
- {
- info.kind = kHIThemeFrameListBox ;
- HIThemeDrawFrame( &cgrect , &info , cgContext , kHIThemeOrientationNormal ) ;
- }
- else if ( hasFocus )
- {
- HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
- }
-#if 0 // TODO REMOVE now done in a separate call earlier in drawing the window itself
- m_peer->GetRect( &rect ) ;
- if ( MacHasScrollBarCorner() )
- {
- int variant = (m_hScrollBar == NULL ? m_vScrollBar : m_hScrollBar ) ->GetWindowVariant();
- int size = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
- CGRect cgrect = CGRectMake( rect.right - size , rect.bottom - size , size , size ) ;
- CGPoint cgpoint = CGPointMake( rect.right - size , rect.bottom - size ) ;
- HIThemeGrowBoxDrawInfo info ;
- memset( &info, 0, sizeof(info) ) ;
- info.version = 0 ;
- info.state = IsEnabled() ? kThemeStateActive : kThemeStateInactive ;
- info.kind = kHIThemeGrowBoxKindNone ;
- // contrary to the docs ...SizeSmall does not work
- info.size = kHIThemeGrowBoxSizeNormal ;
- info.direction = 0 ;
- HIThemeDrawGrowBox( &cgpoint , &info , cgContext , kHIThemeOrientationNormal ) ;
- }
+ 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
- }
-}
-void wxWindowMac::RemoveChild( wxWindowBase *child )
-{
- if ( child == m_hScrollBar )
- m_hScrollBar = NULL ;
- if ( child == m_vScrollBar )
- m_vScrollBar = NULL ;
+ {
+ bool created = false ;
+ CGContextRef cgContext = NULL ;
+ OSStatus err = cEvent.GetParameter<CGContextRef>(kEventParamCGContextRef, &cgContext) ;
+ if ( err != noErr )
+ {
+ wxFAIL_MSG("Unable to retrieve CGContextRef");
+ }
- wxWindowBase::RemoveChild( child ) ;
-}
+ thisWindow->MacSetCGContextRef( cgContext ) ;
-void wxWindowMac::DoUpdateScrollbarVisibility()
-{
- bool triggerSizeEvent = false;
+ {
+ wxMacCGContextStateSaver sg( cgContext ) ;
+ CGFloat alpha = (CGFloat)1.0 ;
+ {
+ wxWindow* iter = thisWindow ;
+ while ( iter )
+ {
+ alpha *= (CGFloat)( iter->GetTransparent()/255.0 ) ;
+ if ( iter->IsTopLevel() )
+ iter = NULL ;
+ else
+ iter = iter->GetParent() ;
+ }
+ }
+ CGContextSetAlpha( cgContext , alpha ) ;
- if ( m_hScrollBar )
- {
- bool showHScrollBar = m_hScrollBarAlwaysShown || m_hScrollBar->IsNeeded();
+ if ( thisWindow->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
+ {
+ HIRect bounds;
+ HIViewGetBounds( controlRef, &bounds );
+ CGContextClearRect( cgContext, bounds );
+ }
- if ( m_hScrollBar->IsShown() != showHScrollBar )
- {
- m_hScrollBar->Show( showHScrollBar );
- triggerSizeEvent = true;
- }
- }
- if ( m_vScrollBar)
- {
- bool showVScrollBar = m_vScrollBarAlwaysShown || m_vScrollBar->IsNeeded();
- if ( m_vScrollBar->IsShown() != showVScrollBar )
- {
- m_vScrollBar->Show( showVScrollBar ) ;
- triggerSizeEvent = true;
- }
- }
+ if ( thisWindow->MacDoRedraw( updateRgn , cEvent.GetTicks() ) )
+ result = noErr ;
- MacRepositionScrollBars() ;
- if ( triggerSizeEvent )
- {
- wxSizeEvent event(GetSize(), m_windowId);
- event.SetEventObject(this);
- HandleWindowEvent(event);
- }
-}
+ thisWindow->MacSetCGContextRef( NULL ) ;
+ }
-// New function that will replace some of the above.
-void wxWindowMac::SetScrollbar(int orient, int pos, int thumb,
- int range, bool refresh)
-{
- if ( orient == wxHORIZONTAL && m_hScrollBar )
- m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
- else if ( orient == wxVERTICAL && m_vScrollBar )
- m_vScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
+ if ( created )
+ CGContextRelease( cgContext ) ;
+ }
- DoUpdateScrollbarVisibility();
-}
+ if ( allocatedRgn )
+ DisposeRgn( allocatedRgn ) ;
+ }
+ break ;
-// Does a physical scroll
-void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
-{
- if ( dx == 0 && dy == 0 )
- return ;
+ case kEventControlVisibilityChanged :
+ // we might have two native controls attributed to the same wxWindow instance
+ // eg a scrollview and an embedded textview, make sure we only fire for the 'outer'
+ // control, as otherwise native and wx visibility are different
+ if ( thisWindow->GetPeer() != NULL && thisWindow->GetPeer()->GetControlRef() == controlRef )
+ {
+ thisWindow->MacVisibilityChanged() ;
+ }
+ break ;
- int width , height ;
- GetClientSize( &width , &height ) ;
+ case kEventControlEnabledStateChanged :
+ thisWindow->MacEnabledStateChanged();
+ break ;
- {
- // note there currently is a bug in OSX which makes inefficient refreshes in case an entire control
- // area is scrolled, this does not occur if width and height are 2 pixels less,
- // TODO: write optimal workaround
- wxRect scrollrect( MacGetLeftBorderSize() , MacGetTopBorderSize() , width , height ) ;
- if ( rect )
- scrollrect.Intersect( *rect ) ;
+ case kEventControlHiliteChanged :
+ thisWindow->MacHiliteChanged() ;
+ break ;
- if ( m_peer->GetNeedsDisplay() )
- {
- // because HIViewScrollRect does not scroll the already invalidated area we have two options:
- // in case there is already a pending redraw on that area
- // either immediate redraw or full invalidate
+ case kEventControlActivate :
+ case kEventControlDeactivate :
+ // FIXME: we should have a virtual function for this!
+#if wxUSE_TREECTRL
+ if ( thisWindow->IsKindOf( CLASSINFO( wxTreeCtrl ) ) )
+ thisWindow->Refresh();
+#endif
+#if wxUSE_LISTCTRL
+ if ( thisWindow->IsKindOf( CLASSINFO( wxListCtrl ) ) )
+ thisWindow->Refresh();
+#endif
+ break ;
+
+ //
+ // focus handling
+ // different handling on OS X
+ //
+
+ case kEventControlFocusPartChanged :
+ // the event is emulated by wxmac for systems lower than 10.5
+ {
+ if ( UMAGetSystemVersion() < 0x1050 )
+ {
+ // as it is synthesized here, we have to manually avoid propagation
+ result = noErr;
+ }
+ ControlPartCode previousControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPreviousPart , typeControlPartCode );
+ ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlCurrentPart , typeControlPartCode );
+
+ if ( thisWindow->MacGetTopLevelWindow() && thisWindow->GetPeer()->NeedsFocusRect() )
+ {
+ thisWindow->MacInvalidateBorders();
+ }
+
+ if ( currentControlPart == 0 )
+ {
+ // kill focus
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnKillFocus();
+#endif
+
+ wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
+
+ // remove this as soon as posting the synthesized event works properly
+ static bool inKillFocusEvent = false ;
+
+ if ( !inKillFocusEvent )
+ {
+ inKillFocusEvent = true ;
+ wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ event.SetWindow(targetFocusWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ inKillFocusEvent = false ;
+ targetFocusWindow = NULL;
+ }
+ }
+ else if ( previousControlPart == 0 )
+ {
+ // set focus
+ // panel wants to track the window which was the last to have focus in it
+ wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+ wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+ thisWindow->HandleWindowEvent(eventFocus);
+
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnSetFocus();
+#endif
+
+ wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ event.SetWindow(formerFocusWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ formerFocusWindow = NULL;
+ }
+ }
+ break;
+ case kEventControlSetFocusPart :
+ {
+ Boolean focusEverything = false ;
+ if ( cEvent.GetParameter<Boolean>(kEventParamControlFocusEverything , &focusEverything ) == noErr )
+ {
+ // put a breakpoint here to catch focus everything events
+ }
+ ControlPartCode controlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+ if ( controlPart != kControlFocusNoPart )
+ {
+ targetFocusWindow = thisWindow;
+ wxLogTrace(_T("Focus"), _T("focus to be set(%p)"), wx_static_cast(void*, thisWindow));
+ }
+ else
+ {
+ formerFocusWindow = thisWindow;
+ wxLogTrace(_T("Focus"), _T("focus to be lost(%p)"), wx_static_cast(void*, thisWindow));
+ }
+
+ ControlPartCode previousControlPart = 0;
+ verify_noerr( HIViewGetFocusPart(controlRef, &previousControlPart));
+
+ if ( thisWindow->MacIsUserPane() )
+ {
+ if ( controlPart != kControlFocusNoPart )
+ cEvent.SetParameter<ControlPartCode>( kEventParamControlPart, typeControlPartCode, 1 ) ;
+ result = noErr ;
+ }
+ else
+ result = CallNextEventHandler(handler, event);
+
+ if ( UMAGetSystemVersion() < 0x1050 )
+ {
+// set back to 0 if problems arise
+#if 1
+ if ( result == noErr )
+ {
+ ControlPartCode currentControlPart = cEvent.GetParameter<ControlPartCode>(kEventParamControlPart , typeControlPartCode );
+ // synthesize the event focus changed event
+ EventRef evRef = NULL ;
+
+ OSStatus err = MacCreateEvent(
+ NULL , kEventClassControl , kEventControlFocusPartChanged , TicksToEventTime( TickCount() ) ,
+ kEventAttributeUserEvent , &evRef );
+ verify_noerr( err );
+
+ wxMacCarbonEvent iEvent( evRef ) ;
+ iEvent.SetParameter<ControlRef>( kEventParamDirectObject , controlRef );
+ iEvent.SetParameter<EventTargetRef>( kEventParamPostTarget, typeEventTargetRef, GetControlEventTarget( controlRef ) );
+ iEvent.SetParameter<ControlPartCode>( kEventParamControlPreviousPart, typeControlPartCode, previousControlPart );
+ iEvent.SetParameter<ControlPartCode>( kEventParamControlCurrentPart, typeControlPartCode, currentControlPart );
+
#if 1
- // is the better overall solution, as it does not slow down scrolling
- m_peer->SetNeedsDisplay() ;
+ // TODO test this first, avoid double posts etc...
+ PostEventToQueue( GetMainEventQueue(), evRef , kEventPriorityHigh );
#else
- // this would be the preferred version for fast drawing controls
- HIViewRender(m_peer->GetControlRef()) ;
+ wxMacWindowControlEventHandler( NULL , evRef , data ) ;
+#endif
+ ReleaseEvent( evRef ) ;
+ }
+#else
+ // old implementation, to be removed if the new one works
+ if ( controlPart == kControlFocusNoPart )
+ {
+#if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnKillFocus();
#endif
- }
- // as the native control might be not a 0/0 wx window coordinates, we have to offset
- scrollrect.Offset( -MacGetLeftBorderSize() , -MacGetTopBorderSize() ) ;
- m_peer->ScrollRect( &scrollrect , dx , dy ) ;
+ wxLogTrace(_T("Focus"), _T("focus lost(%p)"), wx_static_cast(void*, thisWindow));
-#if 0
- // this would be the preferred version for fast drawing controls
- HIViewRender(m_peer->GetControlRef()) ;
+ static bool inKillFocusEvent = false ;
+
+ if ( !inKillFocusEvent )
+ {
+ inKillFocusEvent = true ;
+ wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ inKillFocusEvent = false ;
+ }
+ }
+ else
+ {
+ // panel wants to track the window which was the last to have focus in it
+ wxLogTrace(_T("Focus"), _T("focus set(%p)"), wx_static_cast(void*, thisWindow));
+ wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
+ thisWindow->HandleWindowEvent(eventFocus);
+
+ #if wxUSE_CARET
+ if ( thisWindow->GetCaret() )
+ thisWindow->GetCaret()->OnSetFocus();
+ #endif
+
+ wxFocusEvent event(wxEVT_SET_FOCUS, thisWindow->GetId());
+ event.SetEventObject(thisWindow);
+ thisWindow->HandleWindowEvent(event) ;
+ }
#endif
+ }
+ }
+ break ;
+
+ case kEventControlHit :
+ result = thisWindow->MacControlHit( handler , event ) ;
+ break ;
+
+ case kEventControlGetClickActivation :
+ {
+ // fix to always have a proper activation for DataBrowser controls (stay in bkgnd otherwise)
+ WindowRef owner = cEvent.GetParameter<WindowRef>(kEventParamWindowRef);
+ if ( !IsWindowActive(owner) )
+ {
+ cEvent.SetParameter(kEventParamClickActivation,(UInt32) kActivateAndIgnoreClick) ;
+ result = noErr ;
+ }
+ }
+ break ;
+
+ default :
+ break ;
}
- wxWindowMac *child;
- int x, y, w, h;
- for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
+ return result ;
+}
+
+static pascal OSStatus
+wxMacWindowServiceEventHandler(EventHandlerCallRef WXUNUSED(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 ) )
{
- child = node->GetData();
- if (child == NULL)
- continue;
- if (child == m_vScrollBar)
- continue;
- if (child == m_hScrollBar)
- continue;
- if (child->IsTopLevel())
- continue;
+ case kEventServiceGetTypes :
+ if ( textCtrl )
+ {
+ long from, to ;
+ textCtrl->GetSelection( &from , &to ) ;
- child->GetPosition( &x, &y );
- child->GetSize( &w, &h );
- if (rect)
- {
- wxRect rc( x, y, w, h );
- if (rect->Intersects( rc ))
- child->SetSize( x + dx, y + dy, w, h, wxSIZE_AUTO|wxSIZE_ALLOW_MINUS_ONE );
- }
- else
- {
- child->SetSize( x + dx, y + dy, w, h, wxSIZE_AUTO|wxSIZE_ALLOW_MINUS_ONE );
- }
+ 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 ) ;
+ PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( kEventParamPasteboardRef, typePasteboardRef );
+ verify_noerr( PasteboardClear( pasteboard ) ) ;
+ PasteboardSynchronize( pasteboard );
+ // TODO add proper conversion
+ CFDataRef data = CFDataCreate( kCFAllocatorDefault, (const UInt8*)val.c_str(), val.length() );
+ PasteboardPutItemFlavor( pasteboard, (PasteboardItemID) 1, CFSTR("com.apple.traditional-mac-plain-text"), data, 0);
+ CFRelease( data );
+ result = noErr ;
+ }
+ break ;
+
+ case kEventServicePaste :
+ if ( textCtrl )
+ {
+ PasteboardRef pasteboard = cEvent.GetParameter<PasteboardRef>( kEventParamPasteboardRef, typePasteboardRef );
+ PasteboardSynchronize( pasteboard );
+ ItemCount itemCount;
+ verify_noerr( PasteboardGetItemCount( pasteboard, &itemCount ) );
+ for( UInt32 itemIndex = 1; itemIndex <= itemCount; itemIndex++ )
+ {
+ PasteboardItemID itemID;
+ if ( PasteboardGetItemIdentifier( pasteboard, itemIndex, &itemID ) == noErr )
+ {
+ CFDataRef flavorData = NULL;
+ if ( PasteboardCopyItemFlavorData( pasteboard, itemID, CFSTR("com.apple.traditional-mac-plain-text"), &flavorData ) == noErr )
+ {
+ CFIndex flavorDataSize = CFDataGetLength( flavorData );
+ char *content = new char[flavorDataSize+1] ;
+ memcpy( content, CFDataGetBytePtr( flavorData ), flavorDataSize );
+ content[flavorDataSize]=0;
+ CFRelease( flavorData );
+#if wxUSE_UNICODE
+ textCtrl->WriteText( wxString( content , wxConvLocal ) );
+#else
+ textCtrl->WriteText( wxString( content ) ) ;
+#endif
+
+ delete[] content ;
+ result = noErr ;
+ }
+ }
+ }
+ }
+ break ;
+
+ default:
+ break ;
}
+
+ return result ;
}
-void wxWindowMac::MacOnScroll( wxScrollEvent &event )
+pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
- if ( event.GetEventObject() == m_vScrollBar || event.GetEventObject() == m_hScrollBar )
+ OSStatus result = eventNotHandledErr ;
+ wxWindowMac* focus = (wxWindowMac*) data ;
+
+ wchar_t* uniChars = NULL ;
+ UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
+
+ UniChar* charBuf = NULL;
+ ByteCount dataSize = 0 ;
+ int numChars = 0 ;
+ UniChar buf[2] ;
+ if ( GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, 0 , &dataSize, NULL ) == noErr )
{
- wxScrollWinEvent wevent;
- wevent.SetPosition(event.GetPosition());
- wevent.SetOrientation(event.GetOrientation());
- wevent.SetEventObject(this);
+ numChars = dataSize / sizeof( UniChar) + 1;
+ charBuf = buf ;
- if (event.GetEventType() == wxEVT_SCROLL_TOP)
- wevent.SetEventType( wxEVT_SCROLLWIN_TOP );
- else if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
- wevent.SetEventType( wxEVT_SCROLLWIN_BOTTOM );
- else if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
- wevent.SetEventType( wxEVT_SCROLLWIN_LINEUP );
- else if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
- wevent.SetEventType( wxEVT_SCROLLWIN_LINEDOWN );
- else if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
- wevent.SetEventType( wxEVT_SCROLLWIN_PAGEUP );
- else if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
- wevent.SetEventType( wxEVT_SCROLLWIN_PAGEDOWN );
- else if (event.GetEventType() == wxEVT_SCROLL_THUMBTRACK)
- wevent.SetEventType( wxEVT_SCROLLWIN_THUMBTRACK );
- else if (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE)
- wevent.SetEventType( wxEVT_SCROLLWIN_THUMBRELEASE );
+ if ( (size_t) numChars * 2 > sizeof(buf) )
+ charBuf = new UniChar[ numChars ] ;
+ else
+ charBuf = buf ;
+
+ uniChars = new wchar_t[ numChars ] ;
+ GetEventParameter( event, kEventParamTextInputSendText, typeUnicodeText, NULL, dataSize , NULL , charBuf ) ;
+ charBuf[ numChars - 1 ] = 0;
+#if SIZEOF_WCHAR_T == 2
+ uniChars = (wchar_t*) charBuf ;
+/* memcpy( uniChars , charBuf , numChars * 2 ) ;*/ // is there any point in copying charBuf over itself? (in fact, memcpy isn't even guaranteed to work correctly if the source and destination ranges overlap...)
+#else
+ // the resulting string will never have more chars than the utf16 version, so this is safe
+ wxMBConvUTF16 converter ;
+ numChars = converter.MB2WC( uniChars , (const char*)charBuf , numChars ) ;
+#endif
+ }
+
+ switch ( GetEventKind( event ) )
+ {
+ case kEventTextInputUpdateActiveInputArea :
+ {
+ // An IME input event may return several characters, but we need to send one char at a time to
+ // EVT_CHAR
+ for (int pos=0 ; pos < numChars ; pos++)
+ {
+ WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
+ WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+
+ UInt32 message = uniChars[pos] < 128 ? (char)uniChars[pos] : '?';
+/*
+ NB: faking a charcode here is problematic. The kEventTextInputUpdateActiveInputArea event is sent
+ multiple times to update the active range during inline input, so this handler will often receive
+ uncommited text, which should usually not trigger side effects. It might be a good idea to check the
+ kEventParamTextInputSendFixLen parameter and verify if input is being confirmed (see CarbonEvents.h).
+ On the other hand, it can be useful for some applications to react to uncommitted text (for example,
+ to update a status display), as long as it does not disrupt the inline input session. Ideally, wx
+ should add new event types to support advanced text input. For now, I would keep things as they are.
+
+ However, the code that was being used caused additional problems:
+ UInt32 message = (0 << 8) + ((char)uniChars[pos] );
+ Since it simply truncated the unichar to the last byte, it ended up causing weird bugs with inline
+ input, such as switching to another field when one attempted to insert the character U+4E09 (the kanji
+ for "three"), because it was truncated to 09 (kTabCharCode), which was later "converted" to WXK_TAB
+ (still 09) in wxMacTranslateKey; or triggering the default button when one attempted to insert U+840D
+ (the kanji for "name"), which got truncated to 0D and interpreted as a carriage return keypress.
+ Note that even single-byte characters could have been misinterpreted, since MacRoman charcodes only
+ overlap with Unicode within the (7-bit) ASCII range.
+ But simply passing a NUL charcode would disable text updated events, because wxTextCtrl::OnChar checks
+ for codes within a specific range. Therefore I went for the solution seen above, which keeps ASCII
+ characters as they are and replaces the rest with '?', ensuring that update events are triggered.
+ It would be better to change wxTextCtrl::OnChar to look at the actual unicode character instead, but
+ I don't have time to look into that right now.
+ -- CL
+*/
+ if ( wxTheApp->MacSendCharEvent(
+ focus , message , 0 , when , 0 , 0 , uniChars[pos] ) )
+ {
+ result = noErr ;
+ }
+
+ wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
+ }
+ }
+ break ;
+ case kEventTextInputUnicodeForKeyEvent :
+ {
+ UInt32 keyCode, modifiers ;
+ Point point ;
+ EventRef rawEvent ;
+ unsigned char charCode ;
+
+ GetEventParameter( event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent ) ;
+ GetEventParameter( rawEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+ GetEventParameter( rawEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
+ GetEventParameter( rawEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
+ GetEventParameter( rawEvent, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &point );
+
+ UInt32 message = (keyCode << 8) + charCode;
- HandleWindowEvent(wevent);
+ // An IME input event may return several characters, but we need to send one char at a time to
+ // EVT_CHAR
+ for (int pos=0 ; pos < numChars ; pos++)
+ {
+ WXEVENTREF formerEvent = wxTheApp->MacGetCurrentEvent() ;
+ WXEVENTHANDLERCALLREF formerHandler = wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+
+ if ( wxTheApp->MacSendCharEvent(
+ focus , message , modifiers , when , point.h , point.v , uniChars[pos] ) )
+ {
+ result = noErr ;
+ }
+
+ wxTheApp->MacSetCurrentEvent( formerEvent , formerHandler ) ;
+ }
+ }
+ break;
+ default:
+ break ;
}
-}
-// Get the window with the focus
-wxWindowMac *wxWindowBase::DoFindFocus()
-{
- ControlRef control ;
- GetKeyboardFocus( GetUserFocusWindow() , &control ) ;
- return wxFindControlFromMacControl( control ) ;
-}
+ delete [] uniChars ;
+ if ( charBuf != buf )
+ delete [] charBuf ;
-void wxWindowMac::OnInternalIdle()
-{
- // This calls the UI-update mechanism (querying windows for
- // menu/toolbar/control state information)
- if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+ return result ;
}
-// Raise the window to the top of the Z order
-void wxWindowMac::Raise()
+static pascal OSStatus
+wxMacWindowCommandEventHandler(EventHandlerCallRef WXUNUSED(handler),
+ EventRef event,
+ void *data)
{
- m_peer->SetZOrder( true , NULL ) ;
-}
+ OSStatus result = eventNotHandledErr ;
+ wxWindowMac* focus = (wxWindowMac*) data ;
-// Lower the window to the bottom of the Z order
-void wxWindowMac::Lower()
-{
- m_peer->SetZOrder( false , NULL ) ;
-}
+ HICommand command ;
-// static wxWindow *gs_lastWhich = NULL;
+ wxMacCarbonEvent cEvent( event ) ;
+ cEvent.GetParameter<HICommand>(kEventParamDirectObject,typeHICommand,&command) ;
-bool wxWindowMac::MacSetupCursor( const wxPoint& pt )
-{
- // first trigger a set cursor event
+ wxMenuItem* item = NULL ;
+ wxMenu* itemMenu = wxFindMenuFromMacCommand( command , item ) ;
+ int id = wxMacCommandToId( command.commandID ) ;
- wxPoint clientorigin = GetClientAreaOrigin() ;
- wxSize clientsize = GetClientSize() ;
- wxCursor cursor ;
- if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
+ if ( item )
{
- wxSetCursorEvent event( pt.x , pt.y );
+ wxASSERT( itemMenu != NULL ) ;
- bool processedEvtSetCursor = HandleWindowEvent(event);
- if ( processedEvtSetCursor && event.HasCursor() )
- {
- cursor = event.GetCursor() ;
- }
- else
+ switch ( cEvent.GetKind() )
{
- // 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 ;
+ case kEventProcessCommand :
+ result = itemMenu->MacHandleCommandProcess( item, id, focus );
+ break ;
- if ( !wxIsBusy() && !GetParent() )
- cursor = *wxSTANDARD_CURSOR ;
- }
+ case kEventCommandUpdateStatus:
+ result = itemMenu->MacHandleCommandUpdateStatus( item, id, focus );
+ break ;
- if ( cursor.Ok() )
- cursor.MacInstall() ;
+ default :
+ break ;
+ }
}
-
- return cursor.Ok() ;
-}
-
-wxString wxWindowMac::MacGetToolTipString( wxPoint &WXUNUSED(pt) )
-{
-#if wxUSE_TOOLTIPS
- if ( m_tooltip )
- return m_tooltip->GetTip() ;
-#endif
-
- return wxEmptyString ;
+ return result ;
}
-void wxWindowMac::ClearBackground()
+pascal OSStatus wxMacWindowEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
- Refresh() ;
- Update() ;
-}
+ EventRef formerEvent = (EventRef) wxTheApp->MacGetCurrentEvent() ;
+ EventHandlerCallRef formerEventHandlerCallRef = (EventHandlerCallRef) wxTheApp->MacGetCurrentEventHandlerCallRef() ;
+ wxTheApp->MacSetCurrentEvent( event , handler ) ;
+ OSStatus result = eventNotHandledErr ;
-void wxWindowMac::Update()
-{
- wxNonOwnedWindow* top = MacGetTopLevelWindow();
- if (top)
- top->MacPerformUpdates() ;
-}
+ switch ( GetEventClass( event ) )
+ {
+ case kEventClassCommand :
+ result = wxMacWindowCommandEventHandler( handler , event , data ) ;
+ break ;
-wxNonOwnedWindow* wxWindowMac::MacGetTopLevelWindow() const
-{
- wxNonOwnedWindow* win = NULL ;
- WindowRef window = (WindowRef) MacGetTopLevelWindowRef() ;
- if ( window )
- win = wxFindWinFromMacWindow( window ) ;
+ case kEventClassControl :
+ result = wxMacWindowControlEventHandler( handler, event, data ) ;
+ break ;
- return win ;
-}
+ case kEventClassService :
+ result = wxMacWindowServiceEventHandler( handler, event , data ) ;
+ break ;
-const wxRect& wxWindowMac::MacGetClippedClientRect() const
-{
- MacUpdateClippedRects() ;
+ case kEventClassTextInput :
+ result = wxMacUnicodeTextEventHandler( handler , event , data ) ;
+ break ;
- return m_cachedClippedClientRect ;
-}
+ default :
+ break ;
+ }
-const wxRect& wxWindowMac::MacGetClippedRect() const
-{
- MacUpdateClippedRects() ;
+ wxTheApp->MacSetCurrentEvent( formerEvent, formerEventHandlerCallRef ) ;
- return m_cachedClippedRect ;
+ return result ;
}
-const wxRect&wxWindowMac:: MacGetClippedRectWithOuterStructure() const
-{
- MacUpdateClippedRects() ;
+DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacWindowEventHandler )
- return m_cachedClippedRectWithOuterStructure ;
-}
+// ---------------------------------------------------------------------------
+// Scrollbar Tracking for all
+// ---------------------------------------------------------------------------
-const wxRegion& wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode ) ;
+pascal void wxMacLiveScrollbarActionProc( ControlRef control , ControlPartCode partCode )
{
- static wxRegion emptyrgn ;
-
- if ( !m_isBeingDeleted && IsShownOnScreen() )
- {
- MacUpdateClippedRects() ;
- if ( includeOuterStructures )
- return m_cachedClippedRegionWithOuterStructure ;
- else
- return m_cachedClippedRegion ;
- }
- else
+ if ( partCode != 0)
{
- return emptyrgn ;
+ wxWindow* wx = wxFindWindowFromWXWidget( (WXWidget) control ) ;
+ if ( wx )
+ wx->MacHandleControlClick( (WXWidget) control , partCode , true /* stillDown */ ) ;
}
}
+wxMAC_DEFINE_PROC_GETTER( ControlActionUPP , wxMacLiveScrollbarActionProc ) ;
-void wxWindowMac::MacUpdateClippedRects() const
+wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, const wxPoint& pos, const wxSize& size,
+ long style, long extraStyle, const wxString& name)
{
- if ( m_cachedClippedRectValid )
- return ;
-
- // includeOuterStructures is true if we try to draw somthing like a focus ring etc.
- // also a window dc uses this, in this case we only clip in the hierarchy for hard
- // borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
- // to add focus borders everywhere
-
- Rect r, rIncludingOuterStructures ;
-
- m_peer->GetRect( &r ) ;
- r.left -= MacGetLeftBorderSize() ;
- r.top -= MacGetTopBorderSize() ;
- r.bottom += MacGetBottomBorderSize() ;
- r.right += MacGetRightBorderSize() ;
-
- r.right -= r.left ;
- r.bottom -= r.top ;
- r.left = 0 ;
- r.top = 0 ;
-
- rIncludingOuterStructures = r ;
- InsetRect( &rIncludingOuterStructures , -4 , -4 ) ;
-
- wxRect cl = GetClientRect() ;
- Rect rClient = { cl.y , cl.x , cl.y + cl.height , cl.x + cl.width } ;
-
- int x , y ;
- wxSize size ;
- const wxWindow* child = this ;
- const wxWindow* parent = NULL ;
-
- while ( !child->IsTopLevel() && ( parent = child->GetParent() ) != NULL )
- {
- if ( parent->MacIsChildOfClientArea(child) )
- {
- size = parent->GetClientSize() ;
- wxPoint origin = parent->GetClientAreaOrigin() ;
- x = origin.x ;
- y = origin.y ;
- }
- else
- {
- // this will be true for scrollbars, toolbars etc.
- size = parent->GetSize() ;
- y = parent->MacGetTopBorderSize() ;
- x = parent->MacGetLeftBorderSize() ;
- size.x -= parent->MacGetLeftBorderSize() + parent->MacGetRightBorderSize() ;
- size.y -= parent->MacGetTopBorderSize() + parent->MacGetBottomBorderSize() ;
- }
-
- parent->MacWindowToRootWindow( &x, &y ) ;
- MacRootWindowToWindow( &x , &y ) ;
-
- Rect rparent = { y , x , y + size.y , x + size.x } ;
-
- // the wxwindow and client rects will always be clipped
- SectRect( &r , &rparent , &r ) ;
- SectRect( &rClient , &rparent , &rClient ) ;
-
- // the structure only at 'hard' borders
- if ( parent->MacClipChildren() ||
- ( parent->GetParent() && parent->GetParent()->MacClipGrandChildren() ) )
- {
- SectRect( &rIncludingOuterStructures , &rparent , &rIncludingOuterStructures ) ;
- }
-
- child = parent ;
- }
+ OSStatus err = noErr;
+ Rect bounds = wxMacGetBoundsForControl( wxpeer , pos , size ) ;
+ wxMacControl* c = new wxMacControl(wxpeer) ;
+ UInt32 features = 0
+ | kControlSupportsEmbedding
+ | kControlSupportsLiveFeedback
+ | kControlGetsFocusOnClick
+// | kControlHasSpecialBackground
+// | kControlSupportsCalcBestRect
+ | kControlHandlesTracking
+ | kControlSupportsFocus
+ | kControlWantsActivate
+ | kControlWantsIdle ;
- m_cachedClippedRect = wxRect( r.left , r.top , r.right - r.left , r.bottom - r.top ) ;
- m_cachedClippedClientRect = wxRect( rClient.left , rClient.top ,
- rClient.right - rClient.left , rClient.bottom - rClient.top ) ;
- m_cachedClippedRectWithOuterStructure = wxRect(
- rIncludingOuterStructures.left , rIncludingOuterStructures.top ,
- rIncludingOuterStructures.right - rIncludingOuterStructures.left ,
- rIncludingOuterStructures.bottom - rIncludingOuterStructures.top ) ;
+ err =::CreateUserPaneControl( MAC_WXHWND(wxpeer->GetParent()->MacGetTopLevelWindowRef()) , &bounds, features , c->GetControlRefAddr() );
+ verify_noerr( err );
+ return c;
+}
- m_cachedClippedRegionWithOuterStructure = wxRegion( m_cachedClippedRectWithOuterStructure ) ;
- m_cachedClippedRegion = wxRegion( m_cachedClippedRect ) ;
- m_cachedClippedClientRegion = wxRegion( m_cachedClippedClientRect ) ;
- m_cachedClippedRectValid = true ;
+void wxMacControl::MacInstallEventHandler( ControlRef control, wxWindowMac* wxPeer )
+{
+ wxAssociateWindowWithWXWidget( (WXWidget) control , wxPeer ) ;
+ ::InstallControlEventHandler( control , GetwxMacWindowEventHandlerUPP(),
+ GetEventTypeCount(eventList), eventList, wxPeer, NULL);
}
-/*
- This function must not change the updatergn !
- */
-bool wxWindowMac::MacDoRedraw( void* updatergnr , long time )
+IMPLEMENT_DYNAMIC_CLASS( wxMacControl , wxWidgetImpl )
+
+wxMacControl::wxMacControl()
{
- bool handled = false ;
- Rect updatebounds ;
- RgnHandle updatergn = (RgnHandle) updatergnr ;
- GetRegionBounds( updatergn , &updatebounds ) ;
+ Init();
+}
- // wxLogDebug(wxT("update for %s bounds %d, %d, %d, %d"), wxString(GetClassInfo()->GetClassName()).c_str(), updatebounds.left, updatebounds.top , updatebounds.right , updatebounds.bottom ) ;
+wxMacControl::wxMacControl(wxWindowMac* peer , bool isRootControl ) :
+ wxWidgetImpl( peer, isRootControl )
+{
+ Init();
+}
- if ( !EmptyRgn(updatergn) )
- {
- RgnHandle newupdate = NewRgn() ;
- wxSize point = GetClientSize() ;
- wxPoint origin = GetClientAreaOrigin() ;
- SetRectRgn( newupdate , origin.x , origin.y , origin.x + point.x , origin.y + point.y ) ;
- SectRgn( newupdate , updatergn , newupdate ) ;
+wxMacControl::~wxMacControl()
+{
+}
- // first send an erase event to the entire update area
- {
- // for the toplevel window this really is the entire area
- // for all the others only their client area, otherwise they
- // might be drawing with full alpha and eg put blue into
- // the grow-box area of a scrolled window (scroll sample)
- wxDC* dc = new wxWindowDC(this);
- if ( IsTopLevel() )
- dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(updatergn)));
- else
- dc->SetClippingRegion(wxRegion(HIShapeCreateWithQDRgn(newupdate)));
+void wxMacControl::Init()
+{
+ m_controlRef = NULL;
+ m_macControlEventHandler = NULL;
+}
- wxEraseEvent eevent( GetId(), dc );
- eevent.SetEventObject( this );
- HandleWindowEvent( eevent );
- delete dc ;
- }
+void wxMacControl::Destroy()
+{
+ wxASSERT_MSG( m_controlRef != NULL , wxT("Control Handle already NULL, Dispose called twice ?") );
+ wxASSERT_MSG( IsValidControlHandle(m_controlRef) , wxT("Invalid Control Handle (maybe already released) in Dispose") );
- MacPaintGrowBox();
+ wxRemoveWXWidgetAssociation( m_wxPeer) ;
+ // we cannot check the ref count here anymore, as autorelease objects might delete their refs later
+ // we can have situations when being embedded, where the control gets deleted behind our back, so only
+ // CFRelease if we are safe
+ if ( IsValidControlHandle(m_controlRef) )
+ CFRelease(m_controlRef);
+ m_controlRef = NULL;
+}
- // calculate a client-origin version of the update rgn and set m_updateRegion to that
- OffsetRgn( newupdate , -origin.x , -origin.y ) ;
- m_updateRegion = wxRegion(HIShapeCreateWithQDRgn(newupdate)) ;
- DisposeRgn( newupdate ) ;
+void wxMacControl::SetReference( URefCon data )
+{
+ SetControlReference( m_controlRef , data );
+}
- if ( !m_updateRegion.Empty() )
- {
- // paint the window itself
+void wxMacControl::RemoveFromParent()
+{
+ // nothing to do here for carbon
+}
- wxPaintEvent event;
- event.SetTimestamp(time);
- event.SetEventObject(this);
- HandleWindowEvent(event);
- handled = true ;
- }
+void wxMacControl::Embed( wxWidgetImpl *parent )
+{
+ // copied from MacPostControlCreate
+ ControlRef container = (ControlRef) parent->GetWXWidget() ;
+ wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+ ::EmbedControl( m_controlRef , container ) ;
+}
- // now we cannot rely on having its borders drawn by a window itself, as it does not
- // get the updateRgn wide enough to always do so, so we do it from the parent
- // this would also be the place to draw any custom backgrounds for native controls
- // in Composited windowing
- wxPoint clientOrigin = GetClientAreaOrigin() ;
+void wxMacControl::SetNeedsDisplay( const wxRect* rect )
+{
+ if ( !IsVisible() )
+ return;
- wxWindowMac *child;
- int x, y, w, h;
- for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext())
- {
- child = node->GetData();
- if (child == NULL)
- continue;
- if (child == m_vScrollBar)
- continue;
- if (child == m_hScrollBar)
- continue;
- if (child->IsTopLevel())
- continue;
- if (!child->IsShown())
- continue;
+ if ( rect != NULL )
+ {
+ HIRect updatearea = CGRectMake( rect->x , rect->y , rect->width , rect->height);
+ HIViewSetNeedsDisplayInRect( m_controlRef, &updatearea, true );
+ }
+ else
+ HIViewSetNeedsDisplay( m_controlRef , true );
+}
- // only draw those in the update region (add a safety margin of 10 pixels for shadow effects
+void wxMacControl::Raise()
+{
+ verify_noerr( HIViewSetZOrder( m_controlRef, kHIViewZOrderAbove, NULL ) );
+}
+
+void wxMacControl::Lower()
+{
+ verify_noerr( HIViewSetZOrder( m_controlRef, kHIViewZOrderBelow, NULL ) );
+}
- child->GetPosition( &x, &y );
- child->GetSize( &w, &h );
- Rect childRect = { y , x , y + h , x + w } ;
- OffsetRect( &childRect , clientOrigin.x , clientOrigin.y ) ;
- InsetRect( &childRect , -10 , -10) ;
+void wxMacControl::GetContentArea(int &left , int &top , int &width , int &height) const
+{
+ RgnHandle rgn = NewRgn() ;
+ Rect content ;
+ if ( GetControlRegion( m_controlRef, kControlContentMetaPart , rgn ) == noErr )
+ GetRegionBounds( rgn , &content ) ;
+ else
+ GetControlBounds( m_controlRef , &content );
+ DisposeRgn( rgn ) ;
- if ( RectInRgn( &childRect , updatergn ) )
- {
- // paint custom borders
- wxNcPaintEvent eventNc( child->GetId() );
- eventNc.SetEventObject( child );
- if ( !child->HandleWindowEvent( eventNc ) )
- {
- child->MacPaintBorders(0, 0) ;
- }
- }
- }
- }
+ left = content.left;
+ top = content.top;
- return handled ;
+ width = content.right - content.left ;
+ height = content.bottom - content.top ;
+}
+
+void wxMacControl::Move(int x, int y, int width, int height)
+{
+ HIRect hir = CGRectMake(x,y,width,height);
+ HIViewSetFrame ( m_controlRef , &hir );
}
+void wxMacControl::GetPosition( int &x, int &y ) const
+{
+ Rect r;
+ GetControlBounds( m_controlRef , &r );
+ x = r.left;
+ y = r.top;
+}
-WXWindow wxWindowMac::MacGetTopLevelWindowRef() const
+void wxMacControl::GetSize( int &width, int &height ) const
{
- wxWindowMac *iter = (wxWindowMac*)this ;
+ Rect r;
+ GetControlBounds( m_controlRef , &r );
+ width = r.right - r.left;
+ height = r.bottom - r.top;
+}
- while ( iter )
+void wxMacControl::ScrollRect( const wxRect *rect, int dx, int dy )
+{
+ if (GetNeedsDisplay() )
{
- if ( iter->IsTopLevel() )
- {
- wxTopLevelWindow* toplevel = wxDynamicCast(iter,wxTopLevelWindow);
- if ( toplevel )
- return toplevel->MacGetWindowRef();
-#if wxUSE_POPUPWIN
- wxPopupWindow* popupwin = wxDynamicCast(iter,wxPopupWindow);
- if ( popupwin )
- return popupwin->MacGetWindowRef();
+ // because HIViewScrollRect does not scroll the already invalidated area we have two options:
+ // in case there is already a pending redraw on that area
+ // either immediate redraw or full invalidate
+#if 1
+ // is the better overall solution, as it does not slow down scrolling
+ SetNeedsDisplay() ;
+#else
+ // this would be the preferred version for fast drawing controls
+ HIViewRender(GetControlRef()) ;
#endif
- }
- iter = iter->GetParent() ;
}
- return NULL ;
+ // note there currently is a bug in OSX (10.3 +?) which makes inefficient refreshes in case an entire control
+ // area is scrolled, this does not occur if width and height are 2 pixels less,
+ // TODO: write optimal workaround
+
+ HIRect scrollarea = CGRectMake( rect->x , rect->y , rect->width , rect->height);
+ HIViewScrollRect ( m_controlRef , &scrollarea , dx ,dy );
+
+#if 0
+ // this would be the preferred version for fast drawing controls
+ HIViewRender(GetControlRef()) ;
+#endif
}
-bool wxWindowMac::MacHasScrollBarCorner() const
+bool wxMacControl::CanFocus() const
{
- /* Returns whether the scroll bars in a wxScrolledWindow should be
- * shortened. Scroll bars should be shortened if either:
- *
- * - both scroll bars are visible, or
- *
- * - there is a resize box in the parent frame's corner and this
- * window shares the bottom and right edge with the parent
- * frame.
- */
-
- if ( m_hScrollBar == NULL && m_vScrollBar == NULL )
- return false;
+ // TODO : evaluate performance hits by looking up this value, eventually cache the results for a 1 sec or so
+ // CAUTION : the value returned currently is 0 or 2, I've also found values of 1 having the same meaning,
+ // but the value range is nowhere documented
+ Boolean keyExistsAndHasValidFormat ;
+ CFIndex fullKeyboardAccess = CFPreferencesGetAppIntegerValue( CFSTR("AppleKeyboardUIMode" ) ,
+ kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat );
- if ( ( m_hScrollBar && m_hScrollBar->IsShown() )
- && ( m_vScrollBar && m_vScrollBar->IsShown() ) )
+ if ( keyExistsAndHasValidFormat && fullKeyboardAccess > 0 )
{
- // Both scroll bars visible
- return true;
+ return true ;
}
else
{
- wxPoint thisWindowBottomRight = GetScreenRect().GetBottomRight();
-
- for ( const wxWindow *win = this; win; win = win->GetParent() )
- {
- const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
- if ( frame )
- {
- if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER )
- {
- // Parent frame has resize handle
- wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
-
- // Note: allow for some wiggle room here as wxMac's
- // window rect calculations seem to be imprecise
- if ( abs( thisWindowBottomRight.x - frameBottomRight.x ) <= 2
- && abs( thisWindowBottomRight.y - frameBottomRight.y ) <= 2 )
- {
- // Parent frame has resize handle and shares
- // right bottom corner
- return true ;
- }
- else
- {
- // Parent frame has resize handle but doesn't
- // share right bottom corner
- return false ;
- }
- }
- else
- {
- // Parent frame doesn't have resize handle
- return false ;
- }
- }
- }
+ UInt32 features = 0 ;
+ GetControlFeatures( m_controlRef, &features ) ;
- // No parent frame found
- return false ;
+ return features & ( kControlSupportsFocus | kControlGetsFocusOnClick ) ;
}
}
-void wxWindowMac::MacCreateScrollBars( long style )
+bool wxMacControl::GetNeedsDisplay() const
{
- wxASSERT_MSG( m_vScrollBar == NULL && m_hScrollBar == NULL , wxT("attempt to create window twice") ) ;
-
- if ( style & ( wxVSCROLL | wxHSCROLL ) )
- {
- int scrlsize = MAC_SCROLLBAR_SIZE ;
- if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL || GetWindowVariant() == wxWINDOW_VARIANT_MINI )
- {
- scrlsize = MAC_SMALL_SCROLLBAR_SIZE ;
- }
-
- int adjust = MacHasScrollBarCorner() ? scrlsize - 1: 0 ;
- int width, height ;
- GetClientSize( &width , &height ) ;
+ return HIViewGetNeedsDisplay( m_controlRef );
+}
- wxPoint vPoint(width - scrlsize, 0) ;
- wxSize vSize(scrlsize, height - adjust) ;
- wxPoint hPoint(0, height - scrlsize) ;
- wxSize hSize(width - adjust, scrlsize) ;
+void wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
+{
+ HIPoint hiPoint;
- // we have to set the min size to a smaller value, otherwise they cannot get smaller (InitialSize sets MinSize)
- if ( style & wxVSCROLL )
- {
- m_vScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, vPoint, vSize , wxVERTICAL);
- m_vScrollBar->SetMinSize( wxDefaultSize );
- }
+ hiPoint.x = pt->x;
+ hiPoint.y = pt->y;
+ HIViewConvertPoint( &hiPoint , (ControlRef) from->GetWXWidget() , (ControlRef) to->GetWXWidget() );
+ pt->x = (int)hiPoint.x;
+ pt->y = (int)hiPoint.y;
+}
- if ( style & wxHSCROLL )
- {
- m_hScrollBar = new wxScrollBar((wxWindow*)this, wxID_ANY, hPoint, hSize , wxHORIZONTAL);
- m_hScrollBar->SetMinSize( wxDefaultSize );
- }
- }
+bool wxMacControl::SetFocus()
+{
+ // 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
- // because the create does not take into account the client area origin
- // we might have a real position shift
- MacRepositionScrollBars() ;
+ OSStatus err = SetKeyboardFocus( GetControlOwner( m_controlRef ), m_controlRef, kControlFocusNextPart );
+ if ( err == errCouldntSetFocus )
+ return false ;
+ SetUserFocusWindow(GetControlOwner( m_controlRef ) );
+
+ return true;
}
-bool wxWindowMac::MacIsChildOfClientArea( const wxWindow* child ) const
+bool wxMacControl::HasFocus() const
{
- bool result = ((child == NULL) || ((child != m_hScrollBar) && (child != m_vScrollBar)));
+ ControlRef control;
+ GetKeyboardFocus( GetUserFocusWindow() , &control );
+ return control == m_controlRef;
+}
- return result ;
+//
+// subclass specifics
+//
+
+OSStatus wxMacControl::GetData(ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const
+{
+ return ::GetControlData( m_controlRef , inPartCode , inTag , inBufferSize , inOutBuffer , outActualSize );
}
-void wxWindowMac::MacRepositionScrollBars()
+OSStatus wxMacControl::GetDataSize(ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const
{
- if ( !m_hScrollBar && !m_vScrollBar )
- return ;
+ return ::GetControlDataSize( m_controlRef , inPartCode , inTag , outActualSize );
+}
- int scrlsize = m_hScrollBar ? m_hScrollBar->GetSize().y : ( m_vScrollBar ? m_vScrollBar->GetSize().x : MAC_SCROLLBAR_SIZE ) ;
- int adjust = MacHasScrollBarCorner() ? scrlsize - 1 : 0 ;
+OSStatus wxMacControl::SetData(ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData)
+{
+ return ::SetControlData( m_controlRef , inPartCode , inTag , inSize , inData );
+}
- // get real client area
- int width, height ;
- GetSize( &width , &height );
+OSStatus wxMacControl::SendEvent( EventRef event , OptionBits inOptions )
+{
+ return SendEventToEventTargetWithOptions( event,
+ HIObjectGetEventTarget( (HIObjectRef) m_controlRef ), inOptions );
+}
- width -= MacGetLeftBorderSize() + MacGetRightBorderSize();
- height -= MacGetTopBorderSize() + MacGetBottomBorderSize();
+OSStatus wxMacControl::SendHICommand( HICommand &command , OptionBits inOptions )
+{
+ wxMacCarbonEvent event( kEventClassCommand , kEventCommandProcess );
- wxPoint vPoint( width - scrlsize, 0 ) ;
- wxSize vSize( scrlsize, height - adjust ) ;
- wxPoint hPoint( 0 , height - scrlsize ) ;
- wxSize hSize( width - adjust, scrlsize ) ;
+ event.SetParameter<HICommand>(kEventParamDirectObject,command);
-#if 0
- int x = 0, y = 0, w, h ;
- GetSize( &w , &h ) ;
+ return SendEvent( event , inOptions );
+}
- MacClientToRootWindow( &x , &y ) ;
- MacClientToRootWindow( &w , &h ) ;
+OSStatus wxMacControl::SendHICommand( UInt32 commandID , OptionBits inOptions )
+{
+ HICommand command;
- wxWindowMac *iter = (wxWindowMac*)this ;
+ memset( &command, 0 , sizeof(command) );
+ command.commandID = commandID;
+ return SendHICommand( command , inOptions );
+}
- int totW = 10000 , totH = 10000;
- while ( iter )
- {
- if ( iter->IsTopLevel() )
- {
- iter->GetSize( &totW , &totH ) ;
- break ;
- }
+void wxMacControl::Flash( ControlPartCode part , UInt32 ticks )
+{
+ unsigned long finalTicks;
- iter = iter->GetParent() ;
- }
+ HiliteControl( m_controlRef , part );
+ Delay( ticks , &finalTicks );
+ HiliteControl( m_controlRef , kControlNoPart );
+}
- if ( x == 0 )
- {
- hPoint.x = -1 ;
- hSize.x += 1 ;
- }
- if ( y == 0 )
- {
- vPoint.y = -1 ;
- vSize.y += 1 ;
- }
+SInt32 wxMacControl::GetValue() const
+{
+ return ::GetControl32BitValue( m_controlRef );
+}
- if ( w - x >= totW )
- {
- hSize.x += 1 ;
- vPoint.x += 1 ;
- }
- if ( h - y >= totH )
- {
- vSize.y += 1 ;
- hPoint.y += 1 ;
- }
-#endif
+SInt32 wxMacControl::GetMaximum() const
+{
+ return ::GetControl32BitMaximum( m_controlRef );
+}
- if ( m_vScrollBar )
- m_vScrollBar->SetSize( vPoint.x , vPoint.y, vSize.x, vSize.y , wxSIZE_ALLOW_MINUS_ONE );
- if ( m_hScrollBar )
- m_hScrollBar->SetSize( hPoint.x , hPoint.y, hSize.x, hSize.y, wxSIZE_ALLOW_MINUS_ONE );
+SInt32 wxMacControl::GetMinimum() const
+{
+ return ::GetControl32BitMinimum( m_controlRef );
}
-bool wxWindowMac::AcceptsFocus() const
+void wxMacControl::SetValue( SInt32 v )
{
- return MacCanFocus() && wxWindowBase::AcceptsFocus();
+ ::SetControl32BitValue( m_controlRef , v );
}
-void wxWindowMac::MacSuperChangedPosition()
+void wxMacControl::SetMinimum( SInt32 v )
{
- // only window-absolute structures have to be moved i.e. controls
+ ::SetControl32BitMinimum( m_controlRef , v );
+}
- m_cachedClippedRectValid = false ;
+void wxMacControl::SetMaximum( SInt32 v )
+{
+ ::SetControl32BitMaximum( m_controlRef , v );
+}
- wxWindowMac *child;
- wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while ( node )
- {
- child = node->GetData();
- child->MacSuperChangedPosition() ;
+void wxMacControl::SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum )
+{
+ ::SetControl32BitMinimum( m_controlRef , minimum );
+ ::SetControl32BitMaximum( m_controlRef , maximum );
+ ::SetControl32BitValue( m_controlRef , value );
+}
- node = node->GetNext();
- }
+void wxMacControl::VisibilityChanged(bool WXUNUSED(shown))
+{
}
-void wxWindowMac::MacTopLevelWindowChangedPosition()
+void wxMacControl::SuperChangedPosition()
{
- // only screen-absolute structures have to be moved i.e. glcanvas
+}
- wxWindowMac *child;
- wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- while ( node )
+void wxMacControl::SetFont( const wxFont & font , const wxColour& foreground , long windowStyle )
+{
+ m_font = font;
+#if wxMAC_USE_CORE_TEXT
+ if ( UMAGetSystemVersion() >= 0x1050 )
{
- child = node->GetData();
- child->MacTopLevelWindowChangedPosition() ;
+ HIViewPartCode part = 0;
+ HIThemeTextHorizontalFlush flush = kHIThemeTextHorizontalFlushDefault;
+ if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+ flush = kHIThemeTextHorizontalFlushCenter;
+ else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+ flush = kHIThemeTextHorizontalFlushRight;
+ HIViewSetTextFont( m_controlRef , part , (CTFontRef) font.MacGetCTFont() );
+ HIViewSetTextHorizontalFlush( m_controlRef, part, flush );
- node = node->GetNext();
+ if ( foreground != *wxBLACK )
+ {
+ ControlFontStyleRec fontStyle;
+ foreground.GetRGBColor( &fontStyle.foreColor );
+ fontStyle.flags = kControlUseForeColorMask;
+ ::SetControlFontStyle( m_controlRef , &fontStyle );
+ }
}
-}
+#endif
+#if wxMAC_USE_ATSU_TEXT
+ ControlFontStyleRec fontStyle;
+ if ( font.MacGetThemeFontID() != kThemeCurrentPortFont )
+ {
+ switch ( font.MacGetThemeFontID() )
+ {
+ case kThemeSmallSystemFont :
+ fontStyle.font = kControlFontSmallSystemFont;
+ break;
-long wxWindowMac::MacGetLeftBorderSize() const
-{
- if ( IsTopLevel() )
- return 0 ;
+ case 109 : // mini font
+ fontStyle.font = -5;
+ break;
- SInt32 border = 0 ;
+ case kThemeSystemFont :
+ fontStyle.font = kControlFontBigSystemFont;
+ break;
- if (HasFlag(wxRAISED_BORDER) || HasFlag( wxSUNKEN_BORDER) || HasFlag(wxDOUBLE_BORDER))
+ default :
+ fontStyle.font = kControlFontBigSystemFont;
+ break;
+ }
+
+ fontStyle.flags = kControlUseFontMask;
+ }
+ else
{
- // this metric is only the 'outset' outside the simple frame rect
- GetThemeMetric( kThemeMetricEditTextFrameOutset , &border ) ;
- border += 1 ;
+ fontStyle.font = font.MacGetFontNum();
+ fontStyle.style = font.MacGetFontStyle();
+ fontStyle.size = font.MacGetFontSize();
+ fontStyle.flags = kControlUseFontMask | kControlUseFaceMask | kControlUseSizeMask;
}
- else if (HasFlag(wxSIMPLE_BORDER))
+
+ fontStyle.just = teJustLeft;
+ fontStyle.flags |= kControlUseJustMask;
+ if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_CENTER_HORIZONTAL )
+ fontStyle.just = teJustCenter;
+ else if ( ( windowStyle & wxALIGN_MASK ) & wxALIGN_RIGHT )
+ fontStyle.just = teJustRight;
+
+
+ // we only should do this in case of a non-standard color, as otherwise 'disabled' controls
+ // won't get grayed out by the system anymore
+
+ if ( foreground != *wxBLACK )
{
- // this metric is only the 'outset' outside the simple frame rect
- GetThemeMetric( kThemeMetricListBoxFrameOutset , &border ) ;
- border += 1 ;
+ foreground.GetRGBColor( &fontStyle.foreColor );
+ fontStyle.flags |= kControlUseForeColorMask;
}
- return border ;
+ ::SetControlFontStyle( m_controlRef , &fontStyle );
+#endif
}
-long wxWindowMac::MacGetRightBorderSize() const
+void wxMacControl::SetBackgroundColour( const wxColour &WXUNUSED(col) )
{
- // they are all symmetric in mac themes
- return MacGetLeftBorderSize() ;
+// HITextViewSetBackgroundColor( m_textView , color );
}
-long wxWindowMac::MacGetTopBorderSize() const
+void wxMacControl::SetRange( SInt32 minimum , SInt32 maximum )
{
- // they are all symmetric in mac themes
- return MacGetLeftBorderSize() ;
+ ::SetControl32BitMinimum( m_controlRef , minimum );
+ ::SetControl32BitMaximum( m_controlRef , maximum );
}
-long wxWindowMac::MacGetBottomBorderSize() const
+short wxMacControl::HandleKey( SInt16 keyCode, SInt16 charCode, EventModifiers modifiers )
{
- // they are all symmetric in mac themes
- return MacGetLeftBorderSize() ;
+ return HandleControlKey( m_controlRef , keyCode , charCode , modifiers );
}
-long wxWindowMac::MacRemoveBordersFromStyle( long style )
+void wxMacControl::SetActionProc( ControlActionUPP actionProc )
{
- return style & ~wxBORDER_MASK ;
+ SetControlAction( m_controlRef , actionProc );
}
-// Find the wxWindowMac at the current mouse position, returning the mouse
-// position.
-wxWindowMac * wxFindWindowAtPointer( wxPoint& pt )
+void wxMacControl::SetViewSize( SInt32 viewSize )
{
- pt = wxGetMousePosition();
- wxWindowMac* found = wxFindWindowAtPoint(pt);
+ SetControlViewSize(m_controlRef , viewSize );
+}
- return found;
+SInt32 wxMacControl::GetViewSize() const
+{
+ return GetControlViewSize( m_controlRef );
}
-// Get the current mouse position.
-wxPoint wxGetMousePosition()
+bool wxMacControl::IsVisible() const
{
- int x, y;
+ return IsControlVisible( m_controlRef );
+}
- wxGetMousePosition( &x, &y );
+void wxMacControl::SetVisibility( bool visible )
+{
+ SetControlVisibility( m_controlRef , visible, true );
+}
- return wxPoint(x, y);
+bool wxMacControl::IsEnabled() const
+{
+ return IsControlEnabled( m_controlRef );
}
-void wxWindowMac::OnMouseEvent( wxMouseEvent &event )
+bool wxMacControl::IsActive() const
{
- if ( event.GetEventType() == wxEVT_RIGHT_DOWN )
- {
- // copied from wxGTK : CS
- // VZ: shouldn't we move this to base class then?
+ return IsControlActive( m_controlRef );
+}
- // 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()));
- evtCtx.SetEventObject(this);
- if ( ! HandleWindowEvent(evtCtx) )
- event.Skip() ;
- }
+void wxMacControl::Enable( bool enable )
+{
+ if ( enable )
+ EnableControl( m_controlRef );
else
- {
- event.Skip() ;
- }
+ DisableControl( m_controlRef );
}
-void wxWindowMac::OnPaint( wxPaintEvent & WXUNUSED(event) )
+void wxMacControl::SetDrawingEnabled( bool enable )
{
- // for native controls: call their native paint method
- if ( !MacIsUserPane() || ( IsTopLevel() && GetBackgroundStyle() == wxBG_STYLE_SYSTEM ) )
+ HIViewSetDrawingEnabled( m_controlRef , enable );
+}
+
+void wxMacControl::GetRectInWindowCoords( Rect *r )
+{
+ GetControlBounds( m_controlRef , r ) ;
+
+ WindowRef tlwref = GetControlOwner( m_controlRef ) ;
+
+ wxNonOwnedWindow* tlwwx = wxNonOwnedWindow::GetFromWXWindow( (WXWindow) tlwref ) ;
+ if ( tlwwx != NULL )
{
- if ( wxTheApp->MacGetCurrentEvent() != NULL && wxTheApp->MacGetCurrentEventHandlerCallRef() != NULL
- && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
- CallNextEventHandler(
- (EventHandlerCallRef)wxTheApp->MacGetCurrentEventHandlerCallRef() ,
- (EventRef) wxTheApp->MacGetCurrentEvent() ) ;
+ ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
+ HIPoint hiPoint = CGPointMake( 0 , 0 ) ;
+ HIViewConvertPoint( &hiPoint , HIViewGetSuperview(m_controlRef) , rootControl ) ;
+ OffsetRect( r , (short) hiPoint.x , (short) hiPoint.y ) ;
}
}
-void wxWindowMac::MacHandleControlClick(WXWidget WXUNUSED(control),
- wxInt16 WXUNUSED(controlpart),
- bool WXUNUSED(mouseStillDown))
+void wxMacControl::GetBestRect( Rect *r )
{
+ short baselineoffset;
+
+ GetBestControlRect( m_controlRef , r , &baselineoffset );
}
-Rect wxMacGetBoundsForControl( wxWindow* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
+void wxMacControl::SetLabel( const wxString &title )
{
- int x, y, w, h ;
+ wxFontEncoding encoding;
- window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
- Rect bounds = { y, x, y + h, x + w };
+ if ( m_font.Ok() )
+ encoding = m_font.GetEncoding();
+ else
+ encoding = wxFont::GetDefaultEncoding();
- return bounds ;
+ SetControlTitleWithCFString( m_controlRef , wxCFStringRef( title , encoding ) );
}
-wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF WXUNUSED(event) )
+void wxMacControl::GetFeatures( UInt32 * features )
{
- return eventNotHandledErr ;
+ GetControlFeatures( m_controlRef , features );
}
-bool wxWindowMac::Reparent(wxWindowBase *newParentBase)
+OSStatus wxMacControl::GetRegion( ControlPartCode partCode , RgnHandle region )
{
- wxWindowMac *newParent = (wxWindowMac *)newParentBase;
- if ( !wxWindowBase::Reparent(newParent) )
- return false;
+ OSStatus err = GetControlRegion( m_controlRef , partCode , region );
+ return err;
+}
- // copied from MacPostControlCreate
- ControlRef container = (ControlRef) GetParent()->GetHandle() ;
+// SetNeedsDisplay would not invalidate the children
+static void InvalidateControlAndChildren( HIViewRef control )
+{
+ HIViewSetNeedsDisplay( control , true );
+ UInt16 childrenCount = 0;
+ OSStatus err = CountSubControls( control , &childrenCount );
+ if ( err == errControlIsNotEmbedder )
+ return;
- wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
+ wxASSERT_MSG( err == noErr , wxT("Unexpected error when accessing subcontrols") );
- ::EmbedControl( m_peer->GetControlRef() , container ) ;
+ for ( UInt16 i = childrenCount; i >=1; --i )
+ {
+ HIViewRef child;
- return true;
+ err = GetIndexedSubControl( control , i , & child );
+ if ( err == errControlIsNotEmbedder )
+ return;
+
+ InvalidateControlAndChildren( child );
+ }
}
-bool wxWindowMac::SetTransparent(wxByte alpha)
+void wxMacControl::InvalidateWithChildren()
{
- SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
+ InvalidateControlAndChildren( m_controlRef );
+}
- if ( alpha != m_macAlpha )
+OSType wxMacCreator = 'WXMC';
+OSType wxMacControlProperty = 'MCCT';
+
+void wxMacControl::SetReferenceInNativeControl()
+{
+ void * data = this;
+ verify_noerr( SetControlProperty ( m_controlRef ,
+ wxMacCreator,wxMacControlProperty, sizeof(data), &data ) );
+}
+
+wxMacControl* wxMacControl::GetReferenceFromNativeControl(ControlRef control)
+{
+ wxMacControl* ctl = NULL;
+ ByteCount actualSize;
+ if ( GetControlProperty( control ,wxMacCreator,wxMacControlProperty, sizeof(ctl) ,
+ &actualSize , &ctl ) == noErr )
{
- m_macAlpha = alpha ;
- Refresh() ;
+ return ctl;
}
- return true ;
+ return NULL;
}
-bool wxWindowMac::CanSetTransparent()
-{
- return true ;
-}
+//
+// Tab Control
+//
-wxByte wxWindowMac::GetTransparent() const
+OSStatus wxMacControl::SetTabEnabled( SInt16 tabNo , bool enable )
{
- return m_macAlpha ;
+ return ::SetTabEnabled( m_controlRef , tabNo , enable );
}
-bool wxWindowMac::IsShownOnScreen() const
+
+
+// Control Factory
+
+wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
{
-#if TARGET_API_MAC_OSX
- if ( m_peer && m_peer->Ok() )
+ // There is a bug in 10.2.X for ::GetRootControl returning the window view instead of
+ // the content view, so we have to retrieve it explicitly
+
+ wxMacControl* contentview = new wxMacControl(now , true /*isRootControl*/);
+ HIViewFindByID( HIViewGetRoot( (WindowRef) now->GetWXWindow() ) , kHIViewWindowContentID ,
+ contentview->GetControlRefAddr() ) ;
+ if ( !contentview->IsOk() )
{
- bool peerVis = m_peer->IsVisible();
- bool wxVis = wxWindowBase::IsShownOnScreen();
- if( peerVis != wxVis )
- {
- // CS : put a breakpoint here to investigate differences
- // between native an wx visibilities
- // the only place where I've encountered them until now
- // are the hiding/showing sequences where the vis-changed event is
- // first sent to the innermost control, while wx does things
- // from the outmost control
- wxVis = wxWindowBase::IsShownOnScreen();
- return wxVis;
- }
-
- return m_peer->IsVisible();
+ // compatibility mode fallback
+ GetRootControl( (WindowRef) now->GetWXWindow() , contentview->GetControlRefAddr() ) ;
}
-#endif
- return wxWindowBase::IsShownOnScreen();
+ // the root control level handler
+ contentview->InstallEventHandler() ;
+ return contentview;
}
+
+#endif // wxOSX_USE_CARBON
projects / wxWidgets.git / commitdiff
