fixed off by one error in wxXPMDecoder::ReadFile

[wxWidgets.git] / include / wx / dc.h

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 8dc21ff6f0e380cecd4c97efe0dc7b10fadebd9e..ccf87a178494b536de213e4f404d9e4b69d75c33 100644 (file)
--- 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;
     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;
     virtual void SetPalette(const wxPalette& palette) = 0;

+#endif // wxUSE_PALETTE

 
     // clipping region
     // ---------------
 
     // clipping region
     // ---------------


@@ -491,7 +493,7 @@ public:
     // Put ClearCache in the wxDC implementation class, since it has to be
     // static.
     // static void ClearCache() ;
     // Put ClearCache in the wxDC implementation class, since it has to be
     // static.
     // static void ClearCache() ;

-#if wxUSE_DC_CACHEING
+#if 0 // wxUSE_DC_CACHEING

     static void EnableCache(bool cacheing) { sm_cacheing = cacheing; }
     static bool CacheEnabled() { return sm_cacheing ; }
 #endif
     static void EnableCache(bool cacheing) { sm_cacheing = cacheing; }
     static bool CacheEnabled() { return sm_cacheing ; }
 #endif


@@ -588,12 +590,17 @@ public:
 #endif // !Win16
 
 #if WXWIN_COMPATIBILITY
 #endif // !Win16
 
 #if WXWIN_COMPATIBILITY

+
+#if wxUSE_PALETTE

     virtual void SetColourMap(const wxPalette& palette) { SetPalette(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; }
     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:
 #endif // WXWIN_COMPATIBILITY
 
 protected:


@@ -699,7 +706,7 @@ protected:
     bool m_isInteractive:1;
     bool m_isBBoxValid:1;
 #if wxUSE_DC_CACHEING
     bool m_isInteractive:1;
     bool m_isBBoxValid:1;
 #if wxUSE_DC_CACHEING

-    static bool sm_cacheing;
+//    static bool sm_cacheing;

 #endif
 
     // coordinate system variables
 #endif
 
     // coordinate system variables


@@ -731,7 +738,10 @@ protected:
     wxColour          m_textForegroundColour;
     wxColour          m_textBackgroundColour;
     wxFont            m_font;
     wxColour          m_textForegroundColour;
     wxColour          m_textBackgroundColour;
     wxFont            m_font;

+
+#if wxUSE_PALETTE

     wxPalette         m_palette;
     wxPalette         m_palette;

+#endif // wxUSE_PALETTE

 
 private:
     DECLARE_NO_COPY_CLASS(wxDCBase)
 
 private:
     DECLARE_NO_COPY_CLASS(wxDCBase)


@@ -750,8 +760,6 @@ private:
     #include "wx/gtk/dc.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/dc.h"
     #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__)
 #elif defined(__WXMAC__)
     #include "wx/mac/dc.h"
 #elif defined(__WXPM__)