1. corrected (but the fix is ugly) the multiple def button problem

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index a235318fb025e9abeb58c83f47fb0f86fba9183a..ccba8e7c5370a7fddc60655c643d672706ffb163 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -43,6 +43,7 @@
 
 #if wxUSE_CONSTRAINTS
     #include "wx/layout.h"
 
 #if wxUSE_CONSTRAINTS
     #include "wx/layout.h"

+    #include "wx/sizer.h"

 #endif // wxUSE_CONSTRAINTS
 
 #if wxUSE_DRAG_AND_DROP
 #endif // wxUSE_CONSTRAINTS
 
 #if wxUSE_DRAG_AND_DROP


@@ -131,7 +132,6 @@ void wxWindowBase::InitBase()
     m_constraints = (wxLayoutConstraints *) NULL;
     m_constraintsInvolvedIn = (wxWindowList *) NULL;
     m_windowSizer = (wxSizer *) NULL;
     m_constraints = (wxLayoutConstraints *) NULL;
     m_constraintsInvolvedIn = (wxWindowList *) NULL;
     m_windowSizer = (wxSizer *) NULL;

-    m_sizerParent = (wxWindowBase *) NULL;

     m_autoLayout = FALSE;
 #endif // wxUSE_CONSTRAINTS
 
     m_autoLayout = FALSE;
 #endif // wxUSE_CONSTRAINTS
 


@@ -160,7 +160,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
     // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
     // member variables - check that it has been called (will catch the case
     // when a new ctor is added which doesn't call InitWindow)
     // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
     // member variables - check that it has been called (will catch the case
     // when a new ctor is added which doesn't call InitWindow)

-    wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") );
+    wxASSERT_MSG( m_isWindow, wxT("Init() must have been called before!") );

 
     // generate a new id if the user doesn't care about it
     m_windowId = id == -1 ? NewControlId() : id;
 
     // generate a new id if the user doesn't care about it
     m_windowId = id == -1 ? NewControlId() : id;


@@ -191,7 +191,7 @@ wxWindowBase::~wxWindowBase()
     // we weren't a dialog class
     wxTopLevelWindows.DeleteObject(this);
 
     // we weren't a dialog class
     wxTopLevelWindows.DeleteObject(this);
 

-    wxASSERT_MSG( GetChildren().GetCount() == 0, _T("children not destroyed") );
+    wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );

 
     // make sure that there are no dangling pointers left pointing to us
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
 
     // make sure that there are no dangling pointers left pointing to us
     wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);


@@ -213,7 +213,8 @@ wxWindowBase::~wxWindowBase()
         delete m_windowValidator;
 #endif // wxUSE_VALIDATORS
 
         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
         delete m_clientObject;
 
 #if wxUSE_CONSTRAINTS


@@ -233,9 +234,6 @@ wxWindowBase::~wxWindowBase()
     if ( m_windowSizer )
         delete m_windowSizer;
 
     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
 #endif // wxUSE_CONSTRAINTS
 
 #if wxUSE_DRAG_AND_DROP


@@ -282,12 +280,12 @@ bool wxWindowBase::DestroyChildren()
 
         wxWindow *child = node->GetData();
 
 
         wxWindow *child = node->GetData();
 

-        wxASSERT_MSG( child, _T("children list contains empty nodes") );
+        wxASSERT_MSG( child, wxT("children list contains empty nodes") );

 
         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),
 
         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),

-                      _T("child didn't remove itself using RemoveChild()") );
+                      wxT("child didn't remove itself using RemoveChild()") );

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -337,7 +335,7 @@ void wxWindowBase::Centre(int direction)
     if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) )
     {
         // theo nly chance to get this is to have a wxControl without parent
     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") );
+        wxCHECK_RET( parent, wxT("a control must have a parent") );

 
         // adjust to the parents client area origin
         wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));
 
         // adjust to the parents client area origin
         wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));


@@ -438,7 +436,7 @@ bool wxWindowBase::IsTopLevel() const
 
 void wxWindowBase::AddChild(wxWindowBase *child)
 {
 
 void wxWindowBase::AddChild(wxWindowBase *child)
 {

-    wxCHECK_RET( child, _T("can't add a NULL child") );
+    wxCHECK_RET( child, wxT("can't add a NULL child") );

 
     GetChildren().Append(child);
     child->SetParent(this);
 
     GetChildren().Append(child);
     child->SetParent(this);


@@ -446,7 +444,7 @@ void wxWindowBase::AddChild(wxWindowBase *child)
 
 void wxWindowBase::RemoveChild(wxWindowBase *child)
 {
 
 void wxWindowBase::RemoveChild(wxWindowBase *child)
 {

-    wxCHECK_RET( child, _T("can't remove a NULL child") );
+    wxCHECK_RET( child, wxT("can't remove a NULL child") );

 
     GetChildren().DeleteObject(child);
     child->SetParent((wxWindow *)NULL);
 
     GetChildren().DeleteObject(child);
     child->SetParent((wxWindow *)NULL);


@@ -541,7 +539,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
     // don't try to set invalid cursor, always fall back to the default
     const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
 
     // 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;
     {
         // no change
         return FALSE;


@@ -557,7 +555,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
     // don't try to set invalid font, always fall back to the default
     const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
 
     // 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;
     {
         // no change
         return FALSE;


@@ -581,7 +579,7 @@ void wxWindowBase::SetCaret(wxCaret *caret)
     if ( m_caret )
     {
         wxASSERT_MSG( m_caret->GetWindow() == this,
     if ( m_caret )
     {
         wxASSERT_MSG( m_caret->GetWindow() == this,

-                      _T("caret should be created associated to this window") );
+                      wxT("caret should be created associated to this window") );

     }
 }
 #endif // wxUSE_CARET
     }
 }
 #endif // wxUSE_CARET


@@ -888,39 +886,35 @@ void wxWindowBase::DeleteRelatedConstraints()
 
 void wxWindowBase::SetSizer(wxSizer *sizer)
 {
 
 void wxWindowBase::SetSizer(wxSizer *sizer)
 {

+    if (m_windowSizer) delete m_windowSizer;
+

     m_windowSizer = sizer;
     m_windowSizer = sizer;

-    if ( sizer )
-        sizer->SetSizerParent(this);

 }
 
 bool wxWindowBase::Layout()
 {
 }
 
 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() )
     {
     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;
     }
         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;
 }
 
     return TRUE;
 }
 


@@ -1028,17 +1022,15 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
         int w = constr->width.GetValue();
         int h = constr->height.GetValue();
 
         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 ) ||
         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
         {
         }
         else
         {

-            SizerMove(x, y);
+            // If we don't want to resize this window, just move it...
+            Move(x, y);

         }
     }
     else if ( constr )
         }
     }
     else if ( constr )


@@ -1046,18 +1038,18 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
         wxChar *windowClass = GetClassInfo()->GetClassName();
 
         wxString winName;
         wxChar *windowClass = GetClassInfo()->GetClassName();
 
         wxString winName;

-        if ( GetName() == _T("") )
-            winName = _T("unnamed");
+        if ( GetName() == wxT("") )
+            winName = wxT("unnamed");

         else
             winName = GetName();
         else
             winName = GetName();

-        wxLogDebug( _T("Constraint(s) not satisfied for window of type %s, name %s:\n"),
+        wxLogDebug( wxT("Constraint(s) not satisfied for window of type %s, name %s:\n"),

                 (const wxChar *)windowClass,
                 (const wxChar *)winName);
                 (const wxChar *)windowClass,
                 (const wxChar *)winName);

-        if ( !constr->left.GetDone()) wxLogDebug( _T("  unsatisfied 'left' constraint.\n")  );
-        if ( !constr->right.GetDone()) wxLogDebug( _T("  unsatisfied 'right' constraint.\n")  );
-        if ( !constr->width.GetDone()) wxLogDebug( _T("  unsatisfied 'width' constraint.\n")  );
-        if ( !constr->height.GetDone())  wxLogDebug( _T("  unsatisfied 'height' constraint.\n")  );
-        wxLogDebug( _T("Please check constraints: try adding AsIs() constraints.\n") );
+        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") );

     }
 
     if ( recurse )
     }
 
     if ( recurse )


@@ -1073,36 +1065,6 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
     }
 }
 
     }
 }
 

-// 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)
 {
 // Only set the size/position of the constraint (if any)
 void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
 {


@@ -1274,7 +1236,7 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
 void wxWindowBase::DoSetClientObject( wxClientData *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Void,
 void wxWindowBase::DoSetClientObject( wxClientData *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Void,

-                  _T("can't have both object and void client data") );
+                  wxT("can't have both object and void client data") );

 
     if ( m_clientObject )
         delete m_clientObject;
 
     if ( m_clientObject )
         delete m_clientObject;


@@ -1286,7 +1248,7 @@ void wxWindowBase::DoSetClientObject( wxClientData *data )
 wxClientData *wxWindowBase::DoGetClientObject() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Object,
 wxClientData *wxWindowBase::DoGetClientObject() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Object,

-                  _T("this window doesn't have object client data") );
+                  wxT("this window doesn't have object client data") );

 
     return m_clientObject;
 }
 
     return m_clientObject;
 }


@@ -1294,7 +1256,7 @@ wxClientData *wxWindowBase::DoGetClientObject() const
 void wxWindowBase::DoSetClientData( void *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Object,
 void wxWindowBase::DoSetClientData( void *data )
 {
     wxASSERT_MSG( m_clientDataType != ClientData_Object,

-                  _T("can't have both object and void client data") );
+                  wxT("can't have both object and void client data") );

 
     m_clientData = data;
     m_clientDataType = ClientData_Void;
 
     m_clientData = data;
     m_clientDataType = ClientData_Void;


@@ -1303,7 +1265,7 @@ void wxWindowBase::DoSetClientData( void *data )
 void *wxWindowBase::DoGetClientData() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Void,
 void *wxWindowBase::DoGetClientData() const
 {
     wxASSERT_MSG( m_clientDataType == ClientData_Void,

-                  _T("this window doesn't have void client data") );
+                  wxT("this window doesn't have void client data") );

 
     return m_clientData;
 }
 
     return m_clientData;
 }