]> git.saurik.com Git - wxWidgets.git/commitdiff
all windows can use wxCLIP_CHILDREN
authorVáclav Slavík <vslavik@fastmail.fm>
Sun, 15 Aug 2004 19:37:49 +0000 (19:37 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sun, 15 Aug 2004 19:37:49 +0000 (19:37 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

contrib/src/xrc/xh_dlg.cpp
contrib/src/xrc/xh_frame.cpp
contrib/src/xrc/xh_panel.cpp
contrib/src/xrc/xmlres.cpp
src/xrc/xh_dlg.cpp
src/xrc/xh_frame.cpp
src/xrc/xh_panel.cpp
src/xrc/xmlres.cpp

index 7a93c46dc947ba7bab635b0729f93097ee6b9c16..8b56d45f2b56df433dab59a9e31656dcb384107f 100644 (file)
@@ -43,7 +43,6 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
     XRC_ADD_STYLE(wxMINIMIZE_BOX);
 
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
     XRC_ADD_STYLE(wxMINIMIZE_BOX);
 
index 795bb43af90bc45c8beddf9f02c2988e9a5f2237..36461038f5ea1e1dccfe2d369de9b5c01fc3ea89 100644 (file)
@@ -50,7 +50,6 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
index 4083dce1d2c78e60e330913d6811cfad57e779fd..b05433b0187ff8d58b413aa614699c1e93058847 100644 (file)
@@ -30,7 +30,7 @@ wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+    
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 
index 6e826ff82c57621edb2d0c141001576386b4683d..a28ed3b0394ce54724af443f6c35f14d212706ab 100644 (file)
@@ -713,6 +713,7 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 
 void wxXmlResourceHandler::AddWindowStyles()
 {
 
 void wxXmlResourceHandler::AddWindowStyles()
 {
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
     XRC_ADD_STYLE(wxSIMPLE_BORDER);
     XRC_ADD_STYLE(wxSUNKEN_BORDER);
     XRC_ADD_STYLE(wxDOUBLE_BORDER);
     XRC_ADD_STYLE(wxSIMPLE_BORDER);
     XRC_ADD_STYLE(wxSUNKEN_BORDER);
     XRC_ADD_STYLE(wxDOUBLE_BORDER);
index 7a93c46dc947ba7bab635b0729f93097ee6b9c16..8b56d45f2b56df433dab59a9e31656dcb384107f 100644 (file)
@@ -43,7 +43,6 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
     XRC_ADD_STYLE(wxMINIMIZE_BOX);
 
     XRC_ADD_STYLE(wxMAXIMIZE_BOX);
     XRC_ADD_STYLE(wxMINIMIZE_BOX);
 
index 795bb43af90bc45c8beddf9f02c2988e9a5f2237..36461038f5ea1e1dccfe2d369de9b5c01fc3ea89 100644 (file)
@@ -50,7 +50,6 @@ wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
 
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
index 4083dce1d2c78e60e330913d6811cfad57e779fd..b05433b0187ff8d58b413aa614699c1e93058847 100644 (file)
@@ -30,7 +30,7 @@ wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
     XRC_ADD_STYLE(wxNO_3D);
     XRC_ADD_STYLE(wxTAB_TRAVERSAL);
     XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+    
     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 
index 6e826ff82c57621edb2d0c141001576386b4683d..a28ed3b0394ce54724af443f6c35f14d212706ab 100644 (file)
@@ -713,6 +713,7 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 
 void wxXmlResourceHandler::AddWindowStyles()
 {
 
 void wxXmlResourceHandler::AddWindowStyles()
 {
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
     XRC_ADD_STYLE(wxSIMPLE_BORDER);
     XRC_ADD_STYLE(wxSUNKEN_BORDER);
     XRC_ADD_STYLE(wxDOUBLE_BORDER);
     XRC_ADD_STYLE(wxSIMPLE_BORDER);
     XRC_ADD_STYLE(wxSUNKEN_BORDER);
     XRC_ADD_STYLE(wxDOUBLE_BORDER);