added AddWindowStyles

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

diff --git a/contrib/include/wx/xml/xh_bttn.h b/contrib/include/wx/xml/xh_bttn.h
index c3853b8bc649491a7def8ff3e52bdb706fad5ff9..9a20c277ef15f5a56dc1d1564885915f8c3e0e35 100644 (file)
--- a/contrib/include/wx/xml/xh_bttn.h
+++ b/contrib/include/wx/xml/xh_bttn.h
@@ -20,7 +20,7 @@
 class WXDLLEXPORT wxButtonXmlHandler : public wxXmlResourceHandler
 {
     public:
-        wxButtonXmlHandler() : wxXmlResourceHandler() {}
+        wxButtonXmlHandler();
         virtual wxObject *DoCreateResource();
         virtual bool CanHandle(wxXmlNode *node);
 };

diff --git a/contrib/include/wx/xml/xmlres.h b/contrib/include/wx/xml/xmlres.h
index 7a62012ccc1d015a1ed33ebef609b0a5e8337cea..e3338a605bf3ea513ed6116c3d9e8de3de665419 100644 (file)
--- a/contrib/include/wx/xml/xmlres.h
+++ b/contrib/include/wx/xml/xmlres.h
@@ -225,6 +225,9 @@ class WXDLLEXPORT wxXmlResourceHandler : public wxObject
         // Add style flag (e.g. wxMB_DOCKABLE) to list of flags
         // understood by this handler
         void AddStyle(const wxString& name, int value);
+       
+       // Add styles common to all wxWindow-derived classes
+       void AddWindowStyles();
         
         // Gets style flags from text in form "flag | flag2| flag3 |..."
         // Only understads flags added with AddStyle

diff --git a/contrib/src/xml/xh_bttn.cpp b/contrib/src/xml/xh_bttn.cpp
index a689d49ed33bfde09d78c94d9d376a69aa612a38..4fc936f4abf712f2b718ee7d5af9bddc6ff2ed47 100644 (file)
--- a/contrib/src/xml/xh_bttn.cpp
+++ b/contrib/src/xml/xh_bttn.cpp
@@ -23,6 +23,13 @@
 #include "wx/button.h"
 
 
+wxButtonXmlHandler::wxButtonXmlHandler() 
+: wxXmlResourceHandler() 
+{
+    AddWindowStyles();
+}
+
+
 wxObject *wxButtonXmlHandler::DoCreateResource()
 { 
     wxButton *button = new wxButton(m_ParentAsWindow,

diff --git a/contrib/src/xml/xh_chckb.cpp b/contrib/src/xml/xh_chckb.cpp
index d2d3c15f1abec5a1797c483f15c202e52ee3fcf9..9cfddeb63e52b66ba509f54fc3711fbd27e7a02a 100644 (file)
--- a/contrib/src/xml/xh_chckb.cpp
+++ b/contrib/src/xml/xh_chckb.cpp
@@ -27,6 +27,7 @@
 wxCheckBoxXmlHandler::wxCheckBoxXmlHandler() 
 : wxXmlResourceHandler() 
 {
+    AddWindowStyles();
 }
 
 wxObject *wxCheckBoxXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_chckl.cpp b/contrib/src/xml/xh_chckl.cpp
index 492054006ace2e2ee9b3be1fab3fcd170599b589..5e22232d4b5328e41c33915c3ad846054e911185 100644 (file)
--- a/contrib/src/xml/xh_chckl.cpp
+++ b/contrib/src/xml/xh_chckl.cpp
@@ -26,6 +26,7 @@ wxCheckListXmlHandler::wxCheckListXmlHandler()
 : wxXmlResourceHandler(), m_InsideBox(FALSE)
 {
     // no styles
+    AddWindowStyles();
 }
 
 wxObject *wxCheckListXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_choic.cpp b/contrib/src/xml/xh_choic.cpp
index 4ee1a0fe7bb06dbac894a357268e0e9a6f8efbf6..6ffec1f04d761874c08f5fce1f489e56b6bfbbb2 100644 (file)
--- a/contrib/src/xml/xh_choic.cpp
+++ b/contrib/src/xml/xh_choic.cpp
@@ -26,6 +26,7 @@ wxChoiceXmlHandler::wxChoiceXmlHandler()
 : wxXmlResourceHandler() , m_InsideBox(FALSE)
 {
     ADD_STYLE(wxCB_SORT);
+    AddWindowStyles();
 }
 
 wxObject *wxChoiceXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_combo.cpp b/contrib/src/xml/xh_combo.cpp
index acf344e28c7204bf201112aaa40c3c7b505ccf62..54c029431bf75248a1d11b7665e91f4a1e72ae3d 100644 (file)
--- a/contrib/src/xml/xh_combo.cpp
+++ b/contrib/src/xml/xh_combo.cpp
@@ -31,6 +31,7 @@ wxComboBoxXmlHandler::wxComboBoxXmlHandler()
     ADD_STYLE(wxCB_SORT);
     ADD_STYLE(wxCB_READONLY);
     ADD_STYLE(wxCB_DROPDOWN);
+    AddWindowStyles();
 }
 
 wxObject *wxComboBoxXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_dlg.cpp b/contrib/src/xml/xh_dlg.cpp
index 0347787f08eaa537de4158bfa6a495c027f933f9..f95d9f41f83b791383f4bac37615f4f23aefba51 100644 (file)
--- a/contrib/src/xml/xh_dlg.cpp
+++ b/contrib/src/xml/xh_dlg.cpp
@@ -40,6 +40,8 @@ wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
     ADD_STYLE(wxNO_3D);
     ADD_STYLE(wxTAB_TRAVERSAL);
     ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    ADD_STYLE(wxCLIP_CHILDREN);
+    AddWindowStyles();
 }
 
 

diff --git a/contrib/src/xml/xh_gauge.cpp b/contrib/src/xml/xh_gauge.cpp
index 14394613adb0eba6378cbae6bf3c6d712f9bb7e0..cefe815ac69a5109b907e96dedd920d528097279 100644 (file)
--- a/contrib/src/xml/xh_gauge.cpp
+++ b/contrib/src/xml/xh_gauge.cpp
@@ -31,6 +31,7 @@ wxGaugeXmlHandler::wxGaugeXmlHandler()
     ADD_STYLE( wxGA_VERTICAL );
     ADD_STYLE( wxGA_PROGRESSBAR );
     ADD_STYLE( wxGA_SMOOTH );   // windows only
+    AddWindowStyles();
 }
 
 wxObject *wxGaugeXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_html.cpp b/contrib/src/xml/xh_html.cpp
index ca1b9bac2ffb4a6a51c1a841878ecc11afab644b..e94e0c8f96e9124967dfc4f8d9be0451bb90ea63 100644 (file)
--- a/contrib/src/xml/xh_html.cpp
+++ b/contrib/src/xml/xh_html.cpp
@@ -31,6 +31,7 @@ wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
 {
     ADD_STYLE( wxHW_SCROLLBAR_NEVER );
     ADD_STYLE( wxHW_SCROLLBAR_AUTO );
+    AddWindowStyles();
 }
 
 wxObject *wxHtmlWindowXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_listb.cpp b/contrib/src/xml/xh_listb.cpp
index d9d2a54089473b4d822925ef6e9732540c3b1d87..9d4bae282d2ddf3e72b7ed4c530de338257cc66b 100644 (file)
--- a/contrib/src/xml/xh_listb.cpp
+++ b/contrib/src/xml/xh_listb.cpp
@@ -32,6 +32,7 @@ wxListBoxXmlHandler::wxListBoxXmlHandler()
     ADD_STYLE(wxLB_ALWAYS_SB);
     ADD_STYLE(wxLB_NEEDED_SB);
     ADD_STYLE(wxLB_SORT);
+    AddWindowStyles();
 }
 
 wxObject *wxListBoxXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_notbk.cpp b/contrib/src/xml/xh_notbk.cpp
index deaf745f1a8ec4cfa5f4d662bc63740f39bebde6..3c7bed28f8187e90de3900dee62b8c30f8c78f13 100644 (file)
--- a/contrib/src/xml/xh_notbk.cpp
+++ b/contrib/src/xml/xh_notbk.cpp
@@ -34,6 +34,7 @@ wxNotebookXmlHandler::wxNotebookXmlHandler()
     ADD_STYLE(wxNB_LEFT);
     ADD_STYLE(wxNB_RIGHT);
     ADD_STYLE(wxNB_BOTTOM);
+    AddWindowStyles();
 }
 
 

diff --git a/contrib/src/xml/xh_panel.cpp b/contrib/src/xml/xh_panel.cpp
index 5ed9c2a9f4c503b042541711b12dd585bb244e46..4e327e7b34ac80ebf3bd51fa959f3ebad5762644 100644 (file)
--- a/contrib/src/xml/xh_panel.cpp
+++ b/contrib/src/xml/xh_panel.cpp
@@ -28,6 +28,8 @@ wxPanelXmlHandler::wxPanelXmlHandler() : wxXmlResourceHandler()
     ADD_STYLE(wxNO_3D);
     ADD_STYLE(wxTAB_TRAVERSAL);
     ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    ADD_STYLE(wxCLIP_CHILDREN);
+    AddWindowStyles();
 }
 
 

diff --git a/contrib/src/xml/xh_radbt.cpp b/contrib/src/xml/xh_radbt.cpp
index bdcbfe59251d3cfb15500c600d848f18a4814829..f68de955188cc9619b37df8179593e8e2877dce9 100644 (file)
--- a/contrib/src/xml/xh_radbt.cpp
+++ b/contrib/src/xml/xh_radbt.cpp
@@ -28,6 +28,7 @@ wxRadioButtonXmlHandler::wxRadioButtonXmlHandler()
 : wxXmlResourceHandler() 
 {
     ADD_STYLE( wxRB_GROUP );
+    AddWindowStyles();
 }
 
 wxObject *wxRadioButtonXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_radbx.cpp b/contrib/src/xml/xh_radbx.cpp
index 82f2f325ba5b4d6ed85abf0defc61c661022421c..17679b952fab109fc91d631504e4743664a9a42d 100644 (file)
--- a/contrib/src/xml/xh_radbx.cpp
+++ b/contrib/src/xml/xh_radbx.cpp
@@ -31,6 +31,7 @@ wxRadioBoxXmlHandler::wxRadioBoxXmlHandler()
     ADD_STYLE(wxRA_HORIZONTAL);
     ADD_STYLE(wxRA_SPECIFY_ROWS);
     ADD_STYLE(wxRA_VERTICAL);
+    AddWindowStyles();
 }
 
 wxObject *wxRadioBoxXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_slidr.cpp b/contrib/src/xml/xh_slidr.cpp
index 38847f7d21c43a6cc35e8e61a9b80b4a445c1dc9..12afa0aabba18f9fff93509397b60956962e276d 100644 (file)
--- a/contrib/src/xml/xh_slidr.cpp
+++ b/contrib/src/xml/xh_slidr.cpp
@@ -37,6 +37,7 @@ wxSliderXmlHandler::wxSliderXmlHandler()
     ADD_STYLE( wxSL_BOTTOM );
     ADD_STYLE( wxSL_BOTH );
     ADD_STYLE( wxSL_SELRANGE );
+    AddWindowStyles();
 }
 
 wxObject *wxSliderXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_spin.cpp b/contrib/src/xml/xh_spin.cpp
index 9ebd9471ee2c4bd9815b83848785df2925c00166..0a557f2eebd100f85fc747d91aec55a4fa0c6c17 100644 (file)
--- a/contrib/src/xml/xh_spin.cpp
+++ b/contrib/src/xml/xh_spin.cpp
@@ -31,6 +31,7 @@ wxSpinButtonXmlHandler::wxSpinButtonXmlHandler()
     ADD_STYLE( wxSP_VERTICAL );
     ADD_STYLE( wxSP_ARROW_KEYS );
     ADD_STYLE( wxSP_WRAP );
+    AddWindowStyles();
 }
 
 wxObject *wxSpinButtonXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_stbmp.cpp b/contrib/src/xml/xh_stbmp.cpp
index 8ec8d5553cd4b9726d2b57593965c17306e2e239..c3620d06c5bc5e0b5554923331dc1d97aa49ae95 100644 (file)
--- a/contrib/src/xml/xh_stbmp.cpp
+++ b/contrib/src/xml/xh_stbmp.cpp
@@ -25,6 +25,7 @@
 wxStaticBitmapXmlHandler::wxStaticBitmapXmlHandler() 
 : wxXmlResourceHandler() 
 {
+    AddWindowStyles();
 }
 
 wxObject *wxStaticBitmapXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_sttxt.cpp b/contrib/src/xml/xh_sttxt.cpp
index f0e59c094fe62433c691fd9e213d5ad40a459d06..d4e4ff24f641ebc03dc06beb0d46f2173fabbbca 100644 (file)
--- a/contrib/src/xml/xh_sttxt.cpp
+++ b/contrib/src/xml/xh_sttxt.cpp
@@ -26,6 +26,7 @@ wxStaticTextXmlHandler::wxStaticTextXmlHandler()
 : wxXmlResourceHandler() 
 {
     ADD_STYLE( wxST_NO_AUTORESIZE );
+    AddWindowStyles();
 }
 
 wxObject *wxStaticTextXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xh_text.cpp b/contrib/src/xml/xh_text.cpp
index 8775d86cdfd4951c7467dfd42bf18064de93e92b..a1203536b3f6fd236f8d8b91522c99526fc0a977 100644 (file)
--- a/contrib/src/xml/xh_text.cpp
+++ b/contrib/src/xml/xh_text.cpp
@@ -30,6 +30,7 @@ wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()
     ADD_STYLE(wxTE_PASSWORD);
     ADD_STYLE(wxTE_READONLY);
     ADD_STYLE(wxHSCROLL);
+    AddWindowStyles();
 }
 
 wxObject *wxTextCtrlXmlHandler::DoCreateResource()

diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp
index b8b80c6978fc595be8b2339e4b6d58d6669a7e02..3245347129b1bca8d86b42cd2d7d802ac70f6ac6 100644 (file)
--- a/contrib/src/xml/xmlres.cpp
+++ b/contrib/src/xml/xmlres.cpp
@@ -386,6 +386,21 @@ void wxXmlResourceHandler::AddStyle(const wxString& name, int value)
 }
 
 
+
+void wxXmlResourceHandler::AddWindowStyles()
+{
+    ADD_STYLE(wxSIMPLE_BORDER);
+    ADD_STYLE(wxSUNKEN_BORDER);
+    ADD_STYLE(wxDOUBLE_BORDER);
+    ADD_STYLE(wxRAISED_BORDER);
+    ADD_STYLE(wxSTATIC_BORDER);
+    ADD_STYLE(wxTRANSPARENT_WINDOW);
+    ADD_STYLE(wxWANTS_CHARS);
+    ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
+}
+
+
+
 bool wxXmlResourceHandler::HasParam(const wxString& param)
 {
     return (GetParamNode(param) != NULL);

diff --git a/contrib/utils/wxrcedit/df/panelbase.df b/contrib/utils/wxrcedit/df/panelbase.df
index 6136b048df9d2338511efeba1ba4d9e30147e819..9eb8e1caf3a807a4910e36766993460437b1e1a3 100644 (file)
--- a/contrib/utils/wxrcedit/df/panelbase.df
+++ b/contrib/utils/wxrcedit/df/panelbase.df
@@ -4,6 +4,6 @@ type panel
 icon 1
 childtype panel_item
 abstract
-var style of flags wxNO_3D,wxTAB_TRAVERSAL
+var style of flags wxNO_3D,wxTAB_TRAVERSAL,wxCLIP_CHILDREN
 var exstyle of flags wxWS_EX_VALIDATE_RECURSIVELY
 derived from window

diff --git a/contrib/utils/wxrcedit/df/window.df b/contrib/utils/wxrcedit/df/window.df
index ec0530220f9b5b610be051d47116dbd4fdeb0de3..1f045ef772c98b5b846ab76fb788ec33775574ba 100644 (file)
--- a/contrib/utils/wxrcedit/df/window.df
+++ b/contrib/utils/wxrcedit/df/window.df
@@ -3,6 +3,7 @@ type normal
 abstract
 var pos of coord
 var size of coord
+var style of flags wxSIMPLE_BORDER,wxSUNKEN_BORDER,wxDOUBLE_BORDER,wxRAISED_BORDER,wxSTATIC_BORDER,wxTRANSPARENT_WINDOW,wxWANTS_CHARS,wxNO_FULL_REPAINT_ON_RESIZE
 var tooltip of text
 var fg of color
 var bg of color