unknown container now accepts wxNO_FULL_REPAINT_ON_RESIZE flag (John Anderson)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xrc/xh_unkwn.cpp b/contrib/src/xrc/xh_unkwn.cpp
index f0934824993c8925506ffb935d17cb34645bbc8a..388fb040c34bd0b70dfa769a6701496dfe6c561b 100644 (file)
--- a/contrib/src/xrc/xh_unkwn.cpp
+++ b/contrib/src/xrc/xh_unkwn.cpp
@@ -33,8 +33,9 @@ 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 = wxTAB_TRAVERSAL | wxNO_BORDER)
+        : wxPanel(parent, id, pos, size, style,

                   controlName + wxT("_container")),
           m_controlName(controlName), m_controlAdded(false)
     {
                   controlName + wxT("_container")),
           m_controlName(controlName), m_controlAdded(false)
     {


@@ -82,6 +83,7 @@ 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()


@@ -89,7 +91,9 @@ 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"),
+                                               wxTAB_TRAVERSAL | wxNO_BORDER));

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

diff --git a/src/xrc/xh_unkwn.cpp b/src/xrc/xh_unkwn.cpp
index f0934824993c8925506ffb935d17cb34645bbc8a..388fb040c34bd0b70dfa769a6701496dfe6c561b 100644 (file)
--- a/src/xrc/xh_unkwn.cpp
+++ b/src/xrc/xh_unkwn.cpp
@@ -33,8 +33,9 @@ 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 = wxTAB_TRAVERSAL | wxNO_BORDER)
+        : wxPanel(parent, id, pos, size, style,

                   controlName + wxT("_container")),
           m_controlName(controlName), m_controlAdded(false)
     {
                   controlName + wxT("_container")),
           m_controlName(controlName), m_controlAdded(false)
     {


@@ -82,6 +83,7 @@ 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()


@@ -89,7 +91,9 @@ 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"),
+                                               wxTAB_TRAVERSAL | wxNO_BORDER));

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