X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/277480474552707c27c7466bb5e5d1738a16372b..b1d66b5415f7befb45e050d7097571642b8bfa56:/include/wx/dc.h diff --git a/include/wx/dc.h b/include/wx/dc.h index eef4e7b99c..ccf87a1784 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -316,7 +316,9 @@ public: virtual void SetBrush(const wxBrush& brush) = 0; virtual void SetBackground(const wxBrush& brush) = 0; virtual void SetBackgroundMode(int mode) = 0; +#if wxUSE_PALETTE virtual void SetPalette(const wxPalette& palette) = 0; +#endif // wxUSE_PALETTE // clipping region // --------------- @@ -588,12 +590,17 @@ public: #endif // !Win16 #if WXWIN_COMPATIBILITY + +#if wxUSE_PALETTE virtual void SetColourMap(const wxPalette& palette) { SetPalette(palette); } +#endif // wxUSE_PALETTE + void GetTextExtent(const wxString& string, float *x, float *y, float *descent = NULL, float *externalLeading = NULL, wxFont *theFont = NULL, bool use16bit = FALSE) const ; void GetSize(float* width, float* height) const { int w, h; GetSize(& w, & h); *width = w; *height = h; } void GetSizeMM(float *width, float *height) const { long w, h; GetSizeMM(& w, & h); *width = (float) w; *height = (float) h; } + #endif // WXWIN_COMPATIBILITY protected: @@ -731,7 +738,10 @@ protected: wxColour m_textForegroundColour; wxColour m_textBackgroundColour; wxFont m_font; + +#if wxUSE_PALETTE wxPalette m_palette; +#endif // wxUSE_PALETTE private: DECLARE_NO_COPY_CLASS(wxDCBase) @@ -750,8 +760,6 @@ private: #include "wx/gtk/dc.h" #elif defined(__WXMGL__) #include "wx/mgl/dc.h" -#elif defined(__WXQT__) - #include "wx/qt/dc.h" #elif defined(__WXMAC__) #include "wx/mac/dc.h" #elif defined(__WXPM__)