A huge glob of changes in the 2.4 branch merged over to HEAD

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

wxPython/wxPython/tools/XRCed/CHANGES.txt

@@ -1,3 +1,11 @@
+0.1.1-4
+-------
+
+Fixed problems with wxStaticBitmap (stock_id attribute, icon type
+switching).
+
+Changed some dimensions in properties panel elements.
+
 0.1.1-3
 -------
 

wxPython/wxPython/tools/XRCed/README.txt

@@ -4,19 +4,14 @@
 
 ********************************************************************************
 
-Installation on UNIX
---------------------
+System requirements
+-------------------
 
-XRCed requires wxGTK and wxPython greater or equal to 2.3.3, and Python 2.2 
-(it may work with earlier version, but was not tested).
+XRCed requires wxWindows and wxPython greater or equal to 2.3.3, and 
+Python 2.2 or newer (it may work with earlier version, but was not tested).
 
-Of course wxGTK's XRC library (libwxxrc) and it's python module must
-be installed.
+wxPython must be compiled with XRC support.
 
-Installation on Windows
------------------------
-
-Works with wxPython 2.3.2 for Python 2.2.
 
 Short manual
 ------------
@@ -70,4 +65,4 @@ refresh button).
 
 --------------------------------------------------------------------------------
 
-Copyright 2001 Roman Rolinsky <rolinsky@mema.ucl.ac.be>
+Copyright 2001-2003 Roman Rolinsky <rollrom@xrced.sourceforge.net>

wxPython/wxPython/tools/XRCed/globals.py

@@ -15,7 +15,7 @@ modernFont = wxFont(sysFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL)
 smallerFont = wxFont(sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL)
 
 progname = 'XRCed'
-version = '0.1.1-3'
+version = '0.1.1-4'
 
 try:
     True

wxPython/wxPython/tools/XRCed/panel.py

@@ -20,8 +20,11 @@ class Panel(wxNotebook):
         self.modified = False
 
         # Set common button size for parameter buttons
+        bTmp = wxButton(self, -1, '')
         import params
-        params.buttonSize = self.DLG_SZE(buttonSize)
+        params.buttonSize = (self.DLG_SZE(buttonSize)[0], bTmp.GetSize()[1])
+        bTmp.Destroy()
+        del bTmp
 
         # List of child windows
         self.pages = []

wxPython/wxPython/tools/XRCed/params.py

@@ -16,7 +16,7 @@ genericStyles = ['wxSIMPLE_BORDER', 'wxDOUBLE_BORDER',
                  'wxTRANSPARENT_WINDOW', 'wxWANTS_CHARS',
                  'wxNO_FULL_REPAINT_ON_RESIZE']
 
-buttonSize = (30,-1)    # in dialog units, transformed to pixels in panel ctor
+buttonSize = (35,-1)    # in dialog units, transformed to pixels in panel ctor
 
 # Class that can properly disable children
 class PPanel(wxPanel):
@@ -274,8 +274,8 @@ class ParamFont(PPanel):
                      fontStylesWx2Xml.get(font.GetStyle(), "normal"),
                      fontWeightsWx2Xml.get(font.GetWeight(), "normal"),
                      str(font.GetUnderlined()),
-                     font.GetFaceName(),
-                     wxFontMapper_GetEncodingName(font.GetEncoding())
+                     font.GetFaceName().encode(),
+                     wxFontMapper_GetEncodingName(font.GetEncoding()).encode()
                      ]
             # Add ignored flags
             self.SetValue(value)
@@ -694,8 +694,8 @@ class RadioBox(PPanel):
         self.choices = choices
         topSizer = wxBoxSizer()
         for i in choices:
-            button = wxRadioButton(self, -1, i, name=i)
-            topSizer.Add(button)
+            button = wxRadioButton(self, -1, i, size=(-1,buttonSize[1]), name=i)
+            topSizer.Add(button, 0, wxRIGHT, 5)
             EVT_RADIOBUTTON(self, button.GetId(), self.OnRadioChoice)
         self.SetAutoLayout(True)
         self.SetSizer(topSizer)
@@ -815,10 +815,12 @@ class ParamBitmap(PPanel):
     def updateRadios(self):
         if self.value[0]:
             self.radio_std.SetValue(True)
+            self.radio_file.SetValue(False)
             self.text.Enable(False)
             self.button.Enable(False)
             self.combo.Enable(True)
         else:
+            self.radio_std.SetValue(False)
             self.radio_file.SetValue(True)
             self.text.Enable(True)
             self.button.Enable(True)

wxPython/wxPython/tools/XRCed/xrced.xrc

@@ -298,6 +298,7 @@
             <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">
@@ -342,6 +343,7 @@
             <object class="wxRadioButton" name="RADIO_FILE">
               <label>file:</label>
             </object>
+            <flag>wxALIGN_CENTRE_VERTICAL</flag>
           </object>
           <object class="sizeritem">
             <object class="wxBoxSizer">
@@ -355,7 +357,7 @@
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_BROWSE">
                   <label>Browse...</label>
-                  <size>30,-1d</size>
+                  <size>40,-1d</size>
                 </object>
               </object>
             </object>

wxPython/wxPython/tools/XRCed/xxx.py

@@ -169,7 +169,7 @@ class xxxParamBitmap(xxxParam):
         self.stock_id = value[0]
         if self.stock_id:
             self.node.setAttribute('stock_id', self.stock_id)
-        else:
+        elif self.node.hasAttribute('stock_id'):
             self.node.removeAttribute('stock_id')
         xxxParam.update(self, value[1])