#if wxUSE_CONSTRAINTS
#include "wx/layout.h"
+ #include "wx/sizer.h"
#endif // wxUSE_CONSTRAINTS
#if wxUSE_DRAG_AND_DROP
m_isShown = FALSE;
m_isEnabled = TRUE;
- // no client data
- m_clientObject = (wxClientData *)NULL;
+ // no client data (yet)
m_clientData = NULL;
+ m_clientDataType = ClientData_None;
// the default event handler is just this window
m_eventHandler = this;
m_constraints = (wxLayoutConstraints *) NULL;
m_constraintsInvolvedIn = (wxWindowList *) NULL;
m_windowSizer = (wxSizer *) NULL;
- m_sizerParent = (wxWindowBase *) NULL;
m_autoLayout = FALSE;
#endif // wxUSE_CONSTRAINTS
const wxPoint& WXUNUSED(pos),
const wxSize& WXUNUSED(size),
long style,
+ const wxValidator& validator,
const wxString& name)
{
// m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
SetName(name);
SetWindowStyleFlag(style);
SetParent(parent);
+ SetValidator(validator);
return TRUE;
}
delete m_windowValidator;
#endif // wxUSE_VALIDATORS
- if ( m_clientObject )
+ // we only delete object data, not untyped
+ if ( m_clientDataType == ClientData_Object )
delete m_clientObject;
#if wxUSE_CONSTRAINTS
if ( m_windowSizer )
delete m_windowSizer;
- // If this is a child of a sizer, remove self from parent
- if ( m_sizerParent )
- m_sizerParent->RemoveChild(this);
#endif // wxUSE_CONSTRAINTS
#if wxUSE_DRAG_AND_DROP
int widthParent, heightParent;
wxWindow *parent = GetParent();
- if ( parent )
+ if ( !parent )
{
- parent->GetClientSize(&widthParent, &heightParent);
+ // no other choice
+ direction |= wxCENTRE_ON_SCREEN;
}
- else
+
+ if ( direction & wxCENTRE_ON_SCREEN )
{
// centre with respect to the whole screen
wxDisplaySize(&widthParent, &heightParent);
}
+ else
+ {
+ // centre inside the parents rectangle
+ parent->GetClientSize(&widthParent, &heightParent);
+ }
int width, height;
GetSize(&width, &height);
// controls are always centered on their parent because it doesn't make
// sense to centre them on the screen
- if ( (direction & wxCENTER_FRAME) || wxDynamicCast(this, wxControl) )
+ if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) )
{
+ // theo nly chance to get this is to have a wxControl without parent
+ wxCHECK_RET( parent, _T("a control must have a parent") );
+
// adjust to the parents client area origin
wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));
// don't try to set invalid cursor, always fall back to the default
const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
- if ( cursorOk == m_cursor )
+ if ( (wxCursor&)cursorOk == m_cursor )
{
// no change
return FALSE;
// don't try to set invalid font, always fall back to the default
const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
- if ( fontOk == m_font )
+ if ( (wxFont&)fontOk == m_font )
{
// no change
return FALSE;
void wxWindowBase::SetSizer(wxSizer *sizer)
{
+ if (m_windowSizer) delete m_windowSizer;
+
m_windowSizer = sizer;
- if ( sizer )
- sizer->SetSizerParent(this);
}
bool wxWindowBase::Layout()
{
- if ( GetConstraints() )
- {
- int w, h;
- GetClientSize(&w, &h);
- GetConstraints()->width.SetValue(w);
- GetConstraints()->height.SetValue(h);
- }
-
- // If top level (one sizer), evaluate the sizer's constraints.
+ int w, h;
+ GetClientSize(&w, &h);
+
+ // If there is a sizer, use it instead of the constraints
if ( GetSizer() )
{
- int noChanges;
- GetSizer()->ResetConstraints(); // Mark all constraints as unevaluated
- GetSizer()->LayoutPhase1(&noChanges);
- GetSizer()->LayoutPhase2(&noChanges);
- GetSizer()->SetConstraintSizes(); // Recursively set the real window sizes
+ GetSizer()->SetDimension( 0, 0, w, h );
return TRUE;
}
- else
+
+ if ( GetConstraints() )
{
- // Otherwise, 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
+ GetConstraints()->width.SetValue(w);
+ GetConstraints()->height.SetValue(h);
}
+
+ // 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;
}
int w = constr->width.GetValue();
int h = constr->height.GetValue();
- // If we don't want to resize this window, just move it...
if ( (constr->width.GetRelationship() != wxAsIs ) ||
- (constr->height.GetRelationship() != wxAsIs))
+ (constr->height.GetRelationship() != wxAsIs) )
{
- // Calls Layout() recursively. AAAGH. How can we stop that.
- // Simply take Layout() out of non-top level OnSizes.
- SizerSetSize(x, y, w, h);
+ SetSize(x, y, w, h);
}
else
{
- SizerMove(x, y);
+ // If we don't want to resize this window, just move it...
+ Move(x, y);
}
}
else if ( constr )
}
}
-// This assumes that all sizers are 'on' the same window, i.e. the parent of
-// this window.
-void wxWindowBase::TransformSizerToActual(int *x, int *y) const
-{
- if ( !m_sizerParent || m_sizerParent->IsTopLevel() )
- return;
-
- int xp, yp;
- m_sizerParent->GetPosition(&xp, &yp);
- m_sizerParent->TransformSizerToActual(&xp, &yp);
- *x += xp;
- *y += yp;
-}
-
-void wxWindowBase::SizerSetSize(int x, int y, int w, int h)
-{
- int xx = x;
- int yy = y;
- TransformSizerToActual(&xx, &yy);
- SetSize(xx, yy, w, h);
-}
-
-void wxWindowBase::SizerMove(int x, int y)
-{
- int xx = x;
- int yy = y;
- TransformSizerToActual(&xx, &yy);
- Move(xx, yy);
-}
-
// Only set the size/position of the constraint (if any)
void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
{
return pt2;
}
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxWindowBase::DoSetClientObject( wxClientData *data )
+{
+ wxASSERT_MSG( m_clientDataType != ClientData_Void,
+ _T("can't have both object and void client data") );
+
+ if ( m_clientObject )
+ delete m_clientObject;
+
+ m_clientObject = data;
+ m_clientDataType = ClientData_Object;
+}
+
+wxClientData *wxWindowBase::DoGetClientObject() const
+{
+ wxASSERT_MSG( m_clientDataType == ClientData_Object,
+ _T("this window doesn't have object client data") );
+
+ return m_clientObject;
+}
+
+void wxWindowBase::DoSetClientData( void *data )
+{
+ wxASSERT_MSG( m_clientDataType != ClientData_Object,
+ _T("can't have both object and void client data") );
+
+ m_clientData = data;
+ m_clientDataType = ClientData_Void;
+}
+
+void *wxWindowBase::DoGetClientData() const
+{
+ wxASSERT_MSG( m_clientDataType == ClientData_Void,
+ _T("this window doesn't have void client data") );
+
+ return m_clientData;
+}
+
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff