/////////////////////////////////////////////////////////////////////////////
-// Name: common/window.cpp
+// Name: src/common/window.cpp
// Purpose: common (to all ports) wxWindow functions
// Author: Julian Smart, Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "windowbase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/frame.h"
- #include "wx/defs.h"
#include "wx/window.h"
#include "wx/control.h"
#include "wx/checkbox.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/statusbr.h"
+ #include "wx/toolbar.h"
#include "wx/dcclient.h"
-#endif //WX_PRECOMP
-
-#if defined(__WXMAC__) && wxUSE_SCROLLBAR
#include "wx/scrolbar.h"
-#endif
-
-#if wxUSE_CONSTRAINTS
#include "wx/layout.h"
-#endif // wxUSE_CONSTRAINTS
-
-#include "wx/sizer.h"
+ #include "wx/sizer.h"
+#endif //WX_PRECOMP
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#include "wx/caret.h"
#endif // wxUSE_CARET
-#if wxUSE_DISPLAY
- #include "wx/display.h"
-#endif
-
#if wxUSE_SYSTEM_OPTIONS
#include "wx/sysopt.h"
#endif
+// For reporting compile- and runtime version of GTK+ in the ctrl+alt+mclick dialog.
+// The gtk includes don't pull any other headers in, at least not on my system - MR
+#ifdef __WXGTK__
+ #ifdef __WXGTK20__
+ #include <gtk/gtkversion.h>
+ #else
+ #include <gtk/gtkfeatures.h>
+ #endif
+ extern const unsigned int gtk_major_version;
+ extern const unsigned int gtk_minor_version;
+ extern const unsigned int gtk_micro_version;
+#endif
+
+#include "wx/platinfo.h"
+
+// Windows List
+WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows;
+
// ----------------------------------------------------------------------------
// static data
// ----------------------------------------------------------------------------
m_virtualSize = wxDefaultSize;
+ m_scrollHelper = (wxScrollHelper *) NULL;
+
m_minVirtualWidth =
m_maxVirtualWidth = wxDefaultCoord;
m_minVirtualHeight =
// VZ: this one shouldn't exist...
m_isBeingDeleted = false;
-
- // Reserved for future use
- m_windowReserved = NULL;
}
// common part of window creation process
wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
- // reset the dangling pointer our parent window may keep to us
+ // reset the top-level parent's default item if it is this widget
if ( m_parent )
{
- if ( m_parent->GetDefaultItem() == this )
- {
- m_parent->SetDefaultItem(NULL);
- }
+ wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent((wxWindow*)this),
+ wxTopLevelWindow);
+
+ if ( tlw && tlw->GetDefaultItem() == this )
+ tlw->SetDefaultItem(NULL);
+ if ( tlw && tlw->GetTmpDefaultItem() == this )
+ tlw->SetTmpDefaultItem(NULL);
+ }
+ // reset the dangling pointer our parent window may keep to us
+ if ( m_parent )
+ {
m_parent->RemoveChild(this);
}
// ----------------------------------------------------------------------------
// centre the window with respect to its parent in either (or both) directions
-void wxWindowBase::Centre(int direction)
+void wxWindowBase::DoCentre(int dir)
{
- // the position/size of the parent window or of the entire screen
- wxPoint posParent;
- int widthParent, heightParent;
-
- wxWindow *parent = NULL;
- wxTopLevelWindow *winTop = NULL;
-
- if ( !(direction & wxCENTRE_ON_SCREEN) )
- {
- // find the parent to centre this window on: it should be the
- // immediate parent for the controls but the top level parent for the
- // top level windows (like dialogs)
- parent = GetParent();
- if ( IsTopLevel() )
- {
- while ( parent && !parent->IsTopLevel() )
- {
- parent = parent->GetParent();
- }
- }
+ wxCHECK_RET( !(dir & wxCENTRE_ON_SCREEN) && GetParent(),
+ _T("this method only implements centering child windows") );
- // there is no wxTopLevelWindow under wxMotif yet
-#ifndef __WXMOTIF__
- // we shouldn't center the dialog on the iconized window: under
- // Windows, for example, this places it completely off the screen
- if ( parent )
- {
- winTop = wxDynamicCast(parent, wxTopLevelWindow);
- if ( winTop && winTop->IsIconized() )
- {
- winTop = NULL;
- parent = NULL;
- }
- }
-#endif // __WXMOTIF__
-
- // did we find the parent?
- if ( !parent )
- {
- // no other choice
- direction |= wxCENTRE_ON_SCREEN;
- }
- }
-
- if ( direction & wxCENTRE_ON_SCREEN )
- {
- //RN: If we are using wxDisplay we get
- //the dimensions of the monitor the window is on,
- //otherwise we get the dimensions of the primary monitor
- //FIXME: wxDisplay::GetFromWindow only implemented on MSW
-#if wxUSE_DISPLAY && defined(__WXMSW__)
- int nDisplay = wxDisplay::GetFromWindow((wxWindow*)this);
- if(nDisplay != wxNOT_FOUND)
- {
- wxDisplay windowDisplay(nDisplay);
- wxRect displayRect = windowDisplay.GetGeometry();
- widthParent = displayRect.width;
- heightParent = displayRect.height;
- }
- else
-#endif
- // centre with respect to the whole screen
- wxDisplaySize(&widthParent, &heightParent);
- }
- else
- {
- if ( IsTopLevel() )
- {
- if(winTop)
- winTop->GetRectForTopLevelChildren(&posParent.x, &posParent.y, &widthParent, &heightParent);
- else
- {
- // centre on the parent
- parent->GetSize(&widthParent, &heightParent);
-
- // adjust to the parents position
- posParent = parent->GetPosition();
- }
- }
- else
- {
- // centre inside the parents client rectangle
- parent->GetClientSize(&widthParent, &heightParent);
- }
- }
-
- int width, height;
- GetSize(&width, &height);
-
- int xNew = wxDefaultCoord,
- yNew = wxDefaultCoord;
-
- if ( direction & wxHORIZONTAL )
- xNew = (widthParent - width)/2;
-
- if ( direction & wxVERTICAL )
- yNew = (heightParent - height)/2;
-
- xNew += posParent.x;
- yNew += posParent.y;
-
- // FIXME: This needs to get the client display rect of the display
- // the window is (via wxDisplay::GetFromWindow).
-
- // Base size of the visible dimensions of the display
- // to take into account the taskbar. And the Mac menu bar at top.
- wxRect clientrect = wxGetClientDisplayRect();
-
- // NB: in wxMSW, negative position may not necessarily mean "out of screen",
- // but it may mean that the window is placed on other than the main
- // display. Therefore we only make sure centered window is on the main display
- // if the parent is at least partially present here.
- if (posParent.x + widthParent >= 0) // if parent is (partially) on the main display
- {
- if (xNew < clientrect.GetLeft())
- xNew = clientrect.GetLeft();
- else if (xNew + width > clientrect.GetRight())
- xNew = clientrect.GetRight() - width;
- }
- if (posParent.y + heightParent >= 0) // if parent is (partially) on the main display
- {
- if (yNew + height > clientrect.GetBottom())
- yNew = clientrect.GetBottom() - height;
-
- // Make certain that the title bar is initially visible
- // always, even if this would push the bottom of the
- // dialog off the visible area of the display
- if (yNew < clientrect.GetTop())
- yNew = clientrect.GetTop();
- }
-
- // move the window to this position (keeping the old size but using
- // SetSize() and not Move() to allow xNew and/or yNew to be wxDefaultCoord)
- SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE);
+ SetSize(GetRect().CentreIn(GetParent()->GetClientSize(), dir));
}
// fits the window around the children
void wxWindowBase::Fit()
{
- if ( GetChildren().GetCount() > 0 )
+ if ( !GetChildren().empty() )
{
SetSize(GetBestSize());
}
m_bestSizeCache = wxDefaultSize;
// parent's best size calculation may depend on its children's
- // best sizes, so let's invalidate it as well to be safe:
- if (m_parent)
+ // as long as child window we are in is not top level window itself
+ // (because the TLW size is never resized automatically)
+ // so let's invalidate it as well to be safe:
+ if (m_parent && !IsTopLevel())
m_parent->InvalidateBestSize();
}
if ( m_windowSizer )
{
- best = m_windowSizer->GetMinSize();
+ best = GetWindowSizeForVirtualSize(m_windowSizer->GetMinSize());
}
#if wxUSE_CONSTRAINTS
else if ( m_constraints )
#endif
)
{
- // our minimal acceptable size is such that all our visible child windows fit inside
+ // our minimal acceptable size is such that all our visible child
+ // windows fit inside
int maxX = 0,
maxY = 0;
node = node->GetNext() )
{
wxWindow *win = node->GetData();
- if ( win->IsTopLevel() || ( ! win->IsShown() )
+ if ( win->IsTopLevel()
+ || !win->IsShown()
#if wxUSE_STATUSBAR
- || wxDynamicCast(win, wxStatusBar)
+ || wxDynamicCast(win, wxStatusBar)
#endif // wxUSE_STATUSBAR
)
{
maxY = wy + wh;
}
- // for compatibility with the old versions and because it really looks
- // slightly more pretty like this, add a pad
- maxX += 7;
- maxY += 14;
-
best = wxSize(maxX, maxY);
}
else // ! has children
// then, when the containing window is shrunk back (because our initial
// best size had been used for computing the parent min size), we can't
// be shrunk back any more because our best size is now bigger
- if ( !GetMinSize().IsFullySpecified() )
- wxConstCast(this, wxWindowBase)->SetMinSize(GetSize());
+ wxSize size = GetMinSize();
+ if ( !size.IsFullySpecified() )
+ {
+ size.SetDefaults(GetSize());
+ wxConstCast(this, wxWindowBase)->SetMinSize(size);
+ }
// return as-is, unadjusted by the client size difference.
- return GetMinSize();
+ return size;
}
// Add any difference between size and client size
wxSize wxWindowBase::DoGetVirtualSize() const
{
- if ( m_virtualSize.IsFullySpecified() )
- return m_virtualSize;
-
+ // we should use the entire client area so if it is greater than our
+ // virtual size, expand it to fit (otherwise if the window is big enough we
+ // wouldn't be using parts of it)
wxSize size = GetClientSize();
- if ( m_virtualSize.x != wxDefaultCoord )
+ if ( m_virtualSize.x > size.x )
size.x = m_virtualSize.x;
- if ( m_virtualSize.y != wxDefaultCoord )
+ if ( m_virtualSize.y >= size.y )
size.y = m_virtualSize.y;
return size;
}
+void wxWindowBase::DoGetScreenPosition(int *x, int *y) const
+{
+ // screen position is the same as (0, 0) in client coords for non TLWs (and
+ // TLWs override this method)
+ if ( x )
+ *x = 0;
+ if ( y )
+ *y = 0;
+
+ ClientToScreen(x, y);
+}
+
// ----------------------------------------------------------------------------
// show/hide/enable/disable the window
// ----------------------------------------------------------------------------
return false;
}
}
+
+bool wxWindowBase::IsShownOnScreen() const
+{
+ return IsShown() &&
+ (GetParent() == NULL || GetParent()->IsShownOnScreen());
+}
+
// ----------------------------------------------------------------------------
// RTTI
// ----------------------------------------------------------------------------
return rectUpdate;
}
-bool wxWindowBase::IsExposed(int x, int y) const
+bool wxWindowBase::DoIsExposed(int x, int y) const
{
return m_updateRegion.Contains(x, y) != wxOutRegion;
}
-bool wxWindowBase::IsExposed(int x, int y, int w, int h) const
+bool wxWindowBase::DoIsExposed(int x, int y, int w, int h) const
{
return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
}
}
// get the help string associated with this window (may be empty)
-wxString wxWindowBase::GetHelpText() const
+// default implementation forwards calls to the help provider
+wxString
+wxWindowBase::GetHelpTextAtPoint(const wxPoint & WXUNUSED(pt),
+ wxHelpEvent::Origin WXUNUSED(origin)) const
{
wxString text;
wxHelpProvider *helpProvider = wxHelpProvider::Get();
wxHelpProvider *helpProvider = wxHelpProvider::Get();
if ( helpProvider )
{
- if ( helpProvider->ShowHelp(this) )
+ if ( helpProvider->ShowHelpAtPoint(this, event.GetPosition(), event.GetOrigin()) )
{
// skip the event.Skip() below
return;
void wxWindowBase::DoSetToolTip(wxToolTip *tooltip)
{
- if ( m_tooltip )
- delete m_tooltip;
+ if ( m_tooltip != tooltip )
+ {
+ if ( m_tooltip )
+ delete m_tooltip;
- m_tooltip = tooltip;
+ m_tooltip = tooltip;
+ }
}
#endif // wxUSE_TOOLTIPS
if ( sizer == m_windowSizer)
return;
- if ( deleteOld )
- delete m_windowSizer;
+ if ( m_windowSizer )
+ {
+ m_windowSizer->SetContainingWindow(NULL);
+
+ if ( deleteOld )
+ delete m_windowSizer;
+ }
m_windowSizer = sizer;
+ if ( m_windowSizer )
+ {
+ m_windowSizer->SetContainingWindow((wxWindow *)this);
+ }
- SetAutoLayout( sizer != NULL );
+ SetAutoLayout(m_windowSizer != NULL);
}
void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld)
// If there is a sizer, use it instead of the constraints
if ( GetSizer() )
{
- int w, h;
+ int w = 0, h = 0;
GetVirtualSize(&w, &h);
GetSizer()->SetDimension( 0, 0, w, h );
}
}
// do the window-specific processing after processing the update event
-// TODO: take specific knowledge out of this function and
-// put in each control's base class. Unfortunately we don't
-// yet have base implementation files for wxCheckBox and wxRadioButton.
void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
{
if ( event.GetSetEnabled() )
Enable(event.GetEnabled());
-#if wxUSE_CONTROLS
- if ( event.GetSetText() )
- {
- wxControl *control = wxDynamicCastThis(wxControl);
- if ( control )
- {
- if ( event.GetText() != control->GetLabel() )
- control->SetLabel(event.GetText());
- }
- }
-#endif // wxUSE_CONTROLS
-
- if ( event.GetSetChecked() )
- {
-#if wxUSE_CHECKBOX
- wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox);
- if ( checkbox )
- {
- checkbox->SetValue(event.GetChecked());
- }
-#endif // wxUSE_CHECKBOX
-
-#if wxUSE_RADIOBTN
- wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
- if ( radiobtn )
- {
- radiobtn->SetValue(event.GetChecked());
- }
-#endif // wxUSE_RADIOBTN
- }
+ if ( event.GetSetShown() )
+ Show(event.GetShown());
}
#if 0
UpdateWindowUI(wxUPDATE_UI_RECURSE);
}
-// process Ctrl-Alt-mclick
-void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
+// methods for drawing the sizers in a visible way
+#ifdef __WXDEBUG__
+
+static void DrawSizers(wxWindowBase *win);
+
+static void DrawBorder(wxWindowBase *win, const wxRect& rect, bool fill = false)
{
-#if wxUSE_MSGDLG
- if ( event.ControlDown() && event.AltDown() )
+ wxClientDC dc((wxWindow *)win);
+ dc.SetPen(*wxRED_PEN);
+ dc.SetBrush(fill ? wxBrush(*wxRED, wxCROSSDIAG_HATCH): *wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle(rect.Deflate(1, 1));
+}
+
+static void DrawSizer(wxWindowBase *win, wxSizer *sizer)
+{
+ const wxSizerItemList& items = sizer->GetChildren();
+ for ( wxSizerItemList::const_iterator i = items.begin(),
+ end = items.end();
+ i != end;
+ ++i )
{
- // don't translate these strings
- wxString port;
+ wxSizerItem *item = *i;
+ if ( item->IsSizer() )
+ {
+ DrawBorder(win, item->GetRect().Deflate(2));
+ DrawSizer(win, item->GetSizer());
+ }
+ else if ( item->IsSpacer() )
+ {
+ DrawBorder(win, item->GetRect().Deflate(2), true);
+ }
+ else if ( item->IsWindow() )
+ {
+ DrawSizers(item->GetWindow());
+ }
+ }
+}
-#ifdef __WXUNIVERSAL__
- port = _T("Univ/");
-#endif // __WXUNIVERSAL__
+static void DrawSizers(wxWindowBase *win)
+{
+ wxSizer *sizer = win->GetSizer();
+ if ( sizer )
+ {
+ DrawBorder(win, win->GetClientSize());
+ DrawSizer(win, sizer);
+ }
+ else // no sizer, still recurse into the children
+ {
+ const wxWindowList& children = win->GetChildren();
+ for ( wxWindowList::const_iterator i = children.begin(),
+ end = children.end();
+ i != end;
+ ++i )
+ {
+ DrawSizers(*i);
+ }
+ }
+}
+
+#endif // __WXDEBUG__
- switch ( wxGetOsVersion() )
+// process special middle clicks
+void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
+{
+ if ( event.ControlDown() && event.AltDown() )
+ {
+#ifdef __WXDEBUG__
+ // Ctrl-Alt-Shift-mclick makes the sizers visible in debug builds
+ if ( event.ShiftDown() )
{
- case wxMOTIF_X: port += _T("Motif"); break;
- case wxMAC:
- case wxMAC_DARWIN: port += _T("Mac"); break;
- case wxBEOS: port += _T("BeOS"); break;
- case wxGTK:
- case wxGTK_WIN32:
- case wxGTK_OS2:
- case wxGTK_BEOS: port += _T("GTK"); break;
- case wxWINDOWS:
- case wxPENWINDOWS:
- case wxWINDOWS_NT:
- case wxWIN32S:
- case wxWIN95:
- case wxWIN386: port += _T("MS Windows"); break;
- case wxMGL_UNIX:
- case wxMGL_X:
- case wxMGL_WIN32:
- case wxMGL_OS2: port += _T("MGL"); break;
- case wxWINDOWS_OS2:
- case wxOS2_PM: port += _T("OS/2"); break;
- default: port += _T("unknown"); break;
+ DrawSizers(this);
+ return;
}
+#endif // __WXDEBUG__
- wxMessageBox(wxString::Format(
- _T(
- " wxWidgets Library (%s port)\nVersion %u.%u.%u%s%s, compiled at %s %s\n Copyright (c) 1995-2005 wxWidgets team"
- ),
- port.c_str(),
- wxMAJOR_VERSION,
- wxMINOR_VERSION,
- wxRELEASE_NUMBER,
+#if wxUSE_MSGDLG
+ // don't translate these strings, they're for diagnostics purposes only
+ wxString msg;
+ msg.Printf(_T("wxWidgets Library (%s port)\n")
+ _T("Version %d.%d.%d%s%s, compiled at %s %s\n")
+ _T("Runtime version of toolkit used is %d.%d.%s\n")
+ _T("Copyright (c) 1995-2006 wxWidgets team"),
+ wxPlatformInfo::Get().GetPortIdName().c_str(),
+ wxMAJOR_VERSION,
+ wxMINOR_VERSION,
+ wxRELEASE_NUMBER,
#if wxUSE_UNICODE
- L" (Unicode)",
+ L" (Unicode)",
#else
- "",
+ wxEmptyString,
#endif
#ifdef __WXDEBUG__
- _T(" Debug build"),
+ _T(" Debug build"),
+#else
+ wxEmptyString,
+#endif
+ __TDATE__,
+ __TTIME__,
+ wxPlatformInfo::Get().GetToolkitMajorVersion(),
+ wxPlatformInfo::Get().GetToolkitMinorVersion(),
+#ifdef __WXGTK__
+ wxString::Format(_T("\nThe compile-time GTK+ version is %d.%d.%d."), GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION).c_str()
#else
- wxEmptyString,
+ wxEmptyString
#endif
- __TDATE__,
- __TTIME__
- ),
- _T("wxWidgets information"),
+ );
+
+ wxMessageBox(msg, _T("wxWidgets information"),
wxICON_INFORMATION | wxOK,
(wxWindow *)this);
}
#if wxUSE_STL
-#include <wx/listimpl.cpp>
-WX_DEFINE_LIST(wxWindowList);
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxWindowList)
#else
wxWindow *win;
wxWindowNext *next;
} *wxWindowBase::ms_winCaptureNext = NULL;
+wxWindow *wxWindowBase::ms_winCaptureCurrent = NULL;
+bool wxWindowBase::ms_winCaptureChanging = false;
void wxWindowBase::CaptureMouse()
{
- wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), this);
+ wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), wx_static_cast(void*, this));
+
+ wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive CaptureMouse call?") );
+
+ ms_winCaptureChanging = true;
wxWindow *winOld = GetCapture();
if ( winOld )
//else: no mouse capture to save
DoCaptureMouse();
+ ms_winCaptureCurrent = (wxWindow*)this;
+
+ ms_winCaptureChanging = false;
}
void wxWindowBase::ReleaseMouse()
{
- wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), this);
+ wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), wx_static_cast(void*, this));
+
+ wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive ReleaseMouse call?") );
wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") );
+ ms_winCaptureChanging = true;
+
DoReleaseMouse();
+ ms_winCaptureCurrent = NULL;
if ( ms_winCaptureNext )
{
((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
+ ms_winCaptureCurrent = ms_winCaptureNext->win;
wxWindowNext *item = ms_winCaptureNext;
ms_winCaptureNext = item->next;
}
//else: stack is empty, no previous capture
+ ms_winCaptureChanging = false;
+
wxLogTrace(_T("mousecapture"),
(const wxChar *) _T("After ReleaseMouse() mouse is captured by %p"),
- GetCapture());
+ wx_static_cast(void*, GetCapture()));
+}
+
+static void DoNotifyWindowAboutCaptureLost(wxWindow *win)
+{
+ wxMouseCaptureLostEvent event(win->GetId());
+ event.SetEventObject(win);
+ if ( !win->GetEventHandler()->ProcessEvent(event) )
+ {
+ wxFAIL_MSG( _T("window that captured the mouse didn't process wxEVT_MOUSE_CAPTURE_LOST") );
+ }
+}
+
+/* static */
+void wxWindowBase::NotifyCaptureLost()
+{
+ // don't do anything if capture lost was expected, i.e. resulted from
+ // a wx call to ReleaseMouse or CaptureMouse:
+ if ( ms_winCaptureChanging )
+ return;
+
+ // if the capture was lost unexpectedly, notify every window that has
+ // capture (on stack or current) about it and clear the stack:
+
+ if ( ms_winCaptureCurrent )
+ {
+ DoNotifyWindowAboutCaptureLost(ms_winCaptureCurrent);
+ ms_winCaptureCurrent = NULL;
+ }
+
+ while ( ms_winCaptureNext )
+ {
+ wxWindowNext *item = ms_winCaptureNext;
+ ms_winCaptureNext = item->next;
+
+ DoNotifyWindowAboutCaptureLost(item->win);
+
+ delete item;
+ }
}
#if wxUSE_HOTKEY
bool wxWindowBase::TryParent(wxEvent& event)
{
- // carry on up the parent-child hierarchy if the propgation count hasn't
+ // carry on up the parent-child hierarchy if the propagation count hasn't
// reached zero yet
if ( event.ShouldPropagate() )
{
if (!GetWindow())
return wxACC_FAIL;
- wxString ht(GetWindow()->GetHelpText());
+ wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
if (!ht.empty())
{
*description = ht;
if (!GetWindow())
return wxACC_FAIL;
- wxString ht(GetWindow()->GetHelpText());
+ wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
if (!ht.empty())
{
*helpText = ht;
return wxACC_NOT_IMPLEMENTED;
}
+#if wxUSE_VARIANT
// Gets a variant representing the selected children
// of this object.
// Acceptable values:
return wxACC_NOT_IMPLEMENTED;
}
+#endif // wxUSE_VARIANT
#endif // wxUSE_ACCESSIBILITY
+
+// ----------------------------------------------------------------------------
+// RTL support
+// ----------------------------------------------------------------------------
+
+wxCoord
+wxWindowBase::AdjustForLayoutDirection(wxCoord x,
+ wxCoord width,
+ wxCoord widthTotal) const
+{
+ if ( GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ x = widthTotal - x - width;
+ }
+
+ return x;
+}
+
projects / wxWidgets.git / blobdiff