/////////////////////////////////////////////////////////////////////////////
-// Name: xh_unkwn.cpp
+// Name: src/xrc/xh_unkwn.cpp
// Purpose: XRC resource for unknown widget
// Author: Vaclav Slavik
// Created: 2000/09/09
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "xh_unkwn.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#if wxUSE_XRC
+
#include "wx/xrc/xh_unkwn.h"
-#include "wx/window.h"
-#include "wx/log.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/window.h"
+ #include "wx/panel.h"
+#endif
+
#include "wx/sizer.h"
-#include "wx/panel.h"
class wxUnknownControlContainer : public wxPanel
public:
wxUnknownControlContainer(wxWindow *parent,
const wxString& controlName,
- wxWindowID id = -1,
+ wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize)
- : wxPanel(parent, id, pos, size, wxTAB_TRAVERSAL | wxNO_BORDER,
+ const wxSize& size = wxDefaultSize,
+ long style = 0)
+ // Always add the wxTAB_TRAVERSAL and wxNO_BORDER styles to what comes
+ // from the XRC if anything.
+ : wxPanel(parent, id, pos, size, style | wxTAB_TRAVERSAL | wxNO_BORDER,
controlName + wxT("_container")),
m_controlName(controlName), m_controlAdded(false)
{
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add((wxWindow*)child, 1, wxEXPAND);
SetSizer(sizer);
- SetAutoLayout(true);
Layout();
}
}
+IMPLEMENT_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler, wxXmlResourceHandler)
+
wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
: wxXmlResourceHandler()
{
+ XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
}
wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
{
+ wxASSERT_MSG( m_instance == NULL,
+ _T("'unknown' controls can't be subclassed, use wxXmlResource::AttachUnknownControl") );
+
wxPanel *panel =
new wxUnknownControlContainer(m_parentAsWindow,
- GetName(), -1,
- GetPosition(), GetSize());
+ GetName(), wxID_ANY,
+ GetPosition(), GetSize(),
+ GetStyle(wxT("style")));
SetupWindow(panel);
return panel;
}
return IsOfClass(node, wxT("unknown"));
}
+#endif // wxUSE_XRC