#endif
#if wxUSE_DRAG_AND_DROP
-#include "wx/dnd.h"
+ #include "wx/dnd.h"
#endif
#include "wx/graphics.h"
#if wxOSX_USE_CARBON
-#include "wx/osx/uma.h"
+ #include "wx/osx/uma.h"
#else
-#include "wx/osx/private.h"
+ #include "wx/osx/private.h"
#endif
#define MAC_SCROLLBAR_SIZE 15
return m_peer == kOSXNoWidgetImpl ? NULL : m_peer ;
}
+bool wxWindowMac::ShouldCreatePeer() const
+{
+ return m_peer != kOSXNoWidgetImpl;
+}
+
void wxWindowMac::DontCreatePeer()
{
m_peer = kOSXNoWidgetImpl;
GetParent()->MacChildAdded() ;
// adjust font, controlsize etc
- DoSetWindowVariant( m_windowVariant ) ;
+ GetPeer()->SetControlSize( m_windowVariant );
+ InheritAttributes();
+ // in case nothing has been set, use the variant default fonts
+ if ( !m_hasFont )
+ DoSetWindowVariant( m_windowVariant );
GetPeer()->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics), GetFont().GetEncoding() ) ;
/*
* Right now we have the following setup :
* a border that is not part of the native control is always outside the
- * control's border (otherwise we loose all native intelligence, future ways
+ * control's border (otherwise we lose all native intelligence, future ways
* may be to have a second embedding control responsible for drawing borders
* and backgrounds eventually)
* so all this border calculations have to be taken into account when calling
return;
GetPeer()->SetControlSize( variant );
-#if wxOSX_USE_CARBON
- ControlSize size ;
-
- // we will get that from the settings later
- // and make this NORMAL later, but first
- // we have a few calculations that we must fix
-
- switch ( variant )
- {
- case wxWINDOW_VARIANT_NORMAL :
- size = kControlSizeNormal;
- break ;
-
- case wxWINDOW_VARIANT_SMALL :
- size = kControlSizeSmall;
- break ;
-
- case wxWINDOW_VARIANT_MINI :
- // not always defined in the headers
- size = 3 ;
- break ;
-
- case wxWINDOW_VARIANT_LARGE :
- size = kControlSizeLarge;
- break ;
-
- default:
- wxFAIL_MSG(wxT("unexpected window variant"));
- break ;
- }
- GetPeer()->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
-#endif
-
switch ( variant )
{
GetPeer()->SetFocus() ;
}
+void wxWindowMac::OSXSimulateFocusEvents()
+{
+ wxWindow* former = FindFocus() ;
+ if ( former != NULL && former != this )
+ {
+ {
+ wxFocusEvent event( wxEVT_KILL_FOCUS, former->GetId());
+ event.SetEventObject(former);
+ event.SetWindow(this);
+ former->HandleWindowEvent(event) ;
+ }
+
+ {
+ wxFocusEvent event(wxEVT_SET_FOCUS, former->GetId());
+ event.SetEventObject(former);
+ event.SetWindow(this);
+ former->HandleWindowEvent(event);
+ }
+ }
+}
+
void wxWindowMac::DoCaptureMouse()
{
wxApp::s_captureWindow = (wxWindow*) this ;
delete m_dropTarget;
m_dropTarget = pDropTarget;
- if ( m_dropTarget != NULL )
- {
- // TODO:
- }
+
+ GetPeer()->SetDropTarget(m_dropTarget) ;
}
#endif
if ( doResize )
{
MacRepositionScrollBars() ;
+ MacOnInternalSize();
wxSize size(actualWidth, actualHeight);
wxSizeEvent event(size, m_windowId);
event.SetEventObject(this);
if (sizeFlags & wxSIZE_FORCE_EVENT)
{
+ MacOnInternalSize();
wxSizeEvent event( wxSize(width,height), GetId() );
event.SetEventObject( this );
HandleWindowEvent( event );
bool wxWindowMac::Show(bool show)
{
+ if ( !show )
+ MacInvalidateBorders();
+
if ( !wxWindowBase::Show(show) )
return false;
if ( GetPeer() )
GetPeer()->SetVisibility( show ) ;
+ if ( show )
+ MacInvalidateBorders();
+
#ifdef __WXOSX_IPHONE__
// only when there's no native event support
if ( !IsTopLevel() )
void wxWindowMac::MacEnabledStateChanged()
{
- OnEnabled( GetPeer()->IsEnabled() );
}
//
if ( !IsShownOnScreen() )
return ;
+
+ if ( IsFrozen() )
+ return;
GetPeer()->SetNeedsDisplay( rect ) ;
}
void wxWindowMac::DoFreeze()
{
-#if wxOSX_USE_CARBON
if ( GetPeer() && GetPeer()->IsOk() )
GetPeer()->SetDrawingEnabled( false ) ;
-#endif
}
void wxWindowMac::DoThaw()
{
-#if wxOSX_USE_CARBON
if ( GetPeer() && GetPeer()->IsOk() )
- {
GetPeer()->SetDrawingEnabled( true ) ;
- GetPeer()->InvalidateWithChildren() ;
- }
-#endif
}
wxWindow *wxGetActiveWindow()
GetPeer()->GetSize( tw, th );
GetPeer()->GetPosition( tx, ty );
- Rect rect = { ty,tx, ty+th, tx+tw };
-
#if wxOSX_USE_COCOA_OR_CARBON
- InsetRect( &rect, -1 , -1 ) ;
-
{
- CGRect cgrect = CGRectMake( rect.left , rect.top , rect.right - rect.left ,
- rect.bottom - rect.top ) ;
+ CGRect cgrect = CGRectMake( tx-1 , ty-1 , tw+2 ,
+ th+2 ) ;
CGContextRef cgContext = (CGContextRef) GetParent()->MacGetCGContextRef() ;
wxASSERT( cgContext ) ;
MacRepositionScrollBars() ;
if ( triggerSizeEvent )
{
+ MacOnInternalSize();
wxSizeEvent event(GetSize(), m_windowId);
event.SetEventObject(this);
HandleWindowEvent(event);
if ( wxRect2DInt( clientorigin.x , clientorigin.y , clientsize.x , clientsize.y ).Contains( wxPoint2DInt( pt ) ) )
{
wxSetCursorEvent event( pt.x , pt.y );
+ event.SetId(GetId());
+ event.SetEventObject(this);
bool processedEvtSetCursor = HandleWindowEvent(event);
if ( processedEvtSetCursor && event.HasCursor() )
}
m_updateRegion = formerUpdateRgn;
+
+ wxNonOwnedWindow* top = MacGetTopLevelWindow();
+ if (top)
+ top->WindowWasPainted() ;
+
return handled;
}
const wxFrame *frame = wxDynamicCast( win, wxFrame ) ;
if ( frame )
{
- if ( frame->GetWindowStyleFlag() & wxRESIZE_BORDER )
+ // starting from 10.7 there are no resize indicators anymore
+ if ( (frame->GetWindowStyleFlag() & wxRESIZE_BORDER) && UMAGetSystemVersion() < 0x1070)
{
// Parent frame has resize handle
wxPoint frameBottomRight = frame->GetScreenRect().GetBottomRight();
int x, y, w, h ;
window->MacGetBoundsForControl( pos , size , x , y, w, h , adjustForOrigin ) ;
- Rect bounds = { y, x, y + h, x + w };
+ Rect bounds = { static_cast<short>(y), static_cast<short>(x), static_cast<short>(y + h), static_cast<short>(x + w) };
return bounds ;
}
#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
-OSStatus wxHotKeyHandler(EventHandlerCallRef nextHandler,EventRef event, void *userData)
+OSStatus
+wxHotKeyHandler(EventHandlerCallRef WXUNUSED(nextHandler),
+ EventRef event,
+ void* WXUNUSED(userData))
{
EventHotKeyID hotKeyId;
GetEventParameter( event, kEventParamDirectObject, typeEventHotKeyID, NULL, sizeof(hotKeyId), NULL, &hotKeyId);
- for ( int i = 0; i < s_hotkeys.size(); ++i )
+ for ( unsigned i = 0; i < s_hotkeys.size(); ++i )
{
- if ( s_hotkeys[i].keyId == hotKeyId.id )
+ if ( s_hotkeys[i].keyId == static_cast<int>(hotKeyId.id) )
{
unsigned char charCode ;
UInt32 keyCode ;
UInt32 modifiers ;
- Point where ;
UInt32 when = EventTimeToTicks( GetEventTime( event ) ) ;
- GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &charCode );
+ GetEventParameter( event, kEventParamKeyMacCharCodes, typeChar, NULL, 1, NULL, &charCode );
GetEventParameter( event, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &keyCode );
GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers );
- GetEventParameter( event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &where );
UInt32 keymessage = (keyCode << 8) + charCode;
wxKeyEvent wxevent(wxEVT_HOTKEY);
wxevent.SetId(hotKeyId.id);
wxTheApp->MacCreateKeyEvent( wxevent, s_hotkeys[i].window , keymessage ,
- modifiers , when , where.h , where.v , 0 ) ;
+ modifiers , when , 0 ) ;
s_hotkeys[i].window->HandleWindowEvent(wxevent);
}
bool wxWindowMac::RegisterHotKey(int hotkeyId, int modifiers, int keycode)
{
- for ( int i = 0; i < s_hotkeys.size(); ++i )
+ for ( unsigned i = 0; i < s_hotkeys.size(); ++i )
{
if ( s_hotkeys[i].keyId == hotkeyId )
{
mac_modifiers |= optionKey;
if ( modifiers & wxMOD_SHIFT )
mac_modifiers |= shiftKey;
- if ( modifiers & wxMOD_CONTROL )
+ if ( modifiers & wxMOD_RAW_CONTROL )
mac_modifiers |= controlKey;
- if ( modifiers & wxMOD_META )
+ if ( modifiers & wxMOD_CONTROL )
mac_modifiers |= cmdKey;
EventHotKeyRef hotKeyRef;
bool wxWindowMac::UnregisterHotKey(int hotkeyId)
{
- for ( int i = s_hotkeys.size()-1; i>=0; -- i )
+ for ( int i = ((int)s_hotkeys.size())-1; i>=0; -- i )
{
if ( s_hotkeys[i].keyId == hotkeyId )
{
{
wxEvtHandler * const handler = ancestor->GetEventHandler();
- wxCommandEvent command_event( wxEVT_COMMAND_MENU_SELECTED, command );
+ wxCommandEvent command_event( wxEVT_MENU, command );
handled = handler->ProcessEvent( command_event );
if ( !handled )
{
// accelerators can also be used with buttons, try them too
- command_event.SetEventType(wxEVT_COMMAND_BUTTON_CLICKED);
+ command_event.SetEventType(wxEVT_BUTTON);
handled = handler->ProcessEvent( command_event );
}
{
return m_needsFrame;
}
+
+void wxWidgetImpl::SetDrawingEnabled(bool WXUNUSED(enabled))
+{
+}
projects / wxWidgets.git / blobdiff