From e72d2c9f9445836e7b771c65252fcbf240bc5150 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 19 Jan 2006 10:35:04 +0000 Subject: [PATCH] fix initialization orders (pedantic) Originally committed to SVN as r14. --- core/automation_filter.cpp | 2 +- core/dialog_colorpicker.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/automation_filter.cpp b/core/automation_filter.cpp index 7bec1f6b0..2f6d5ae87 100644 --- a/core/automation_filter.cpp +++ b/core/automation_filter.cpp @@ -45,7 +45,7 @@ AutomationScriptThread::AutomationScriptThread(AutomationScript *a_script, AssFile *a_subs) -: wxThread(wxTHREAD_JOINABLE), subs(a_subs), script(a_script) +: wxThread(wxTHREAD_JOINABLE), script(a_script), subs(a_subs) { Create(); } diff --git a/core/dialog_colorpicker.cpp b/core/dialog_colorpicker.cpp index 74cc0ad9e..50c4186d6 100644 --- a/core/dialog_colorpicker.cpp +++ b/core/dialog_colorpicker.cpp @@ -47,7 +47,7 @@ ColorPickerSpectrum::ColorPickerSpectrum(wxWindow *parent, wxWindowID id, wxBitmap *_background, int xx, int yy, PickerDirection _direction) -: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER), background(_background), x(xx), y(yy), direction(_direction) +: wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER), x(xx), y(yy), background(_background), direction(_direction) { // empty } @@ -150,7 +150,7 @@ void ColorPickerSpectrum::OnMouse(wxMouseEvent &evt) ColorPickerRecent::ColorPickerRecent(wxWindow *parent, wxWindowID id, wxSize size, int _cols, int _rows) -: wxControl(parent, id, wxDefaultPosition, size, wxSTATIC_BORDER), cols(_cols), rows(_rows) +: wxControl(parent, id, wxDefaultPosition, size, wxSTATIC_BORDER), rows(_rows), cols(_cols) { LoadFromString(wxEmptyString); }