ON XP when pages are added to a Notebook their colours (and their

children's) are modified to match the theme colours for notebook pages
rather than normal panel colours.  When items are added dynamically
after the fact to the notebook pages then we need to fiddle with the
colours ourself.

Also, since xrced is importing from wxPython.wx then DC.Draw methods
now need to use the old parameter syntax.

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

diff --git a/wxPython/wx/tools/XRCed/panel.py b/wxPython/wx/tools/XRCed/panel.py
index 5fbefc2427421c1806867e21fb8bb8b80bd026c1..4d1cdcaaa96e19407f9ef790de74318facf678e1 100644 (file)
--- a/wxPython/wx/tools/XRCed/panel.py
+++ b/wxPython/wx/tools/XRCed/panel.py
@@ -165,6 +165,8 @@ 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 d15bf69641ce3213c6515e91f76ae8207f01571d..5c97a4e005edf0c147c280c6d84debbfcaf43fc1 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -22,6 +22,8 @@ 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...


@@ -42,7 +44,6 @@ class ParamBinaryOr(PPanel):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_CHOICES = wxNewId()
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_CHOICES = wxNewId()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)


@@ -125,7 +126,6 @@ class ParamColour(PPanel):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON = wxNewId()
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON = wxNewId()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(65,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(65,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)


@@ -154,7 +154,7 @@ class ParamColour(PPanel):
         if self.IsEnabled(): dc.SetPen(wxBLACK_PEN)
         else: dc.SetPen(wxGREY_PEN)
         size = self.button.GetSize()
         if self.IsEnabled(): dc.SetPen(wxBLACK_PEN)
         else: dc.SetPen(wxGREY_PEN)
         size = self.button.GetSize()

-        dc.DrawRectangle((0, 0), size)
+        dc.DrawRectangle(0, 0, size.width, size.height)

     def OnLeftDown(self, evt):
         data = wxColourData()
         data.SetColour(self.GetValue())
     def OnLeftDown(self, evt):
         data = wxColourData()
         data.SetColour(self.GetValue())


@@ -185,7 +185,6 @@ class ParamFont(PPanel):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_SELECT = wxNewId()
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_SELECT = wxNewId()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)


@@ -279,7 +278,6 @@ class ParamInt(PPanel):
         self.ID_SPIN_CTRL = wxNewId()
         sizer = wxBoxSizer()
         self.spin = wxSpinCtrl(self, self.ID_SPIN_CTRL, size=(50,-1))
         self.ID_SPIN_CTRL = wxNewId()
         sizer = wxBoxSizer()
         self.spin = wxSpinCtrl(self, self.ID_SPIN_CTRL, size=(50,-1))

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer.Add(self.spin)
         self.SetAutoLayout(True)
         self.SetSizer(sizer)
         sizer.Add(self.spin)
         self.SetAutoLayout(True)
         self.SetSizer(sizer)


@@ -303,7 +301,6 @@ class ParamUnit(PPanel):
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(35,-1))
         self.spin = wxSpinButton(self, self.ID_SPIN_BUTTON, style = wxSP_VERTICAL, size=(-1,1))
         self.spin.SetRange(-10000, 10000)
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=(35,-1))
         self.spin = wxSpinButton(self, self.ID_SPIN_BUTTON, style = wxSP_VERTICAL, size=(-1,1))
         self.spin.SetRange(-10000, 10000)

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer.Add(self.text, 0, wxEXPAND | wxRIGHT, 2)
         sizer.Add(self.spin, 0, wxEXPAND)
         self.SetAutoLayout(True)
         sizer.Add(self.text, 0, wxEXPAND | wxRIGHT, 2)
         sizer.Add(self.spin, 0, wxEXPAND)
         self.SetAutoLayout(True)


@@ -343,9 +340,7 @@ class ParamMultilineText(PPanel):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_EDIT = wxNewId()
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_EDIT = wxNewId()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer = wxBoxSizer()
         sizer = wxBoxSizer()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
         self.button = wxButton(self, self.ID_BUTTON_EDIT, 'Edit...', size=buttonSize)
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
         self.button = wxButton(self, self.ID_BUTTON_EDIT, 'Edit...', size=buttonSize)


@@ -376,7 +371,6 @@ class ParamText(PPanel):
         self.ID_TEXT_CTRL = wxNewId()
         # We use sizer even here to have the same size of text control
         sizer = wxBoxSizer()
         self.ID_TEXT_CTRL = wxNewId()
         # We use sizer even here to have the same size of text control
         sizer = wxBoxSizer()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(textWidth,-1))
         if textWidth == -1: option = 1
         else: option = 0
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(textWidth,-1))
         if textWidth == -1: option = 1
         else: option = 0


@@ -523,7 +517,6 @@ class ParamContent(PPanel):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_EDIT = wxNewId()
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_EDIT = wxNewId()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)


@@ -666,7 +659,6 @@ class RadioBox(PPanel):
     def __init__(self, parent, id, choices,
                  pos=wxDefaultPosition, name='radiobox'):
         PPanel.__init__(self, parent, name)
     def __init__(self, parent, id, choices,
                  pos=wxDefaultPosition, name='radiobox'):
         PPanel.__init__(self, parent, name)

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         self.choices = choices
         topSizer = wxBoxSizer()
         for i in choices:
         self.choices = choices
         topSizer = wxBoxSizer()
         for i in choices:


@@ -717,7 +709,6 @@ class ParamFile(PPanel):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_BROWSE = wxNewId()
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         self.ID_BUTTON_BROWSE = wxNewId()

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)
         sizer = wxBoxSizer()
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(200,-1))
         sizer.Add(self.text, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 5)


@@ -765,10 +756,15 @@ 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.modified = self.freeze = False

-        self.SetBackgroundColour(g.panel.GetBackgroundColour())

         self.radio_std = XRCCTRL(self, 'RADIO_STD')
         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')