wxMSWUniv build fix.

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

diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index 0d97507c97456eeff2e28b068e57602024a1c0a1..a7926f69f26b4885a6507bf61e1b482dcd9cdad4 100644 (file)
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_


@@ -64,7 +64,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 +72,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
     {