Changed name to wxFIXED_MINSIZE since that is more descriptive of what

it does.  The size can still be changed by the sizer, but it won't
query the minsize if this flag is set.

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

diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp
index 1eaa247c517f3fb7f5d16429739af86b364ef5d7..5590ded11ea6b64c08ee7ad3061b65a50c36321d 100644 (file)
--- a/contrib/src/xrc/xh_sizer.cpp
+++ b/contrib/src/xrc/xh_sizer.cpp
@@ -71,7 +71,7 @@ wxSizerXmlHandler::wxSizerXmlHandler()
     XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
     
     XRC_ADD_STYLE(wxADJUST_MINSIZE);
-    XRC_ADD_STYLE(wxFIXED_SIZE);
+    XRC_ADD_STYLE(wxFIXED_MINSIZE);
 }
 
 

diff --git a/src/xrc/xh_sizer.cpp b/src/xrc/xh_sizer.cpp
index 1eaa247c517f3fb7f5d16429739af86b364ef5d7..5590ded11ea6b64c08ee7ad3061b65a50c36321d 100644 (file)
--- a/src/xrc/xh_sizer.cpp
+++ b/src/xrc/xh_sizer.cpp
@@ -71,7 +71,7 @@ wxSizerXmlHandler::wxSizerXmlHandler()
     XRC_ADD_STYLE(wxALIGN_CENTRE_VERTICAL);
     
     XRC_ADD_STYLE(wxADJUST_MINSIZE);
-    XRC_ADD_STYLE(wxFIXED_SIZE);
+    XRC_ADD_STYLE(wxFIXED_MINSIZE);
 }
 
 

diff --git a/wxPython/demo/data/resource_wdr.xrc b/wxPython/demo/data/resource_wdr.xrc
index fd598cf35abf4b1df13016f6c15d05860fdd6d61..8460d82d4b5e125ef6d3ac545843109d7b104b49 100644 (file)
--- a/wxPython/demo/data/resource_wdr.xrc
+++ b/wxPython/demo/data/resource_wdr.xrc
@@ -74,7 +74,7 @@
                 </object>
               </object>
               <object class="sizeritem">
-                <flag>wxALIGN_CENTRE|wxLEFT|wxTOP|wxFIXED_SIZE</flag>
+                <flag>wxALIGN_CENTRE|wxLEFT|wxTOP|wxFIXED_MINSIZE</flag>
                 <border>5</border>
                 <object class="wxTextCtrl" name="ID_StateField">
                   <size>30,-1</size>
@@ -82,7 +82,7 @@
                 </object>
               </object>
               <object class="sizeritem">
-                <flag>wxALIGN_CENTRE|wxLEFT|wxRIGHT|wxTOP|wxFIXED_SIZE</flag>
+                <flag>wxALIGN_CENTRE|wxLEFT|wxRIGHT|wxTOP|wxFIXED_MINSIZE</flag>
                 <border>5</border>
                 <object class="wxTextCtrl" name="ID_ZipField">
                   <size>50,-1</size>