wxSystemSettings settings;
m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE);
- m_foregroundColour = *wxBLACK; // TODO take this from sys settings too?
-#ifndef __WXMAC__
+ // m_foregroundColour = *wxBLACK; // TODO take this from sys settings too?
+ m_foregroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT);
+
+#if !defined(__WXMAC__) && !defined(__WXGTK__)
m_font = *wxSWISS_FONT; // and this?
#else
m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
const wxPoint& WXUNUSED(pos),
const wxSize& WXUNUSED(size),
long style,
-#if wxUSE_VALIDATORS
-# if defined(__VISAGECPP__)
- const wxValidator* validator,
-# else
const wxValidator& validator,
-# endif
-#endif
const wxString& name)
{
// m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
SetName(name);
SetWindowStyleFlag(style);
SetParent(parent);
+
+#if wxUSE_VALIDATORS
SetValidator(validator);
+#endif // wxUSE_VALIDATORS
return TRUE;
}
}
// ----------------------------------------------------------------------------
-// centre/fit the window
+// size/position related methods
// ----------------------------------------------------------------------------
// centre the window with respect to its parent in either (or both) directions
// fits the window around the children
void wxWindowBase::Fit()
{
- int maxX = 0,
- maxY = 0;
+ if ( GetChildren().GetCount() > 0 )
+ {
+ SetClientSize(DoGetBestSize());
+ }
+ //else: do nothing if we have no children
+}
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
+// return the size best suited for the current window
+wxSize wxWindowBase::DoGetBestSize() const
+{
+ if ( GetChildren().GetCount() > 0 )
{
- wxWindow *win = node->GetData();
- if ( win->IsTopLevel() )
+ // our minimal acceptable size is such that all our windows fit inside
+ int maxX = 0,
+ maxY = 0;
+
+ for ( wxWindowList::Node *node = GetChildren().GetFirst();
+ node;
+ node = node->GetNext() )
{
- // dialogs and frames lie in different top level windows - don't
- // deal with them here
- continue;
+ wxWindow *win = node->GetData();
+ if ( win->IsTopLevel() )
+ {
+ // dialogs and frames lie in different top level windows -
+ // don't deal with them here
+ continue;
+ }
+
+ int wx, wy, ww, wh;
+ win->GetPosition(&wx, &wy);
+ win->GetSize(&ww, &wh);
+ if ( wx + ww > maxX )
+ maxX = wx + ww;
+ if ( wy + wh > maxY )
+ maxY = wy + wh;
}
- int wx, wy, ww, wh;
- win->GetPosition(&wx, &wy);
- win->GetSize(&ww, &wh);
- if ( wx + ww > maxX )
- maxX = wx + ww;
- if ( wy + wh > maxY )
- maxY = wy + wh;
+ // leave a margin
+ return wxSize(maxX + 7, maxY + 14);
+ }
+ else
+ {
+ // for a generic window there is no natural best size - just use the
+ // current one
+ return GetSize();
}
-
- // leave a margin
- SetClientSize(maxX + 7, maxY + 14);
}
// 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))
// validators
// ----------------------------------------------------------------------------
-# if defined(__VISAGECPP__)
-void wxWindowBase::SetValidator(const wxValidator* validator)
-{
- if ( m_windowValidator )
- delete m_windowValidator;
-
- m_windowValidator = (wxValidator *)validator->Clone();
-
- if ( m_windowValidator )
- m_windowValidator->SetWindow(this) ;
-}
-# else
void wxWindowBase::SetValidator(const wxValidator& validator)
{
if ( m_windowValidator )
if ( m_windowValidator )
m_windowValidator->SetWindow(this) ;
}
-# endif // __VISAGECPP__
#endif // wxUSE_VALIDATORS
// ----------------------------------------------------------------------------
bool wxWindowBase::Layout()
{
- int w, h;
- GetClientSize(&w, &h);
-
// If there is a sizer, use it instead of the constraints
if ( GetSizer() )
{
+ int w, h;
+ GetClientSize(&w, &h);
+
GetSizer()->SetDimension( 0, 0, w, h );
- return TRUE;
}
-
- if ( GetConstraints() )
+ else
{
- GetConstraints()->width.SetValue(w);
- GetConstraints()->height.SetValue(h);
+ wxLayoutConstraints *constr = GetConstraints();
+ bool wasOk = constr && constr->AreSatisfied();
+
+ ResetConstraints(); // Mark all constraints as unevaluated
+
+ // if we're a top level panel (i.e. our parent is frame/dialog), our
+ // own constraints will never be satisfied any more unless we do it
+ // here
+ if ( wasOk )
+ {
+ int noChanges = 1;
+ while ( noChanges > 0 )
+ {
+ constr->SatisfyConstraints(this, &noChanges);
+ }
+ }
+
+ DoPhase(1); // Layout children
+ DoPhase(2); // Layout grand children
+ SetConstraintSizes(); // Recursively set the real window sizes
}
-
- // Evaluate child constraints
- ResetConstraints(); // Mark all constraints as unevaluated
- DoPhase(1); // Just one phase need if no sizers involved
- DoPhase(2);
- SetConstraintSizes(); // Recursively set the real window sizes
return TRUE;
}
constr->centreX.SetDone(FALSE);
constr->centreY.SetDone(FALSE);
}
+
wxWindowList::Node *node = GetChildren().GetFirst();
while (node)
{
void wxWindowBase::SetConstraintSizes(bool recurse)
{
wxLayoutConstraints *constr = GetConstraints();
- if ( constr && constr->left.GetDone() && constr->right.GetDone( ) &&
- constr->width.GetDone() && constr->height.GetDone())
+ if ( constr && constr->AreSatisfied() )
{
int x = constr->left.GetValue();
int y = constr->top.GetValue();
}
else if ( constr )
{
- wxChar *windowClass = GetClassInfo()->GetClassName();
-
- wxString winName;
- if ( GetName() == wxT("") )
- winName = wxT("unnamed");
- else
- winName = GetName();
- wxLogDebug( wxT("Constraint(s) not satisfied for window of type %s, name %s:\n"),
- (const wxChar *)windowClass,
- (const wxChar *)winName);
- if ( !constr->left.GetDone()) wxLogDebug( wxT(" unsatisfied 'left' constraint.\n") );
- if ( !constr->right.GetDone()) wxLogDebug( wxT(" unsatisfied 'right' constraint.\n") );
- if ( !constr->width.GetDone()) wxLogDebug( wxT(" unsatisfied 'width' constraint.\n") );
- if ( !constr->height.GetDone()) wxLogDebug( wxT(" unsatisfied 'height' constraint.\n") );
- wxLogDebug( wxT("Please check constraints: try adding AsIs() constraints.\n") );
+ wxLogDebug(wxT("Constraints not satisfied for %s named '%s'."),
+ GetClassInfo()->GetClassName(),
+ GetName().c_str());
}
if ( recurse )
}
#endif // wxUSE_CHECKBOX
-#if wxUSE_RADIOBUTTON
+#if wxUSE_RADIOBTN
wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton);
if ( radiobtn )
{
if ( event.GetSetChecked() )
radiobtn->SetValue(event.GetChecked());
}
-#endif // wxUSE_RADIOBUTTON
+#endif // wxUSE_RADIOBTN
}
}
wxClientData *wxWindowBase::DoGetClientObject() const
{
- wxASSERT_MSG( m_clientDataType == ClientData_Object,
+ // it's not an error to call GetClientObject() on a window which doesn't
+ // have client data at all - NULL will be returned
+ wxASSERT_MSG( m_clientDataType != ClientData_Void,
wxT("this window doesn't have object client data") );
return m_clientObject;
void *wxWindowBase::DoGetClientData() const
{
- wxASSERT_MSG( m_clientDataType == ClientData_Void,
+ // it's not an error to call GetClientData() on a window which doesn't have
+ // client data at all - NULL will be returned
+ wxASSERT_MSG( m_clientDataType != ClientData_Object,
wxT("this window doesn't have void client data") );
return m_clientData;
projects / wxWidgets.git / blobdiff