// Author: Stefan Csomor
// Modified by:
// Created: 1998-01-01
-// RCS-ID: $Id: window.cpp 54981 2008-08-05 17:52:02Z SC $
+// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindowMac, wxWindowBase)
-#else
- IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
#endif
BEGIN_EVENT_TABLE(wxWindowMac, wxWindowBase)
// implementation
// ===========================================================================
+// the grow box has to be implemented as an inactive window, so that nothing can direct
+// the focus to it
+
+class WXDLLIMPEXP_CORE wxBlindPlateWindow : public wxWindow
+{
+public:
+ wxBlindPlateWindow() { Init(); }
+
+ // Old-style constructor (no default values for coordinates to avoid
+ // ambiguity with the new one)
+ wxBlindPlateWindow(wxWindow *parent,
+ int x, int y, int width, int height,
+ long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+ const wxString& name = wxPanelNameStr)
+ {
+ Init();
+
+ Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
+ }
+
+ // Constructor
+ wxBlindPlateWindow(wxWindow *parent,
+ wxWindowID winid = wxID_ANY,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+ const wxString& name = wxPanelNameStr)
+ {
+ Init();
+
+ Create(parent, winid, pos, size, style, name);
+ }
+
+ // Pseudo ctor
+ bool Create(wxWindow *parent,
+ wxWindowID winid = wxID_ANY,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTAB_TRAVERSAL | wxNO_BORDER,
+ const wxString& name = wxPanelNameStr)
+ {
+ if ( !wxWindow::Create(parent, winid, pos, size, style, name) )
+ return false;
+
+ // so that non-solid background renders correctly under GTK+:
+ SetThemeEnabled(true);
+ return true;
+ }
+
+ virtual ~wxBlindPlateWindow();
+
+ virtual bool AcceptsFocus() const
+ {
+ return false;
+ }
+
+protected:
+ // common part of all ctors
+ void Init()
+ {
+ }
+
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxBlindPlateWindow)
+ DECLARE_EVENT_TABLE()
+};
+
+wxBlindPlateWindow::~wxBlindPlateWindow()
+{
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxBlindPlateWindow, wxWindow)
+
+BEGIN_EVENT_TABLE(wxBlindPlateWindow, wxWindow)
+END_EVENT_TABLE()
+
+
// ----------------------------------------------------------------------------
// constructors and such
// ----------------------------------------------------------------------------
m_macIsUserPane = true;
m_clipChildren = false ;
m_cachedClippedRectValid = false ;
+ m_isNativeWindowWrapper = false;
}
wxWindowMac::~wxWindowMac()
// delete our drop target if we've got one
#if wxUSE_DRAG_AND_DROP
- if ( m_dropTarget != NULL )
- {
- delete m_dropTarget;
- m_dropTarget = NULL;
- }
+ wxDELETE(m_dropTarget);
#endif
delete m_peer ;
m_peer->SetData<ControlSize>(kControlEntireControl, kControlSizeTag, &size ) ;
#endif
- wxFont font ;
-
- wxOSXSystemFont systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
switch ( variant )
{
case wxWINDOW_VARIANT_NORMAL :
- systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
+ static wxFont sysNormal(wxOSX_SYSTEM_FONT_NORMAL);
+ SetFont(sysNormal) ;
break ;
case wxWINDOW_VARIANT_SMALL :
- systemFont = wxOSX_SYSTEM_FONT_SMALL ;
+ static wxFont sysSmall(wxOSX_SYSTEM_FONT_SMALL);
+ SetFont(sysSmall) ;
break ;
case wxWINDOW_VARIANT_MINI :
- systemFont = wxOSX_SYSTEM_FONT_MINI ;
+ static wxFont sysMini(wxOSX_SYSTEM_FONT_MINI);
+ SetFont(sysMini) ;
break ;
case wxWINDOW_VARIANT_LARGE :
- systemFont = wxOSX_SYSTEM_FONT_NORMAL ;
+ static wxFont sysLarge(wxOSX_SYSTEM_FONT_NORMAL);
+ SetFont(sysLarge) ;
break ;
default:
wxFAIL_MSG(wxT("unexpected window variant"));
break ;
}
-
- font.CreateSystemFont( systemFont ) ;
-
- SetFont( font ) ;
}
void wxWindowMac::MacUpdateControlFont()
return retval;
}
+bool wxWindowMac::SetBackgroundStyle(wxBackgroundStyle style)
+{
+ if ( !wxWindowBase::SetBackgroundStyle(style) )
+ return false;
+
+ if ( m_peer )
+ m_peer->SetBackgroundStyle(style);
+ return true;
+}
+
bool wxWindowMac::SetBackgroundColour(const wxColour& col )
{
+ if (m_growBox)
+ {
+ if ( m_backgroundColour.Ok() )
+ m_growBox->SetBackgroundColour(m_backgroundColour);
+ else
+ m_growBox->SetBackgroundColour(*wxWHITE);
+ }
+
if ( !wxWindowBase::SetBackgroundColour(col) && m_hasBgCol )
return false ;
bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
{
#ifndef __WXUNIVERSAL__
- menu->SetInvokingWindow((wxWindow*)this);
menu->UpdateUI();
if ( x == wxDefaultCoord && y == wxDefaultCoord )
ClientToScreen( &x , &y ) ;
}
menu->GetPeer()->PopUp(this, x, y);
- menu->SetInvokingWindow( NULL );
return true;
#else
// actually this shouldn't be called, because universal is having its own implementation
if ( m_tooltip )
m_tooltip->SetWindow(this);
+
+ if (m_peer)
+ m_peer->SetToolTip(tooltip);
}
#endif
}
}
+float wxWindowMac::GetContentScaleFactor() const
+{
+ return m_peer->GetContentScaleFactor();
+}
+
void wxWindowMac::SetLabel(const wxString& title)
{
if ( title == m_label )
if ( m_peer )
m_peer->SetVisibility( show ) ;
- wxShowEvent eventShow(GetId(), show);
- eventShow.SetEventObject(this);
-
- HandleWindowEvent(eventShow);
-
+#ifdef __WXOSX_IPHONE__
+ // only when there's no native event support
+ if ( !IsTopLevel() )
+#endif
+ {
+ wxShowEvent eventShow(GetId(), show);
+ eventShow.SetEventObject(this);
+
+ HandleWindowEvent(eventShow);
+ }
+
return true;
}
void wxWindowMac::DoEnable(bool enable)
{
m_peer->Enable( enable ) ;
+ MacInvalidateBorders();
}
//
if ( IsTopLevel() )
return ;
- bool hasFocus = m_peer->NeedsFocusRect() && m_peer->HasFocus() ;
+ bool hasFocus = m_peer->NeedsFocusRect() && HasFocus();
// back to the surrounding frame rectangle
int tx,ty,tw,th;
int range, bool refresh)
{
#if wxUSE_SCROLLBAR
+ // Updating scrollbars when window is being deleted is useless and
+ // currently results in asserts in client-to-screen coordinates conversion
+ // code which is used by DoUpdateScrollbarVisibility() so just skip it.
+ if ( m_isBeingDeleted )
+ return;
+
if ( orient == wxHORIZONTAL && m_hScrollBar )
m_hScrollBar->SetScrollbar(pos, thumb, range, thumb, refresh);
else if ( orient == wxVERTICAL && m_vScrollBar )
child = node->GetData();
if (child == NULL)
continue;
-#if wxUSE_SCROLLBAR
- if (child == m_vScrollBar)
- continue;
- if (child == m_hScrollBar)
- continue;
- if (child == m_growBox)
- continue;
-#endif
+
if (child->IsTopLevel())
continue;
+ if ( !IsClientAreaChild(child) )
+ continue;
+
child->GetPosition( &x, &y );
child->GetSize( &w, &h );
if (rect)
return wxFindWindowFromWXWidget(wxWidgetImpl::FindFocus());
}
-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);
-}
-
// Raise the window to the top of the Z order
void wxWindowMac::Raise()
{
wxFAIL_MSG( "unsupported background style" );
}
- MacPaintGrowBox();
+ // as this is a full window, shouldn't be necessary anymore
+ // MacPaintGrowBox();
// calculate a client-origin version of the update rgn and set
// m_updateRegion to that
wxPoint gPoint(width - scrlsize, height - scrlsize);
wxSize gSize(scrlsize, scrlsize);
- m_growBox = new wxPanel((wxWindow *)this, wxID_ANY, gPoint, gSize, 0);
+ m_growBox = new wxBlindPlateWindow((wxWindow *)this, wxID_ANY, gPoint, gSize, 0);
}
// because the create does not take into account the client area origin
}
}
-long wxWindowMac::MacGetLeftBorderSize() const
+long wxWindowMac::MacGetWXBorderSize() const
{
if ( IsTopLevel() )
return 0 ;
return border ;
}
+long wxWindowMac::MacGetLeftBorderSize() const
+{
+ // the wx borders are all symmetric in mac themes
+ long border = MacGetWXBorderSize() ;
+
+ if ( m_peer )
+ {
+ int left, top, right, bottom;
+ m_peer->GetLayoutInset( left, top, right, bottom );
+ border -= left;
+ }
+
+ return border;
+}
+
+
long wxWindowMac::MacGetRightBorderSize() const
{
- // they are all symmetric in mac themes
- return MacGetLeftBorderSize() ;
+ // the wx borders are all symmetric in mac themes
+ long border = MacGetWXBorderSize() ;
+
+ if ( m_peer )
+ {
+ int left, top, right, bottom;
+ m_peer->GetLayoutInset( left, top, right, bottom );
+ border -= right;
+ }
+
+ return border;
}
long wxWindowMac::MacGetTopBorderSize() const
{
- // they are all symmetric in mac themes
- return MacGetLeftBorderSize() ;
+ // the wx borders are all symmetric in mac themes
+ long border = MacGetWXBorderSize() ;
+
+ if ( m_peer )
+ {
+ int left, top, right, bottom;
+ m_peer->GetLayoutInset( left, top, right, bottom );
+ border -= top;
+ }
+
+ return border;
}
long wxWindowMac::MacGetBottomBorderSize() const
{
- // they are all symmetric in mac themes
- return MacGetLeftBorderSize() ;
+ // the wx borders are all symmetric in mac themes
+ long border = MacGetWXBorderSize() ;
+
+ if ( m_peer )
+ {
+ int left, top, right, bottom;
+ m_peer->GetLayoutInset( left, top, right, bottom );
+ border -= bottom;
+ }
+
+ return border;
}
long wxWindowMac::MacRemoveBordersFromStyle( long style )
bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
{
- bool handled = HandleWindowEvent( event ) ;
- if ( handled && event.GetSkipped() )
- handled = false ;
+ bool handled = false;
+
+ // moved the ordinary key event sending AFTER the accel evaluation
#if wxUSE_ACCEL
if ( !handled && event.GetEventType() == wxEVT_KEY_DOWN)
}
}
#endif // wxUSE_ACCEL
+
+ if ( !handled )
+ {
+ handled = HandleWindowEvent( event ) ;
+ if ( handled && event.GetSkipped() )
+ handled = false ;
+ }
return handled ;
}
Init();
m_isRootControl = isRootControl;
m_wxPeer = peer;
+ m_shouldSendEvents = true;
}
wxWidgetImpl::wxWidgetImpl()
projects / wxWidgets.git / blobdiff