Turn off all border styles for the inner window

[wxWidgets.git] / src / xrc / xh_unkwn.cpp

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index 143ddefb9739677dd35eeaad89d13587d7dd8d9b..4d6e65263ddf0e6ca13767d5a9fdc18489d67691 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_unkwn.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_unkwn.cpp

-// Purpose:     XML resource for unknown widget
+// Purpose:     XRC resource for unknown widget

 // Author:      Vaclav Slavik
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
 // RCS-ID:      $Id$


@@ -36,13 +36,14 @@ public:
                               const wxSize& size = wxDefaultSize)
         : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
                   controlName + wxT("_container")),
                               const wxSize& size = wxDefaultSize)
         : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
                   controlName + wxT("_container")),

-          m_controlName(controlName), m_controlAdded(FALSE)
+          m_controlName(controlName), m_controlAdded(false)

     {
         m_bg = GetBackgroundColour();
         SetBackgroundColour(wxColour(255, 0, 255));
     }
 
     virtual void AddChild(wxWindowBase *child);
     {
         m_bg = GetBackgroundColour();
         SetBackgroundColour(wxColour(255, 0, 255));
     }
 
     virtual void AddChild(wxWindowBase *child);

+    virtual void RemoveChild(wxWindowBase *child);

 
 protected:
     wxString m_controlName;
 
 protected:
     wxString m_controlName;


@@ -52,22 +53,28 @@ protected:
 
 void wxUnknownControlContainer::AddChild(wxWindowBase *child)
 {
 
 void wxUnknownControlContainer::AddChild(wxWindowBase *child)
 {

-    wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") )
+    wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") );

 
     wxPanel::AddChild(child);
 
     SetBackgroundColour(m_bg);
     child->SetName(m_controlName);
 
     wxPanel::AddChild(child);
 
     SetBackgroundColour(m_bg);
     child->SetName(m_controlName);

-    child->SetId(wxXmlResource::GetXMLID(m_controlName));
-    m_controlAdded = TRUE;
+    child->SetId(wxXmlResource::GetXRCID(m_controlName));
+    m_controlAdded = true;

 
     wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add((wxWindow*)child, 1, wxEXPAND);
     SetSizer(sizer);
 
     wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add((wxWindow*)child, 1, wxEXPAND);
     SetSizer(sizer);

-    SetAutoLayout(TRUE);
+    SetAutoLayout(true);

     Layout();
 }
 
     Layout();
 }
 

+void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
+{
+    wxPanel::RemoveChild(child);
+    m_controlAdded = false;
+    GetSizer()->Detach((wxWindow*)child);
+}

 
 
 wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
 
 
 wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()