Commited FRM's stockitem patch (empty stock items).

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

diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index f726723241011f2d4cf3d3e52e1dd4f6e1ae46b2..5af28891085fe0e3cef727edd009d4e8ba30dc1e 100644 (file)
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.h
+// Name:        wx/motif/dc.h

 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxDC class
 // Author:      Julian Smart
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "dc.h"
-#endif
-

 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/icon.h"
 #include "wx/pen.h"
 #include "wx/brush.h"
 #include "wx/icon.h"


@@ -64,7 +60,7 @@ public:
 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 DoSetClippingRegion(wxCoord x, wxCoord y,
         wxCoord width, wxCoord height);


@@ -72,7 +68,7 @@ protected:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:

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

 
     wxCoord XDEV2LOG(wxCoord x) const
     {
 
     wxCoord XDEV2LOG(wxCoord x) const
     {