#include "wx/caret.h"
#endif // wxUSE_CARET
+#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;
m_exStyle =
m_windowStyle = 0;
+ m_backgroundStyle = wxBG_STYLE_SYSTEM;
+
#if wxUSE_CONSTRAINTS
// no constraints whatsoever
m_constraints = (wxLayoutConstraints *) NULL;
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 ( 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
{
yNew += posParent.y;
// 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(GetBestSize());
+ 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()
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;
}
// 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);
}
// 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
if ( parent->m_inheritFgCol && !m_hasFgCol )
SetForegroundColour(parent->GetForegroundColour());
+ // 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
}
}
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() );
m_hasFont = font.Ok();
m_inheritFont = m_hasFont;
+ 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);
}
// ----------------------------------------------------------------------------
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);
}
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-2004 wxWidgets team"
),
port.c_str(),
wxMAJOR_VERSION,
L" (Unicode)",
#else
"",
+#endif
+#ifdef __WXDEBUG__
+ _T(" Debug build"),
+#else
+ wxEmptyString,
#endif
__TDATE__,
__TTIME__
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);
}
}
+// ----------------------------------------------------------------------------
+// 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