The mac toolbar was redrawing buttons when not shown -

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

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index d08cba8d285ae599834c04dbc8db70c8b31863c0..ac97564018d897fccc15ee3c028f96fe48eb8d9f 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/09/09
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_unkwn.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_unkwn.h"
 #endif


@@ -23,6 +23,7 @@
 #include "wx/window.h"
 #include "wx/log.h"
 #include "wx/sizer.h"
 #include "wx/window.h"
 #include "wx/log.h"
 #include "wx/sizer.h"

+#include "wx/panel.h"

 
 
 class wxUnknownControlContainer : public wxPanel
 
 
 class wxUnknownControlContainer : public wxPanel


@@ -35,14 +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);

-    
+

 protected:
     wxString m_controlName;
     bool m_controlAdded;
 protected:
     wxString m_controlName;
     bool m_controlAdded;


@@ -54,12 +55,12 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
     wxASSERT_MSG( !m_controlAdded, wxT("Couldn't add two unknown controls to the same container!") )
 
     wxPanel::AddChild(child);
     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);
     SetBackgroundColour(m_bg);
     child->SetName(m_controlName);

-    child->SetId(XMLID(m_controlName));
+    child->SetId(wxXmlResource::GetXMLID(m_controlName));

     m_controlAdded = TRUE;
     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);


@@ -69,14 +70,14 @@ void wxUnknownControlContainer::AddChild(wxWindowBase *child)
 
 
 
 
 
 

-wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler() 
-: wxXmlResourceHandler() 
+wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
+: wxXmlResourceHandler()

 {
 }
 
 wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
 {
 }
 
 wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()

-{ 
-    wxPanel *panel = 
+{
+    wxPanel *panel =

         new wxUnknownControlContainer(m_parentAsWindow,
                                       GetName(), -1,
                                       GetPosition(), GetSize());
         new wxUnknownControlContainer(m_parentAsWindow,
                                       GetName(), -1,
                                       GetPosition(), GetSize());