#include "wx/caret.h"
#endif // wxUSE_CARET
+#if wxUSE_DISPLAY
+ #include "wx/display.h"
+#endif
+
+#if wxUSE_SYSTEM_OPTIONS
+ #include "wx/sysopt.h"
+#endif
+
// ----------------------------------------------------------------------------
// static data
// ----------------------------------------------------------------------------
-#if defined(__WXPM__)
+#if defined(__WXPALMOS__)
+int wxWindowBase::ms_lastControlId = 32767;
+#elif defined(__WXPM__)
int wxWindowBase::ms_lastControlId = 2000;
#else
int wxWindowBase::ms_lastControlId = -200;
// no constraints on the minimal window size
m_minWidth =
- m_maxWidth = wxDefaultSize.x;
+ m_maxWidth = wxDefaultCoord;
m_minHeight =
- m_maxHeight = wxDefaultSize.y;
+ m_maxHeight = wxDefaultCoord;
+
+ // invalidiated cache value
+ m_bestSizeCache = wxDefaultSize;
// window are created enabled and visible by default
m_isShown =
m_hasBgCol =
m_hasFgCol =
m_hasFont = false;
+ m_inheritBgCol =
+ m_inheritFgCol =
+ m_inheritFont = false;
// no style bits
m_exStyle =
m_windowStyle = 0;
+ m_backgroundStyle = wxBG_STYLE_SYSTEM;
+
#if wxUSE_CONSTRAINTS
// no constraints whatsoever
m_constraints = (wxLayoutConstraints *) NULL;
m_virtualSize = wxDefaultSize;
m_minVirtualWidth =
- m_maxVirtualWidth = wxDefaultSize.x;
+ m_maxVirtualWidth = wxDefaultCoord;
m_minVirtualHeight =
- m_maxVirtualHeight = wxDefaultSize.y;
+ m_maxVirtualHeight = wxDefaultCoord;
m_windowVariant = wxWINDOW_VARIANT_NORMAL;
+#if wxUSE_SYSTEM_OPTIONS
+ if ( wxSystemOptions::HasOption(wxWINDOW_DEFAULT_VARIANT) )
+ {
+ m_windowVariant = (wxWindowVariant) wxSystemOptions::GetOptionInt( wxWINDOW_DEFAULT_VARIANT ) ;
+ }
+#endif
// Whether we're using the current theme for this window (wxGTK only for now)
m_themeEnabled = false;
int widthParent, heightParent;
wxWindow *parent = NULL;
+ wxTopLevelWindow *winTop = NULL;
if ( !(direction & wxCENTRE_ON_SCREEN) )
{
// Windows, for example, this places it completely off the screen
if ( parent )
{
- wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
+ winTop = wxDynamicCast(parent, wxTopLevelWindow);
if ( winTop && winTop->IsIconized() )
{
+ winTop = NULL;
parent = NULL;
}
}
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);
}
{
if ( IsTopLevel() )
{
- // centre on the parent
- parent->GetSize(&widthParent, &heightParent);
+ 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();
+ // adjust to the parents position
+ posParent = parent->GetPosition();
+ }
}
else
{
int width, height;
GetSize(&width, &height);
- int xNew = wxDefaultPosition.x,
- yNew = wxDefaultPosition.y;
+ int xNew = wxDefaultCoord,
+ yNew = wxDefaultCoord;
if ( direction & wxHORIZONTAL )
xNew = (widthParent - width)/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
- wxRect rect = wxGetClientDisplayRect();
- wxSize size (rect.width,rect.height);
+ // to take into account the taskbar. And the Mac menu bar at top.
+ wxRect clientrect = wxGetClientDisplayRect();
// NB: in wxMSW, negative position may not neccessary mean "out of screen",
// but it may mean that the window is placed on other than the main
// if the parent is at least partially present here.
if (posParent.x + widthParent >= 0) // if parent is (partially) on the main display
{
- if (xNew < 0)
- xNew = 0;
- else if (xNew+width > size.x)
- xNew = size.x-width-1;
+ 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 > size.y)
- yNew = size.y-height-1;
+ 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 of the visible area of the display
- if (yNew < 0)
- yNew = 0;
+ // 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 -1)
+ // SetSize() and not Move() to allow xNew and/or yNew to be wxDefaultCoord)
SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE);
}
{
if ( GetChildren().GetCount() > 0 )
{
- SetClientSize(DoGetBestSize());
+ SetSize(GetBestSize());
}
//else: do nothing if we have no children
}
static bool wxHasRealChildren(const wxWindowBase* win)
{
int realChildCount = 0;
-
+
for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
node;
node = node->GetNext() )
}
#endif
+void wxWindowBase::InvalidateBestSize()
+{
+ 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)
+ m_parent->InvalidateBestSize();
+}
+
// return the size best suited for the current window
wxSize wxWindowBase::DoGetBestSize() const
{
+ wxSize best;
+
if ( m_windowSizer )
{
- return m_windowSizer->GetMinSize();
+ best = m_windowSizer->GetMinSize();
}
#if wxUSE_CONSTRAINTS
else if ( m_constraints )
// will never return a size bigger than the current one :-(
}
- return wxSize(maxX, maxY);
+ best = wxSize(maxX, maxY);
}
#endif // wxUSE_CONSTRAINTS
else if ( !GetChildren().empty()
// if the window hadn't been positioned yet, assume that it is in
// the origin
- if ( wx == wxDefaultPosition.x )
+ if ( wx == wxDefaultCoord )
wx = 0;
- if ( wy == wxDefaultPosition.y )
+ if ( wy == wxDefaultCoord )
wy = 0;
win->GetSize(&ww, &wh);
maxX += 7;
maxY += 14;
- return wxSize(maxX, maxY);
+ best = wxSize(maxX, maxY);
}
else // ! has children
{
- // for a generic window there is no natural best size - just use either the
- // minimum size if there is one, or the current size
+ // For a generic window there is no natural best size - just use
+ // either the minimum size if there is one, or the current size.
+ // These are returned as-is, unadjusted by the client size difference.
if ( GetMinSize().IsFullySpecified() )
return GetMinSize();
else
return GetSize();
}
+
+ // Add any difference between size and client size
+ wxSize diff = GetSize() - GetClientSize();
+ best.x += wxMax(0, diff.x);
+ best.y += wxMax(0, diff.y);
+
+ return best;
}
-void wxWindowBase::SetBestSize(const wxSize& size)
+
+wxSize wxWindowBase::GetBestFittingSize() const
{
- // If the given size is incomplete then merge with the best size.
- wxSize sizeBest;
- if ( size.x == wxDefaultSize.x || size.y == wxDefaultSize.y )
+ // merge the best size with the min size, giving priority to the min size
+ wxSize min = GetMinSize();
+ if (min.x == wxDefaultCoord || min.y == wxDefaultCoord)
{
- sizeBest = DoGetBestSize();
- if ( size.x != wxDefaultSize.x )
- sizeBest.x = size.x;
- if ( size.y != wxDefaultSize.y )
- sizeBest.y = size.y;
- }
- else // have complete explicit size
- {
- sizeBest = size;
+ wxSize best = GetBestSize();
+ if (min.x == wxDefaultCoord) min.x = best.x;
+ if (min.y == wxDefaultCoord) min.y = best.y;
}
+ return min;
+}
- // Change the size if needed
- if (GetSize() != sizeBest)
- SetSize(sizeBest);
- // don't shrink the control below its best size
- m_minWidth = sizeBest.x;
- m_minHeight = sizeBest.y;
+void wxWindowBase::SetBestFittingSize(const wxSize& size)
+{
+ // Set the min size to the size passed in. This will usually either be
+ // wxDefaultSize or the size passed to this window's ctor/Create function.
+ SetMinSize(size);
+
+ // Merge the size with the best size if needed
+ wxSize best = GetBestFittingSize();
+
+ // If the current size doesn't match then change it
+ if (GetSize() != best)
+ SetSize(best);
}
+
// by default the origin is not shifted
wxPoint wxWindowBase::GetClientAreaOrigin() const
{
- return wxPoint(0, 0);
+ return wxPoint(0,0);
}
// set the min/max size of the window
-void wxWindowBase::SetSizeHints(int minW, int minH,
- int maxW, int maxH,
- int WXUNUSED(incW), int WXUNUSED(incH))
+void wxWindowBase::DoSetSizeHints(int minW, int minH,
+ int maxW, int maxH,
+ int WXUNUSED(incW), int WXUNUSED(incH))
{
// setting min width greater than max width leads to infinite loops under
// X11 and generally doesn't make any sense, so don't allow it
- wxCHECK_RET( (minW == wxDefaultSize.x || maxW == wxDefaultSize.x || minW <= maxW) &&
- (minH == wxDefaultSize.y || maxH == wxDefaultSize.y || minH <= maxH),
+ wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
+ (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),
_T("min width/height must be less than max width/height!") );
m_minWidth = minW;
void wxWindowBase::DoSetVirtualSize( int x, int y )
{
- if ( m_minVirtualWidth != wxDefaultSize.x && m_minVirtualWidth > x )
+ if ( m_minVirtualWidth != wxDefaultCoord && m_minVirtualWidth > x )
x = m_minVirtualWidth;
- if ( m_maxVirtualWidth != wxDefaultSize.x && m_maxVirtualWidth < x )
+ if ( m_maxVirtualWidth != wxDefaultCoord && m_maxVirtualWidth < x )
x = m_maxVirtualWidth;
- if ( m_minVirtualHeight != wxDefaultSize.y && m_minVirtualHeight > y )
+ if ( m_minVirtualHeight != wxDefaultCoord && m_minVirtualHeight > y )
y = m_minVirtualHeight;
- if ( m_maxVirtualHeight != wxDefaultSize.y && m_maxVirtualHeight < y )
+ if ( m_maxVirtualHeight != wxDefaultCoord && m_maxVirtualHeight < y )
y = m_maxVirtualHeight;
m_virtualSize = wxSize(x, y);
wxSize wxWindowBase::DoGetVirtualSize() const
{
- wxSize s( GetClientSize() );
+ if ( m_virtualSize.IsFullySpecified() )
+ return m_virtualSize;
+
+ wxSize size = GetClientSize();
+ if ( m_virtualSize.x != wxDefaultCoord )
+ size.x = m_virtualSize.x;
- return wxSize( wxMax( m_virtualSize.GetWidth(), s.GetWidth() ),
- wxMax( m_virtualSize.GetHeight(), s.GetHeight() ) );
+ if ( m_virtualSize.y != wxDefaultCoord )
+ size.y = m_virtualSize.y;
+
+ return size;
}
// ----------------------------------------------------------------------------
// which ensures that this only happens if the user really wants it and
// not by default which wouldn't make any sense in modern GUIs where the
// controls don't all use the same fonts (nor colours)
- if ( parent->m_hasFont && !m_hasFont )
+ if ( parent->m_inheritFont && !m_hasFont )
SetFont(parent->GetFont());
// in addition, there is a possibility to explicitly forbid inheriting
// colours at each class level by overriding ShouldInheritColours()
if ( ShouldInheritColours() )
{
- if ( parent->m_hasFgCol && !m_hasFgCol )
+ if ( parent->m_inheritFgCol && !m_hasFgCol )
SetForegroundColour(parent->GetForegroundColour());
- if ( parent->m_hasBgCol && !m_hasBgCol )
+ // inheriting (solid) background colour is wrong as it totally breaks
+ // any kind of themed backgrounds
+ //
+ // instead, the controls should use the same background as their parent
+ // (ideally by not drawing it at all)
+#if 0
+ if ( parent->m_inheritBgCol && !m_hasBgCol )
SetBackgroundColour(parent->GetBackgroundColour());
+#endif // 0
}
}
if ( !colBg.Ok() )
colBg = GetClassDefaultAttributes().colBg;
- // cache it for the next call
- wxConstCast(this, wxWindowBase)->m_backgroundColour = colBg;
+ return colBg;
}
-
- return m_backgroundColour;
+ else
+ return m_backgroundColour;
}
wxColour wxWindowBase::GetForegroundColour() const
if ( !colFg.Ok() )
colFg = GetClassDefaultAttributes().colFg;
- wxConstCast(this, wxWindowBase)->m_foregroundColour = colFg;
+ return colFg;
}
-
- return m_foregroundColour;
+ else
+ return m_foregroundColour;
}
bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
{
- if ( colour == m_backgroundColour )
+ if ( colour == m_backgroundColour )
return false;
m_hasBgCol = colour.Ok();
+ if ( m_backgroundStyle != wxBG_STYLE_CUSTOM )
+ m_backgroundStyle = m_hasBgCol ? wxBG_STYLE_COLOUR : wxBG_STYLE_SYSTEM;
+
+ m_inheritBgCol = m_hasBgCol;
m_backgroundColour = colour;
SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() );
return true;
return false;
m_hasFgCol = colour.Ok();
+ m_inheritFgCol = m_hasFgCol;
m_foregroundColour = colour;
SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
return true;
return true;
}
-wxFont& wxWindowBase::DoGetFont() const
+wxFont wxWindowBase::GetFont() const
{
// logic is the same as in GetBackgroundColour()
if ( !m_font.Ok() )
if ( !font.Ok() )
font = GetClassDefaultAttributes().font;
- wxConstCast(this, wxWindowBase)->m_font = font;
+ return font;
}
-
- // cast is here for non-const GetFont() convenience
- return wxConstCast(this, wxWindowBase)->m_font;
+ else
+ return m_font;
}
bool wxWindowBase::SetFont(const wxFont& font)
{
- if ( !font.Ok() )
- return false;
-
if ( font == m_font )
{
// no change
}
m_font = font;
+ m_hasFont = font.Ok();
+ m_inheritFont = m_hasFont;
- m_hasFont = true;
+ InvalidateBestSize();
return true;
}
// find child window by id or name
// ----------------------------------------------------------------------------
-wxWindow *wxWindowBase::FindWindow( long id )
+wxWindow *wxWindowBase::FindWindow(long id) const
{
if ( id == m_windowId )
return (wxWindow *)this;
return (wxWindow *)res;
}
-wxWindow *wxWindowBase::FindWindow( const wxString& name )
+wxWindow *wxWindowBase::FindWindow(const wxString& name) const
{
if ( name == m_windowName )
return (wxWindow *)this;
wxWindow *
wxWindowBase::FindWindowById( long id, const wxWindow* parent )
{
- return wxFindWindowHelper(parent, _T(""), id, wxFindWindowCmpIds);
+ return wxFindWindowHelper(parent, wxEmptyString, id, wxFindWindowCmpIds);
}
// ----------------------------------------------------------------------------
wxLayoutConstraints *constr = GetConstraints();
if ( constr )
{
- if ( x != wxDefaultPosition.x )
+ if ( x != wxDefaultCoord )
{
constr->left.SetValue(x);
constr->left.SetDone(true);
}
- if ( y != wxDefaultPosition.y )
+ if ( y != wxDefaultCoord )
{
constr->top.SetValue(y);
constr->top.SetDone(true);
}
- if ( w != wxDefaultSize.x )
+ if ( w != wxDefaultCoord )
{
constr->width.SetValue(w);
constr->width.SetDone(true);
}
- if ( h != wxDefaultSize.y )
+ if ( h != wxDefaultCoord )
{
constr->height.SetValue(h);
constr->height.SetDone(true);
wxLayoutConstraints *constr = GetConstraints();
if ( constr )
{
- if ( x != wxDefaultPosition.x )
+ if ( x != wxDefaultCoord )
{
constr->left.SetValue(x);
constr->left.SetDone(true);
}
- if ( y != wxDefaultPosition.y )
+ if ( y != wxDefaultCoord )
{
constr->top.SetValue(y);
constr->top.SetDone(true);
void wxWindowBase::UpdateWindowUI(long flags)
{
wxUpdateUIEvent event(GetId());
- event.m_eventObject = this;
+ event.SetEventObject(this);
if ( GetEventHandler()->ProcessEvent(event) )
{
if ( event.GetText() != control->GetLabel() )
control->SetLabel(event.GetText());
}
+ }
+#endif // wxUSE_CONTROLS
+
+ if ( event.GetSetChecked() )
+ {
#if wxUSE_CHECKBOX
wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox);
if ( checkbox )
{
- if ( event.GetSetChecked() )
- checkbox->SetValue(event.GetChecked());
+ checkbox->SetValue(event.GetChecked());
}
#endif // wxUSE_CHECKBOX
wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
if ( radiobtn )
{
- if ( event.GetSetChecked() )
- radiobtn->SetValue(event.GetChecked());
+ radiobtn->SetValue(event.GetChecked());
}
#endif // wxUSE_RADIOBTN
}
-#endif
}
#if 0
{
int charWidth = GetCharWidth();
int charHeight = GetCharHeight();
- wxPoint pt2(-1, -1);
- if (pt.x != -1)
+ wxPoint pt2 = wxDefaultPosition;
+ if (pt.x != wxDefaultCoord)
pt2.x = (int) ((pt.x * 4) / charWidth);
- if (pt.y != -1)
+ if (pt.y != wxDefaultCoord)
pt2.y = (int) ((pt.y * 8) / charHeight);
return pt2;
{
int charWidth = GetCharWidth();
int charHeight = GetCharHeight();
- wxPoint pt2(-1, -1);
- if (pt.x != -1)
+ wxPoint pt2 = wxDefaultPosition;
+ if (pt.x != wxDefaultCoord)
pt2.x = (int) ((pt.x * charWidth) / 4);
- if (pt.y != -1)
+ if (pt.y != wxDefaultCoord)
pt2.y = (int) ((pt.y * charHeight) / 8);
return pt2;
if ( !win->IsTopLevel() )
{
wxSysColourChangedEvent event2;
- event.m_eventObject = win;
+ event.SetEventObject(win);
win->GetEventHandler()->ProcessEvent(event2);
}
node = node->GetNext();
}
+
+ Refresh();
}
// the default action is to populate dialog with data when it's created,
wxMessageBox(wxString::Format(
_T(
- " wxWidgets Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n Copyright (c) 1995-2002 wxWidgets team"
+ " 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,
L" (Unicode)",
#else
"",
+#endif
+#ifdef __WXDEBUG__
+ _T(" Debug build"),
+#else
+ wxEmptyString,
#endif
__TDATE__,
__TTIME__
#endif
-#if !wxUSE_STL
// ----------------------------------------------------------------------------
// list classes implementation
// ----------------------------------------------------------------------------
+#if wxUSE_STL
+
+#include <wx/listimpl.cpp>
+WX_DEFINE_LIST(wxWindowList);
+
+#else
+
void wxWindowListNode::DeleteData()
{
delete (wxWindow *)GetData();
}
+
#endif
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
-// navigation
+// keyboard navigation
// ----------------------------------------------------------------------------
// Navigates in the specified direction.
return false;
}
+void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move)
+{
+ // check that we're not a top level window
+ wxCHECK_RET( GetParent(),
+ _T("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
+
+ // detect the special case when we have nothing to do anyhow and when the
+ // code below wouldn't work
+ if ( win == this )
+ return;
+
+ // find the target window in the siblings list
+ wxWindowList& siblings = GetParent()->GetChildren();
+ wxWindowList::compatibility_iterator i = siblings.Find(win);
+ wxCHECK_RET( i, _T("MoveBefore/AfterInTabOrder(): win is not a sibling") );
+
+ // unfortunately, when wxUSE_STL == 1 DetachNode() is not implemented so we
+ // can't just move the node around
+ wxWindow *self = (wxWindow *)this;
+ siblings.DeleteObject(self);
+ if ( move == MoveAfter )
+ {
+ i = i->GetNext();
+ }
+
+ if ( i )
+ {
+ siblings.Insert(i, self);
+ }
+ else // MoveAfter and win was the last sibling
+ {
+ siblings.Append(self);
+ }
+}
+
+// ----------------------------------------------------------------------------
+// focus handling
+// ----------------------------------------------------------------------------
+
+/*static*/ wxWindow* wxWindowBase::FindFocus()
+{
+ wxWindowBase *win = DoFindFocus();
+ return win ? win->GetMainWindowOfCompositeControl() : NULL;
+}
+
// ----------------------------------------------------------------------------
// global functions
// ----------------------------------------------------------------------------
#endif
title = GetWindow()->GetName();
- if (!title.IsEmpty())
+ if (!title.empty())
{
*name = title;
return wxACC_OK;
return wxACC_FAIL;
wxString ht(GetWindow()->GetHelpText());
- if (!ht.IsEmpty())
+ if (!ht.empty())
{
*description = ht;
return wxACC_OK;
return wxACC_FAIL;
wxString ht(GetWindow()->GetHelpText());
- if (!ht.IsEmpty())
+ if (!ht.empty())
{
*helpText = ht;
return wxACC_OK;
// Gets a variant representing the selected children
// of this object.
// Acceptable values:
-// - a null variant (IsNull() returns TRUE)
+// - a null variant (IsNull() returns true)
// - a list variant (GetType() == wxT("list")
// - an integer representing the selected child element,
// or 0 if this object is selected (GetType() == wxT("long")
projects / wxWidgets.git / blobdiff