Don't change the fg/bg colours so that the native colours will be

used, which may be different than the parent's colours or even
themed.

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

diff --git a/wxPython/wx/tools/XRCed/panel.py b/wxPython/wx/tools/XRCed/panel.py
index 063061e703da28cf7573e82e4eba83674095102a..67b00f40e19a28bbd536ec8fa29da33dcafd125f 100644 (file)
--- a/wxPython/wx/tools/XRCed/panel.py
+++ b/wxPython/wx/tools/XRCed/panel.py
@@ -13,7 +13,6 @@ class Panel(wxNotebook):
     def __init__(self, parent, id = -1):
         if wxPlatform != '__WXMAC__':   # some problems with this style on macs
             wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)
     def __init__(self, parent, id = -1):
         if wxPlatform != '__WXMAC__':   # some problems with this style on macs
             wxNotebook.__init__(self, parent, id, style=wxNB_BOTTOM)

-            self.SetBackgroundColour(parent.GetBackgroundColour())

         else:
             wxNotebook.__init__(self, parent, id)
         global panel
         else:
             wxNotebook.__init__(self, parent, id)
         global panel


@@ -172,8 +171,6 @@ class Panel(wxNotebook):
 class ParamPage(wxPanel):
     def __init__(self, parent, xxx):
         wxPanel.__init__(self, parent, -1)
 class ParamPage(wxPanel):
     def __init__(self, parent, xxx):
         wxPanel.__init__(self, parent, -1)

-        self.SetBackgroundColour(parent.GetBackgroundColour())
-        self.SetForegroundColour(parent.GetForegroundColour())

         self.xxx = xxx
         # Register event handlers
         for id in paramIDs.values():
         self.xxx = xxx
         # Register event handlers
         for id in paramIDs.values():

diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
index 2c3e02d278a524850b7a17e34c2f2092a414c812..d9f4e623574ce1450c5806c0136bb72dd623323c 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -36,8 +36,6 @@ buttonSize = (35,-1)    # in dialog units, transformed to pixels in panel ctor
 class PPanel(wxPanel):
     def __init__(self, parent, name):
         wxPanel.__init__(self, parent, -1, name=name)
 class PPanel(wxPanel):
     def __init__(self, parent, name):
         wxPanel.__init__(self, parent, -1, name=name)

-        self.SetBackgroundColour(parent.GetBackgroundColour())
-        self.SetForegroundColour(parent.GetForegroundColour())

         self.modified = self.freeze = False
     def Enable(self, value):
         # Something strange is going on with enable so we make sure...
         self.modified = self.freeze = False
     def Enable(self, value):
         # Something strange is going on with enable so we make sure...


@@ -789,15 +787,9 @@ class ParamBitmap(PPanel):
         g.frame.res.LoadOnPanel(pre, parent, 'PANEL_BITMAP')
         self.this = pre.this
         self._setOORInfo(self)
         g.frame.res.LoadOnPanel(pre, parent, 'PANEL_BITMAP')
         self.this = pre.this
         self._setOORInfo(self)

-        self.SetBackgroundColour(parent.GetBackgroundColour())
-        self.SetForegroundColour(parent.GetForegroundColour())

         self.modified = self.freeze = False
         self.radio_std = XRCCTRL(self, 'RADIO_STD')
         self.modified = self.freeze = False
         self.radio_std = XRCCTRL(self, 'RADIO_STD')

-        self.radio_std.SetBackgroundColour(parent.GetBackgroundColour())
-        self.radio_std.SetForegroundColour(parent.GetForegroundColour())

         self.radio_file = XRCCTRL(self, 'RADIO_FILE')
         self.radio_file = XRCCTRL(self, 'RADIO_FILE')

-        self.radio_file.SetBackgroundColour(parent.GetBackgroundColour())
-        self.radio_file.SetForegroundColour(parent.GetForegroundColour())

         self.combo = XRCCTRL(self, 'COMBO_STD')
         self.text = XRCCTRL(self, 'TEXT_FILE')
         self.button = XRCCTRL(self, 'BUTTON_BROWSE')
         self.combo = XRCCTRL(self, 'COMBO_STD')
         self.text = XRCCTRL(self, 'TEXT_FILE')
         self.button = XRCCTRL(self, 'BUTTON_BROWSE')