Patch #1907 2007-03-01 00:32

stahta01

Patch XRC files for wxW28 with disable_compat26
Download
1907-Patch_XRC_file.patch (7.2 KB)
Category
Application::Refinement
Status
Closed
Close date
2008-09-24 14:34
Assigned to
mortenmacfly
Index: src/plugins/contrib/devpak_plugin/update.xrc
===================================================================
--- src/plugins/contrib/devpak_plugin/update.xrc    (revision 5097)
+++ src/plugins/contrib/devpak_plugin/update.xrc    (working copy)
@@ -166,6 +166,6 @@
         <border>8</border>
       </object>
     </object>
-    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX</style>
   </object>
 </resource>
\ No newline at end of file
Index: src/plugins/codecompletion/resources/insert_class_method.xrc
===================================================================
--- src/plugins/codecompletion/resources/insert_class_method.xrc    (revision 5097)
+++ src/plugins/codecompletion/resources/insert_class_method.xrc    (working copy)
@@ -135,6 +135,6 @@
         <border>8</border>
       </object>
     </object>
-    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX</style>
   </object>
 </resource>
Index: src/plugins/codecompletion/resources/selectincludefile.xrc
===================================================================
--- src/plugins/codecompletion/resources/selectincludefile.xrc    (revision 5097)
+++ src/plugins/codecompletion/resources/selectincludefile.xrc    (working copy)
@@ -2,7 +2,7 @@
     <object class="wxDialog" name="SelectIncludeFile">
         <title>Candidate include files</title>
         <centered>1</centered>
-        <style>wxCAPTION|wxTHICK_FRAME|wxSYSTEM_MENU|wxRESIZE_BOX|wxCLOSE_BOX</style>
+        <style>wxCAPTION|wxRESIZE_BORDER|wxSYSTEM_MENU|wxMAXIMIZE_BOX|wxCLOSE_BOX</style>
         <object class="wxBoxSizer">
             <orient>wxVERTICAL</orient>
             <object class="sizeritem">
Index: src/sdk/resources/generic_multi_select.xrc
===================================================================
--- src/sdk/resources/generic_multi_select.xrc    (revision 5097)
+++ src/sdk/resources/generic_multi_select.xrc    (working copy)
@@ -92,6 +92,6 @@
         <border>8</border>
       </object>
     </object>
-    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX</style>
   </object>
 </resource>
\ No newline at end of file
Index: src/sdk/resources/incremental_select_list.xrc
===================================================================
--- src/sdk/resources/incremental_select_list.xrc    (revision 5097)
+++ src/sdk/resources/incremental_select_list.xrc    (working copy)
@@ -31,6 +31,6 @@
         <minsize>320,160</minsize>
       </object>
     </object>
-    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX</style>
   </object>
 </resource>
\ No newline at end of file
Index: src/sdk/resources/generic_multiline_notes.xrc
===================================================================
--- src/sdk/resources/generic_multiline_notes.xrc    (revision 5097)
+++ src/sdk/resources/generic_multiline_notes.xrc    (working copy)
@@ -3,7 +3,7 @@
   <object class="wxDialog" name="dlgGenericMultiLineNotes">
     <title>Notes</title>
     <centered>1</centered>
-    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX</style>
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
Index: src/sdk/resources/auto_detect_compilers.xrc
===================================================================
--- src/sdk/resources/auto_detect_compilers.xrc    (revision 5097)
+++ src/sdk/resources/auto_detect_compilers.xrc    (working copy)
@@ -68,6 +68,6 @@
         <border>8</border>
       </object>
     </object>
-    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX</style>
   </object>
 </resource>
\ No newline at end of file
Index: src/sdk/resources/edit_array_order.xrc
===================================================================
--- src/sdk/resources/edit_array_order.xrc    (revision 5097)
+++ src/sdk/resources/edit_array_order.xrc    (working copy)
@@ -3,7 +3,7 @@
   <object class="wxDialog" name="dlgEditArrayOrder">
     <title>Edit order</title>
     <centered>1</centered>
-    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxMAXIMIZE_BOX</style>
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
Index: src/sdk/resources/edit_tool.xrc
===================================================================
--- src/sdk/resources/edit_tool.xrc    (revision 5097)
+++ src/sdk/resources/edit_tool.xrc    (working copy)
@@ -3,7 +3,7 @@
   <object class="wxDialog" name="dlgEditTool">
     <title>Edit tool</title>
download for full patch...

History

stahta01 2007-03-01 00:33

Priority: High because it fixes runtime issues.

Filename: disable_compat26_xrc-unix.patch

Purpose: Change xrc files to improve support for wxWidgets 2.8 with option disable_compat26.

Problem: Depreciated constants where removed.

Reference: wx/toplevel.h

Solution: Replace with new values.

Replace wxRESIZE_BOX with wxMAXIMIZE_BOX

Replace wxTHICK_FRAME with wxRESIZE_BORDER

stahta01 2007-03-30 18:39

Updated to match current SVN 3797

Tim S

stahta01 2007-06-01 13:09

Updated to SVN 4032

stahta01 2007-06-27 00:03

Updated to SVN 4144

stahta01 2007-11-13 05:02

Updated to SVN 4628

stahta01 2008-06-18 01:02

Updated to svn 5097