added GetHimagelist()

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

diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index ae62ca7ab8026d01e4a3435b3346be98db4024da..a7926f69f26b4885a6507bf61e1b482dcd9cdad4 100644 (file)
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dc.h"
 #endif
 
 #pragma interface "dc.h"
 #endif
 


@@ -44,38 +44,36 @@
 class WXDLLEXPORT wxDC : public wxDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
 class WXDLLEXPORT wxDC : public wxDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxDC)

-        
+

 public:
     wxDC();
     ~wxDC() { }
 public:
     wxDC();
     ~wxDC() { }

-    
+

     // implement base class pure virtuals
     // ----------------------------------
     // implement base class pure virtuals
     // ----------------------------------

-    
-    virtual void DestroyClippingRegion();
-    
+

     virtual wxSize GetPPI() const;
     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);
     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 DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 protected:
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

-        bool useMask = FALSE);
-    
+        bool useMask = false);
+

     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;

-    
+

 public:
 public:

-    void ComputeScaleAndOrigin();
-    
+    virtual void ComputeScaleAndOrigin();
+

     wxCoord XDEV2LOG(wxCoord x) const
     {
         wxCoord new_x = x - m_deviceOriginX;
     wxCoord XDEV2LOG(wxCoord x) const
     {
         wxCoord new_x = x - m_deviceOriginX;


@@ -154,14 +152,14 @@ public:
         else
             return (wxCoord)((double)(y) * m_scaleY - 0.5);
     }
         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;
 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;
     // recompute scale?
     bool         m_needComputeScaleX, m_needComputeScaleY;

-    
+

 };
 
 #endif
 };
 
 #endif