Fix for wxTextCtrl::GetSelection for singel line controls in GTK2 mode

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

diff --git a/include/wx/dc.h b/include/wx/dc.h
index 75f3dc348ad6d9c5b76424d68befe261c7c4ffe1..3cbf773cd7d07ae62d686484a68bf8c44ca0d970 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -30,6 +30,7 @@
 #include "wx/palette.h"
 #include "wx/list.h"            // we use wxList in inline functions
 
+class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxDCBase;
 
 class WXDLLEXPORT wxDrawObject
@@ -341,10 +342,15 @@ public:
         { DoGetClippingBox(x, y, w, h); }
     void GetClippingBox(wxRect& rect) const
         {
+#if 1
+          DoGetClippingBox(&rect.x, &rect.y, &rect.width, &rect.height);
+#else
           // Necessary to use intermediate variables for 16-bit compilation
+          // REMOVE ME if the above is OK for all current platforms
           wxCoord x, y, w, h;
           DoGetClippingBox(&x, &y, &w, &h);
           rect.x = x; rect.y = y; rect.width = w; rect.height = h;
+#endif
         }
 
     // text extent
@@ -491,16 +497,6 @@ public:
     virtual void SetOptimization(bool WXUNUSED(opt)) { }
     virtual bool GetOptimization() { return FALSE; }
 
-    // Some platforms have a DC cache, which should be cleared
-    // at appropriate points such as after a series of DC operations.
-    // Put ClearCache in the wxDC implementation class, since it has to be
-    // static.
-    // static void ClearCache() ;
-#if 0 // wxUSE_DC_CACHEING
-    static void EnableCache(bool cacheing) { sm_cacheing = cacheing; }
-    static bool CacheEnabled() { return sm_cacheing ; }
-#endif
-
     // bounding box
     // ------------
 
@@ -594,10 +590,6 @@ public:
 
 #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 ;
@@ -708,9 +700,6 @@ protected:
     bool m_clipping:1;
     bool m_isInteractive:1;
     bool m_isBBoxValid:1;
-#if wxUSE_DC_CACHEING
-//    static bool sm_cacheing;
-#endif
 
     // coordinate system variables
 
@@ -768,6 +757,8 @@ private:
     #include "wx/mgl/dc.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dc.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/dc.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dc.h"
 #endif
@@ -799,6 +790,8 @@ private:
     wxDC& m_dc;
 
     wxColour m_colFgOld;
+
+    DECLARE_NO_COPY_CLASS(wxDCTextColourChanger)
 };
 
 // ----------------------------------------------------------------------------
@@ -818,6 +811,8 @@ public:
 
 private:
     wxDC& m_dc;
+
+    DECLARE_NO_COPY_CLASS(wxDCClipper)
 };
 
 #endif