::SendBehind( m_macWindow , NULL ) ;
}
+void wxNonOwnedWindowCarbonImpl::ShowWithoutActivating()
+{
+ bool plainTransition = true;
+
+#if wxUSE_SYSTEM_OPTIONS
+ if ( wxSystemOptions::HasOption(wxMAC_WINDOW_PLAIN_TRANSITION) )
+ plainTransition = ( wxSystemOptions::GetOptionInt( wxMAC_WINDOW_PLAIN_TRANSITION ) == 1 ) ;
+#endif
+
+ if ( plainTransition )
+ ::ShowWindow( (WindowRef)m_macWindow );
+ else
+ ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
+}
+
bool wxNonOwnedWindowCarbonImpl::Show(bool show)
{
bool plainTransition = true;
if (show)
{
-#if wxOSX_USE_CARBON
- if ( plainTransition )
- ::ShowWindow( (WindowRef)m_macWindow );
- else
- ::TransitionWindow( (WindowRef)m_macWindow, kWindowZoomTransitionEffect, kWindowShowTransitionAction, NULL );
-
+ ShowWithoutActivating();
::SelectWindow( (WindowRef)m_macWindow ) ;
-#endif
}
else
{
if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDocumentWindowBackground)) )
{
SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDocumentWindowBackground, false ) ;
- SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+ m_wxPeer->SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+ // call directly if object is not yet completely constructed
+ if ( m_wxPeer->GetNonOwnedPeer() == NULL )
+ SetBackgroundStyle(wxBG_STYLE_SYSTEM);
}
else if ( col == wxColour(wxMacCreateCGColorFromHITheme(kThemeBrushDialogBackgroundActive)) )
{
SetThemeWindowBackground( (WindowRef) m_macWindow, kThemeBrushDialogBackgroundActive, false ) ;
- SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+ m_wxPeer->SetBackgroundStyle(wxBG_STYLE_SYSTEM);
+ // call directly if object is not yet completely constructed
+ if ( m_wxPeer->GetNonOwnedPeer() == NULL )
+ SetBackgroundStyle(wxBG_STYLE_SYSTEM);
}
return true;
}
}
bool wxNonOwnedWindowCarbonImpl::SetBackgroundStyle(wxBackgroundStyle style)
-{
+{
if ( style == wxBG_STYLE_TRANSPARENT )
{
OSStatus err = HIWindowChangeFeatures( m_macWindow, 0, kWindowIsOpaque );
// for wx.
// TODO: Determine if we need this on Leopard as well. (should be harmless either way,
// though)
- // since when creating the peering is not yet completely set-up we call both setters
+ // since when creating the peering is not yet completely set-up we call both setters
// explicitely
m_wxPeer->SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
SetBackgroundColour( wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) ) ;
static pascal long wxShapedMacWindowDef(short varCode, WindowRef window, SInt16 message, SInt32 param);
+void SetupMouseEvent( wxMouseEvent &wxevent , wxMacCarbonEvent &cEvent );
// ---------------------------------------------------------------------------
// Carbon Events
break ;
}
break ;
-
- case kEventMouseWheelMoved :
+ // TODO http://developer.apple.com/qa/qa2005/qa1453.html
+ // add declaration for 10.4 and change to kEventMouseScroll
+ case kEventMouseWheelMoved :
{
wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
// instead of its children (wxToolBarTools)
ControlRef parent ;
GetSuperControl(control, &parent );
- wxWindow *wxParent = (wxWindow*) wxFindWindowFromWXWidget((WXWidget) parent ) ;
- if ( wxParent && wxParent->IsKindOf( CLASSINFO( wxToolBar ) ) )
- currentMouseWindow = wxParent ;
+ wxWindow *wxparent = (wxWindow*) wxFindWindowFromWXWidget((WXWidget) parent ) ;
+ if ( wxparent && wxparent->IsKindOf( CLASSINFO( wxToolBar ) ) )
+ currentMouseWindow = wxparent ;
#endif
}
#endif
::HiliteMenu(0);
result = noErr ;
}
- }
+ }
else if ( window && windowPart == inProxyIcon )
{
// special case proxy icon bar, as we are having a low-level runloop we must do it ourselves
}
else // currentMouseWindow == NULL
{
+ if (toplevelWindow && !control)
+ {
+ extern wxCursor gGlobalCursor;
+ if (!gGlobalCursor.IsOk())
+ {
+ // update cursor when over toolbar and titlebar etc.
+ wxSTANDARD_CURSOR->MacInstall() ;
+ }
+ }
+
// don't mess with controls we don't know about
// for some reason returning eventNotHandledErr does not lead to the correct behaviour
// so we try sending them the correct control directly
newRect.bottom - newRect.top + deltaheight ) ;
toplevelWindow->HandleResizing( cEvent.GetTicks(), &adjustR );
-
- const Rect adjustedRect = { adjustR.y + top , adjustR.x + left , adjustR.y + top + adjustR.height - deltaheight ,
+
+ const Rect adjustedRect = { adjustR.y + top , adjustR.x + left , adjustR.y + top + adjustR.height - deltaheight ,
adjustR.x + left + adjustR.width - deltawidth } ;
if ( !EqualRect( &newRect , &adjustedRect ) )
cEvent.SetParameter<Rect>( kEventParamCurrentBounds , &adjustedRect ) ;
// mix this in from window.cpp
pascal OSStatus wxMacUnicodeTextEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) ;
-pascal OSStatus wxNonOwnedEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus wxNonOwnedEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
{
OSStatus result = eventNotHandledErr ;
m_macEventHandler = NULL ;
}
- if ( m_macWindow )
+ if ( m_macWindow && !m_wxPeer->IsNativeWindowWrapper())
DisposeWindow( m_macWindow );
FullScreenData *data = (FullScreenData *) m_macFullScreenData ;
}
-void wxNonOwnedWindowCarbonImpl::Destroy()
-{
+void wxNonOwnedWindowCarbonImpl::WillBeDestroyed()
+{
if ( m_macEventHandler )
{
::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
m_macEventHandler = NULL ;
}
-
- wxPendingDelete.Append( new wxDeferredObjectDeleter( this ) ) ;
}
-void wxNonOwnedWindowInstallTopLevelWindowEventHandler(WindowRef window, EventHandlerRef* handler, void *ref)
+static void wxNonOwnedWindowInstallTopLevelWindowEventHandler(WindowRef window, EventHandlerRef* handler, void *ref)
{
InstallWindowEventHandler(window, GetwxNonOwnedEventHandlerUPP(),
GetEventTypeCount(eventList), eventList, ref, handler );
}
void wxNonOwnedWindowCarbonImpl::Create(
- wxWindow* parent,
- const wxPoint& pos,
- const wxSize& size,
- long style, long extraStyle,
- const wxString& name )
+ wxWindow* WXUNUSED(parent),
+ WXWindow nativeWindow )
+{
+ m_macWindow = nativeWindow;
+}
+
+void wxNonOwnedWindowCarbonImpl::Create(
+ wxWindow* parent,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style, long extraStyle,
+ const wxString& WXUNUSED(name) )
{
OSStatus err = noErr ;
customWindowDefSpec.defType = kWindowDefProcPtr;
customWindowDefSpec.u.defProc =
#ifdef __LP64__
- (WindowDefUPP) wxShapedMacWindowDef;
+ (WindowDefUPP) wxShapedMacWindowDef;
#else
- NewWindowDefUPP(wxShapedMacWindowDef);
+ NewWindowDefUPP(wxShapedMacWindowDef);
#endif
err = ::CreateCustomWindow( &customWindowDefSpec, wclass,
- attr, &theBoundsRect,
- (WindowRef*) &m_macWindow);
+ attr, &theBoundsRect,
+ (WindowRef*) &m_macWindow);
}
else
{
transition = kWindowZoomTransitionEffect;
break;
+ case wxSHOW_EFFECT_NONE:
+ // wxNonOwnedWindow is supposed to call Show() itself in this case
+ wxFAIL_MSG( "ShowWithEffect() shouldn't be called" );
+ return false;
+
case wxSHOW_EFFECT_MAX:
wxFAIL_MSG( "invalid effect flag" );
return false;
return true;
}
-void wxNonOwnedWindowCarbonImpl::SetTitle( const wxString& title, wxFontEncoding encoding )
+void wxNonOwnedWindowCarbonImpl::SetTitle( const wxString& title, wxFontEncoding encoding )
{
SetWindowTitleWithCFString( m_macWindow , wxCFStringRef( title , encoding ) ) ;
}
-
+
bool wxNonOwnedWindowCarbonImpl::IsMaximized() const
{
return IsWindowInStandardState( m_macWindow , NULL , NULL ) ;
}
-
+
bool wxNonOwnedWindowCarbonImpl::IsIconized() const
{
return IsWindowCollapsed((WindowRef)GetWXWindow() ) ;
}
-
+
void wxNonOwnedWindowCarbonImpl::Iconize( bool iconize )
{
if ( IsWindowCollapsable( m_macWindow ) )
CollapseWindow( m_macWindow , iconize ) ;
}
-
+
void wxNonOwnedWindowCarbonImpl::Maximize(bool maximize)
{
Point idealSize = { 0 , 0 } ;
}
ZoomWindowIdeal( (WindowRef)GetWXWindow() , maximize ? inZoomOut : inZoomIn , &idealSize ) ;
}
-
+
bool wxNonOwnedWindowCarbonImpl::IsFullScreen() const
{
return m_macFullScreenData != NULL ;
}
-
+
bool wxNonOwnedWindowCarbonImpl::ShowFullScreen(bool show, long style)
{
if ( show )
y -= top ;
h += top ;
// avoid adding the caption twice to the height
- outerheight -= top;
+ outerheight -= top;
}
if ( style & wxFULLSCREEN_NOBORDER )
HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
HIPointConvert( &p, kHICoordSpace72DPIGlobal, NULL, kHICoordSpaceView, contentView );
if ( x )
- *x = p.x;
+ *x = (int)p.x;
if ( y )
- *y = p.y;
+ *y = (int)p.y;
}
void wxNonOwnedWindowCarbonImpl::WindowToScreen( int *x, int *y )
HIViewFindByID( HIViewGetRoot( m_macWindow ), kHIViewWindowContentID , &contentView) ;
HIPointConvert( &p, kHICoordSpaceView, contentView, kHICoordSpace72DPIGlobal, NULL );
if ( x )
- *x = p.x;
+ *x = (int)p.x;
if ( y )
- *y = p.y;
+ *y = (int)p.y;
+}
+
+bool wxNonOwnedWindowCarbonImpl::IsActive()
+{
+ return ActiveNonFloatingWindow() == m_macWindow;
}
wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
now->Create( parent, pos, size, style , extraStyle, name );
return now;
}
+
+wxNonOwnedWindowImpl* wxNonOwnedWindowImpl::CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow nativeWindow )
+{
+ wxNonOwnedWindowCarbonImpl* now = new wxNonOwnedWindowCarbonImpl( wxpeer );
+ now->Create( parent, nativeWindow );
+ return now;
+}
+
projects / wxWidgets.git / blobdiff