Applied patch [ 809066 ] Cleanup for text2rtf

[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 4d6e65263ddf0e6ca13767d5a9fdc18489d67691..4ff17331255d181695cea5bc0578729e75407e07 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)
     {


@@ -77,9 +80,12 @@ void wxUnknownControlContainer::RemoveChild(wxWindowBase *child)
 }
 
 
 }
 
 

+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()


@@ -87,7 +93,8 @@ wxObject *wxUnknownWidgetXmlHandler::DoCreateResource()
     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;
 }