X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4c013b2b1c033e33da3f3bdfe03ab4f91eaf5c1..57c48fc46521d8980e8343a14378b6a424cd374d:/wxPython/wx/tools/XRCed/xrced.xrc

diff --git a/wxPython/wx/tools/XRCed/xrced.xrc b/wxPython/wx/tools/XRCed/xrced.xrc
index c5b5463fe8..70e7772a84 100644
--- a/wxPython/wx/tools/XRCed/xrced.xrc
+++ b/wxPython/wx/tools/XRCed/xrced.xrc
@@ -133,7 +133,7 @@
     </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>
@@ -143,7 +143,7 @@
         <object class="wxBoxSizer">
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
-            <object class="wxCheckList" name="CHECK_LIST">
+            <object class="wxCheckListBox" name="CHECK_LIST">
               <content/>
             </object>
             <option>1</option>
@@ -224,7 +224,7 @@
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
-        <object class="wxCheckList" name="CHECK_LIST">
+        <object class="wxCheckListBox" name="CHECKLIST">
           <content/>
           <size>250,250</size>
           <style></style>
@@ -260,6 +260,72 @@
     </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>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
+  </object>
   <object class="wxDialog" name="DIALOG_INTLIST">
     <title>Numbers</title>
     <centered>1</centered>
@@ -268,32 +334,46 @@
       <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>
@@ -308,14 +388,14 @@
       </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">
@@ -360,13 +440,20 @@
                 <item>wxART_GO_TO_PARENT</item>
                 <item>wxART_GO_HOME</item>
                 <item>wxART_FILE_OPEN</item>
+                <item>wxART_FILE_SAVE</item>
+                <item>wxART_FILE_SAVE_AS</item>
                 <item>wxART_PRINT</item>
                 <item>wxART_HELP</item>
                 <item>wxART_TIP</item>
                 <item>wxART_REPORT_VIEW</item>
                 <item>wxART_LIST_VIEW</item>
                 <item>wxART_NEW_DIR</item>
+                <item>wxART_HARDDISK</item>
+                <item>wxART_FLOPPY</item>
+                <item>wxART_CDROM</item>
+                <item>wxART_REMOVABLE</item>
                 <item>wxART_FOLDER</item>
+                <item>wxART_FOLDER_OPEN</item>
                 <item>wxART_GO_DIR_UP</item>
                 <item>wxART_EXECUTABLE_FILE</item>
                 <item>wxART_NORMAL_FILE</item>
@@ -377,6 +464,16 @@
                 <item>wxART_WARNING</item>
                 <item>wxART_INFORMATION</item>
                 <item>wxART_MISSING_IMAGE</item>
+                <item>wxART_COPY</item>
+                <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_AND_REPLACE</item>
               </content>
             </object>
             <flag>wxRIGHT|wxEXPAND</flag>