Updates to MIME-types and wxFileDialog code for better

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

diff --git a/contrib/src/xrc/xh_unkwn.cpp b/contrib/src/xrc/xh_unkwn.cpp
index f0934824993c8925506ffb935d17cb34645bbc8a..cad645b68b10634d0332f95642f8602ffc75c978 100644 (file)
--- a/contrib/src/xrc/xh_unkwn.cpp
+++ b/contrib/src/xrc/xh_unkwn.cpp
@@ -33,8 +33,11 @@ public:
                               const wxString& controlName,
                               wxWindowID id = -1,
                               const wxPoint& pos = wxDefaultPosition,
                               const wxString& controlName,
                               wxWindowID id = -1,
                               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)
     {
                   controlName + wxT("_container")),
           m_controlName(controlName), m_controlAdded(false)
     {


@@ -82,14 +85,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler, wxXmlResourceHandler)
 wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
 : wxXmlResourceHandler()
 {
 wxUnknownWidgetXmlHandler::wxUnknownWidgetXmlHandler()
 : wxXmlResourceHandler()
 {

+    XRC_ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);

 }
 
 wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
 {
 }
 
 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,
     wxPanel *panel =
         new wxUnknownControlContainer(m_parentAsWindow,
                                       GetName(), -1,

-                                      GetPosition(), GetSize());
+                                      GetPosition(), GetSize(),
+                                      GetStyle(wxT("style")));

     SetupWindow(panel);
     return panel;
 }
     SetupWindow(panel);
     return panel;
 }