Fix for mistake with const for non pointer/reference with corrections in documentation.

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

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index c44beb9c53e1b9dd6b9811b937b934df147f840e..b1f5d1a8baf7d462a2690cc073ecd86bc5b5b49a 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -7,24 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKDCH__
 #define __GTKDCH__
 
 #ifndef __GTKDCH__
 #define __GTKDCH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDC;
+class WXDLLIMPEXP_CORE wxDC;

 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 

+#ifndef MM_TEXT

 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2


@@ -33,28 +29,24 @@ class wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7

+#endif

 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 

-class wxDC : public wxDCBase
+class WXDLLIMPEXP_CORE wxDC : public wxDCBase

 {
 {

-    DECLARE_ABSTRACT_CLASS(wxDC)
-

 public:
     wxDC();
     ~wxDC() { }
 
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
 
 public:
     wxDC();
     ~wxDC() { }
 
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
 

-    // the first two must be overridden and called
-    virtual void DestroyClippingRegion();
-

     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
 
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
 

-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }

     virtual void EndDoc() { }
     virtual void StartPage() { }
     virtual void EndPage() { }
     virtual void EndDoc() { }
     virtual void StartPage() { }
     virtual void EndPage() { }


@@ -136,7 +128,6 @@ public:
 protected:
     // base class pure virtuals implemented here
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
 protected:
     // base class pure virtuals implemented here
     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:
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 public:


@@ -150,7 +141,16 @@ public:
     bool         m_needComputeScaleX,
                  m_needComputeScaleY; // not yet used
 
     bool         m_needComputeScaleX,
                  m_needComputeScaleY; // not yet used
 

-    float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxDC)

 };
 
 };
 

+// this must be defined when wxDC::Blit() honours the DC origian and needed to
+// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK
+// 2.3.[23]
+#ifndef wxHAS_WORKING_GTK_DC_BLIT
+    #define wxHAS_WORKING_GTK_DC_BLIT
+#endif
+

 #endif // __GTKDCH__
 #endif // __GTKDCH__