X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58cf0491e3938c3f112c488a5ef5bd1aca507378..0532a2588121690115f4629cdcbc41d2049e50c0:/include/wx/cmndata.h?ds=sidebyside diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index d2d1a2a4b2..7e7e16ce55 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -21,7 +21,7 @@ #include "wx/colour.h" #include "wx/gdicmn.h" -#if (defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT +#if (defined(__WXMOTIF__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT class WXDLLEXPORT wxPrintSetupData; #endif @@ -75,7 +75,17 @@ public: wxFontData& operator=(const wxFontData& data) { - (*this) = data; + wxObject::operator=(data); + fontColour = data.fontColour; + showHelp = data.showHelp; + allowSymbols = data.allowSymbols; + enableEffects = data.enableEffects; + initialFont = data.initialFont; + chosenFont = data.chosenFont; + minSize = data.minSize; + maxSize = data.maxSize; + m_encoding = data.m_encoding; + m_encodingInfo = data.m_encodingInfo; return *this; } @@ -190,7 +200,7 @@ class WXDLLEXPORT wxPrintData: public wxObject void operator=(const wxPrintData& data); // For compatibility -#if (defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT +#if (defined(__WXMOTIF__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT void operator=(const wxPrintSetupData& setupData); #endif