From c66b63e565d340f3a73441a4f780ab57842c7851 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 7 Apr 2004 23:22:50 +0000
Subject: [PATCH] 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
---
 contrib/src/xrc/xh_sizer.cpp        | 2 +-
 src/xrc/xh_sizer.cpp                | 2 +-
 wxPython/demo/data/resource_wdr.xrc | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/xrc/xh_sizer.cpp b/contrib/src/xrc/xh_sizer.cpp
index 1eaa247c51..5590ded11e 100644
--- 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 1eaa247c51..5590ded11e 100644
--- 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 fd598cf35a..8460d82d4b 100644
--- 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>
-- 
2.45.2