X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a69d0aa1dccadd8c88231ef0158a660713453df..a62df55f4d5eea2c8e94838eb01cf2d8f33c61f5:/wxPython/wx/tools/XRCed/xrced.xrc?ds=sidebyside

diff --git a/wxPython/wx/tools/XRCed/xrced.xrc b/wxPython/wx/tools/XRCed/xrced.xrc
index f7da582ef8..70e7772a84 100644
--- a/wxPython/wx/tools/XRCed/xrced.xrc
+++ b/wxPython/wx/tools/XRCed/xrced.xrc
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ascii"?>
+<?xml version="1.0" ?>
 <resource>
   <object class="wxDialog" name="DIALOG_TEXT">
     <title>Text Dialog</title>
@@ -10,27 +10,19 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxTextCtrl" name="TEXT">
-              
               <size>250,100</size>
-              
               <style>wxTE_MULTILINE</style>
             </object>
-            
             <option>1</option>
-            
             <flag>wxALL|wxEXPAND</flag>
-            
             <border>5</border>
           </object>
         </object>
-        
         <option>1</option>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
         <object class="wxStaticLine"/>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
@@ -38,26 +30,19 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_OK">
-              
               <label>OK</label>
-              
               <default>1</default>
             </object>
-            
             <flag>wxRIGHT</flag>
-            
             <border>10</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
-              
               <label>Cancel</label>
             </object>
           </object>
         </object>
-        
         <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-        
         <border>10</border>
       </object>
     </object>
@@ -74,14 +59,10 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxListBox" name="LIST">
-              
               <content/>
             </object>
-            
             <option>1</option>
-            
             <flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
-            
             <border>5</border>
           </object>
           <object class="sizeritem">
@@ -89,61 +70,44 @@
               <orient>wxVERTICAL</orient>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_UP">
-                  
                   <label>Move Up</label>
                 </object>
-                
                 <flag>wxBOTTOM|wxEXPAND</flag>
-                
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_DOWN">
-                  
                   <label>Move Down</label>
                 </object>
-                
                 <flag>wxEXPAND</flag>
               </object>
               <object class="spacer">
-                
                 <size>10,20</size>
-                
                 <option>1</option>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_APPEND">
-                  
                   <label>Append...</label>
                 </object>
-                
                 <flag>wxBOTTOM|wxEXPAND</flag>
-                
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_REMOVE">
-                  
                   <label>Remove</label>
                 </object>
-                
                 <flag>wxEXPAND</flag>
               </object>
             </object>
-            
             <flag>wxALL|wxEXPAND</flag>
-            
             <border>5</border>
           </object>
         </object>
-        
         <option>1</option>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
         <object class="wxStaticLine"/>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
@@ -151,32 +115,25 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_OK">
-              
               <label>OK</label>
-              
               <default>1</default>
             </object>
-            
             <flag>wxRIGHT</flag>
-            
             <border>10</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
-              
               <label>Cancel</label>
             </object>
           </object>
         </object>
-        
         <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-        
         <border>10</border>
       </object>
     </object>
     <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
   </object>
-  <object class="wxDialog" name="DIALOG_CONTENT_CHECK_LIST">
+  <object class="wxDialog" name="DIALOG_CONTENT_CHECKLIST">
     <title>Content</title>
     <centered>1</centered>
     <size>250,300</size>
@@ -187,14 +144,10 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxCheckListBox" name="CHECK_LIST">
-              
               <content/>
             </object>
-            
             <option>1</option>
-            
             <flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
-            
             <border>5</border>
           </object>
           <object class="sizeritem">
@@ -202,61 +155,44 @@
               <orient>wxVERTICAL</orient>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_UP">
-                  
                   <label>Move Up</label>
                 </object>
-                
                 <flag>wxBOTTOM|wxEXPAND</flag>
-                
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_DOWN">
-                  
                   <label>Move Down</label>
                 </object>
-                
                 <flag>wxEXPAND</flag>
               </object>
               <object class="spacer">
-                
                 <size>10,20</size>
-                
                 <option>1</option>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_APPEND">
-                  
                   <label>Append...</label>
                 </object>
-                
                 <flag>wxBOTTOM|wxEXPAND</flag>
-                
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_REMOVE">
-                  
                   <label>Remove</label>
                 </object>
-                
                 <flag>wxEXPAND</flag>
               </object>
             </object>
-            
             <flag>wxALL|wxEXPAND</flag>
-            
             <border>5</border>
           </object>
         </object>
-        
         <option>1</option>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
         <object class="wxStaticLine"/>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
@@ -264,26 +200,19 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_OK">
-              
               <label>OK</label>
-              
               <default>1</default>
             </object>
-            
             <flag>wxRIGHT</flag>
-            
             <border>10</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
-              
               <label>Cancel</label>
             </object>
           </object>
         </object>
-        
         <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-        
         <border>10</border>
       </object>
     </object>
@@ -295,24 +224,17 @@
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
-        <object class="wxCheckListBox" name="CHECK_LIST">
-          
+        <object class="wxCheckListBox" name="CHECKLIST">
           <content/>
-          
           <size>250,250</size>
-          
           <style></style>
         </object>
-        
         <option>1</option>
-        
         <flag>wxALL|wxEXPAND</flag>
-        
         <border>5</border>
       </object>
       <object class="sizeritem">
         <object class="wxStaticLine"/>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
@@ -320,26 +242,85 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_OK">
-              
               <label>OK</label>
-              
               <default>1</default>
             </object>
-            
             <flag>wxRIGHT</flag>
-            
             <border>10</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
-              
               <label>Cancel</label>
             </object>
           </object>
         </object>
-        
         <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-        
+        <border>10</border>
+      </object>
+    </object>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
+  </object>
+  <object class="wxDialog" name="DIALOG_STYLES">
+    <title>Window styles</title>
+    <centered>1</centered>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticText" name="LABEL_SPECIFIC">
+          <label>Specific styles:</label>
+        </object>
+        <flag>wxTOP|wxLEFT</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckListBox" name="CHECKLIST_SPECIFIC">
+          <content/>
+          <size>250,150</size>
+          <style></style>
+        </object>
+        <option>1</option>
+        <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>Generic styles:</label>
+        </object>
+        <flag>wxLEFT</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckListBox" name="CHECKLIST_GENERIC">
+          <content/>
+          <size>250,150</size>
+          <style></style>
+        </object>
+        <option>1</option>
+        <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticLine"/>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_OK">
+              <label>OK</label>
+              <default>1</default>
+            </object>
+            <flag>wxRIGHT</flag>
+            <border>10</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CANCEL">
+              <label>Cancel</label>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
         <border>10</border>
       </object>
     </object>
@@ -353,84 +334,76 @@
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
         <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
+          <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxListBox" name="LIST">
-              
               <content/>
-              
-              <size>80,100</size>
-              
+              <size>80,150</size>
               <style>wxLB_SORT</style>
             </object>
-            
             <option>1</option>
-            
             <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            
-            <border>10</border>
+            <border>5</border>
           </object>
           <object class="sizeritem">
             <object class="wxBoxSizer">
               <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="SPIN">
+                  <size>20,-1d</size>
+                </object>
+                <flag>wxBOTTOM</flag>
+                <border>5</border>
+              </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_ADD">
-                  
-                  <label>Add...</label>
+                  <label>Add</label>
                 </object>
-                
                 <flag>wxBOTTOM</flag>
-                
-                <border>3</border>
+                <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_REMOVE">
-                  
                   <label>Remove</label>
                 </object>
               </object>
+              <object class="sizeritem">
+                <object class="wxButton" name="BUTTON_CLEAR">
+                  <label>Clear</label>
+                </object>
+                <flag>wxTOP</flag>
+                <border>5</border>
+              </object>
             </object>
-            
             <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            
             <border>5</border>
           </object>
         </object>
-        
         <option>1</option>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
         <object class="wxStaticLine"/>
-        
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
         <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
+          <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_OK">
-              
               <label>OK</label>
-              
               <default>1</default>
             </object>
-            
-            <flag>wxBOTTOM</flag>
-            
-            <border>5</border>
+            <flag>wxRIGHT</flag>
+            <border>10</border>
           </object>
           <object class="sizeritem">
             <object class="wxButton" name="wxID_CANCEL">
-              
               <label>Cancel</label>
             </object>
           </object>
         </object>
-        
         <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-        
         <border>10</border>
       </object>
     </object>
@@ -446,15 +419,12 @@
           <rows>2</rows>
           <object class="sizeritem">
             <object class="wxRadioButton" name="RADIO_STD">
-              
               <label>art:</label>
             </object>
-            
             <flag>wxALIGN_CENTRE_VERTICAL</flag>
           </object>
           <object class="sizeritem">
             <object class="wxComboBox" name="COMBO_STD">
-              
               <content>
                 <item>wxART_ADD_BOOKMARK</item>
                 <item>wxART_DEL_BOOKMARK</item>
@@ -498,24 +468,21 @@
                 <item>wxART_CUT</item>
                 <item>wxART_PASTE</item>
                 <item>wxART_DELETE</item>
+                <item>wxART_NEW</item>
                 <item>wxART_UNDO</item>
                 <item>wxART_REDO</item>
                 <item>wxART_QUIT</item>
                 <item>wxART_FIND</item>
-                <item>wxART_FIND</item>
+                <item>wxART_FIND_AND_REPLACE</item>
               </content>
             </object>
-            
             <flag>wxRIGHT|wxEXPAND</flag>
-            
             <border>5</border>
           </object>
           <object class="sizeritem">
             <object class="wxRadioButton" name="RADIO_FILE">
-              
               <label>file:</label>
             </object>
-            
             <flag>wxALIGN_CENTRE_VERTICAL</flag>
           </object>
           <object class="sizeritem">
@@ -523,31 +490,23 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxTextCtrl" name="TEXT_FILE"/>
-                
                 <option>1</option>
-                
                 <flag>wxRIGHT|wxEXPAND</flag>
-                
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_BROWSE">
-                  
                   <label>Browse...</label>
-                  
                   <size>40,-1d</size>
                 </object>
               </object>
             </object>
-            
             <flag>wxRIGHT|wxEXPAND</flag>
-            
             <border>5</border>
           </object>
           <vgap>2</vgap>
           <growablecols>1</growablecols>
         </object>
-        
         <flag>wxEXPAND</flag>
       </object>
     </object>