diff --git a/wxqt-compile.diff b/wxqt-compile.diff index 793e94a..e484181 100644 --- a/wxqt-compile.diff +++ b/wxqt-compile.diff @@ -17,24 +17,24 @@ Change code to use full PIMPL so that wx headers do not depend on Qt at all --- include/wx/qt/accel.h | 3 -- include/wx/qt/app.h | 2 - - include/wx/qt/colour.h | 29 +++++++++++------------- + include/wx/qt/colour.h | 30 ++++++++++------------- include/wx/qt/window.h | 1 src/common/colourdata.cpp | 2 + src/qt/accel.cpp | 2 - src/qt/app.cpp | 1 src/qt/bitmap.cpp | 2 - - src/qt/brush.cpp | 6 ++--- - src/qt/calctrl.cpp | 14 +++++------ + src/qt/brush.cpp | 6 ++-- + src/qt/calctrl.cpp | 14 +++++----- src/qt/checkbox.cpp | 2 - src/qt/clipbrd.cpp | 1 src/qt/colordlg.cpp | 4 +-- - src/qt/colour.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++++ - src/qt/dc.cpp | 16 ++++++------- + src/qt/colour.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++ + src/qt/dc.cpp | 16 ++++++------ src/qt/dcscreen.cpp | 1 src/qt/evtloop.cpp | 1 src/qt/listctrl.cpp | 4 +-- - src/qt/pen.cpp | 6 ++--- - 19 files changed, 103 insertions(+), 48 deletions(-) + src/qt/pen.cpp | 6 ++-- + 19 files changed, 109 insertions(+), 48 deletions(-) Index: wxWidgets/include/wx/qt/accel.h =================================================================== @@ -67,7 +67,7 @@ Index: wxWidgets/include/wx/qt/colour.h =================================================================== --- wxWidgets.orig/include/wx/qt/colour.h +++ wxWidgets/include/wx/qt/colour.h -@@ -10,37 +10,34 @@ +@@ -10,37 +10,35 @@ #ifndef _WX_QT_COLOUR_H_ #define _WX_QT_COLOUR_H_ @@ -82,6 +82,7 @@ Index: wxWidgets/include/wx/qt/colour.h + wxColour(const QColor &); - virtual bool IsOk() const { return m_qtColor.isValid(); } ++ void Init(void); + virtual bool IsOk(void) const; - unsigned char Red() const { return m_qtColor.red(); } @@ -314,7 +315,7 @@ Index: wxWidgets/src/qt/colour.cpp =================================================================== --- wxWidgets.orig/src/qt/colour.cpp +++ wxWidgets/src/qt/colour.cpp -@@ -10,11 +10,65 @@ +@@ -10,11 +10,70 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #include "wx/qt/private/utils.h" @@ -330,6 +331,11 @@ Index: wxWidgets/src/qt/colour.cpp + fprintf(stderr, "%s\n", __PRETTY_FUNCTION__); +} + ++void wxColour::Init(void) ++{ ++ m_qtColor = new QColor(); ++} ++ +bool wxColour::IsOk(void) const +{ + return m_qtColor->isValid();