only define wxUSE_NATIVE_STATUSBAR for the ports which have it (MSW and Mac)

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

diff --git a/include/wx/x11/dc.h b/include/wx/x11/dc.h
index f4e58fb5d990364e90f51aebc9ff302d493f27e2..2637aed447d282ad343ee90e2df1607b83ec5818 100644 (file)
--- a/include/wx/x11/dc.h
+++ b/include/wx/x11/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "dc.h"
 #endif
 
@@ -46,29 +46,27 @@ class WXDLLEXPORT wxDC : public wxDCBase
 public:
     wxDC();
     ~wxDC() { }
-    
+
     // implement base class pure virtuals
     // ----------------------------------
-    
-    virtual void DestroyClippingRegion();
-    
+
     virtual wxSize GetPPI() const;
-    
+
     virtual void SetMapMode(int mode);
     virtual void SetUserScale(double x, double y);
     virtual void SetLogicalScale(double x, double y);
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
-    
+
 protected:
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
     virtual void DoGetSizeMM(int* width, int* height) const;
-    
+
 public:
-    void ComputeScaleAndOrigin();
-    
+    virtual void ComputeScaleAndOrigin();
+
     wxCoord XDEV2LOG(wxCoord x) const
     {
         wxCoord new_x = x - m_deviceOriginX;
@@ -129,14 +127,14 @@ public:
         else
             return (wxCoord)((double)(y) * m_scaleY - 0.5);
     }
-    
+
 public:
     // not sure what for, but what is a mm on a screen you don't know the size of?
     double       m_mm_to_pix_x,m_mm_to_pix_y;
-    
+
     // recompute scale?
     bool         m_needComputeScaleX, m_needComputeScaleY;
-    
+
 
 private:
     DECLARE_ABSTRACT_CLASS(wxDC)