Corrected wxCHECK calls in bitmap.cpp

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

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 9678e6d693e73377a9f6a3950d772412f9d2f8db..1c778cfbf8474fa8037ac67a3ffbb3455ae60375 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -2,9 +2,8 @@
 // Name:        dc.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -66,7 +65,7 @@ class wxDC: public wxObject
     void BeginDrawing(void) {};
     void EndDrawing(void) {};
     
-    virtual bool Ok(void) const { return m_ok; };
+    virtual bool Ok(void) const;
 
     virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE ) = 0;
     virtual bool GetPixel( long x1, long y1, wxColour *col ) const = 0;
@@ -90,11 +89,13 @@ class wxDC: public wxObject
     virtual void DrawEllipse( long x, long y, long width, long height ) = 0;
     
     virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 );
-    virtual void DrawSpline( wxList *points );
+    virtual void DrawSpline( wxList *points ) = 0;
     virtual void DrawSpline( int n, wxPoint points[] );
     
     virtual bool CanDrawBitmap(void) const = 0;
-    virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask=FALSE );
+    virtual void DrawIcon( const wxIcon &icon, long x, long y )
+      { DrawIcon( icon, x, y, TRUE ); }
+    virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask );
             void DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask=FALSE )
            { DrawIcon( *((wxIcon*)(&bmp)), x, y, useMask ); }
     virtual bool Blit( long xdest, long ydest, long width, long height,
@@ -103,8 +104,8 @@ class wxDC: public wxObject
     virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE ) = 0;
     virtual bool CanGetTextExtent(void) const = 0;
     virtual void GetTextExtent( const wxString &string, long *width, long *height,
-                     long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16 = FALSE ) = 0;
+                     long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
+                     wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE ) = 0;
     virtual long GetCharWidth(void) = 0;
     virtual long GetCharHeight(void) = 0;
     
@@ -167,8 +168,6 @@ class wxDC: public wxObject
     virtual void GetLogicalOrigin( long *x, long *y );
     virtual void SetDeviceOrigin( long x, long y );
     virtual void GetDeviceOrigin( long *x, long *y );
-    virtual void SetInternalDeviceOrigin( long x, long y );
-    virtual void GetInternalDeviceOrigin( long *x, long *y );
 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
     
@@ -250,7 +249,6 @@ class wxDC: public wxObject
            return (long)((double)(y) * m_scaleY - 0.5);
        }
   
-    virtual void DrawOpenSpline( wxList *points ) = 0;
        
   public:
     
@@ -281,14 +279,6 @@ class wxDC: public wxObject
     // 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; 
     
-    long         m_internalDeviceOriginX,m_internalDeviceOriginY;   // If un-scrolled is non-zero or
-                                                                   // d.o. changes with scrolling.
-                                                                   // Set using SetInternalDeviceOrigin().
-                                                                   
-    long         m_externalDeviceOriginX,m_externalDeviceOriginY;   // To be set by external classes
-                                                                    // such as wxScrolledWindow
-                                                                   // using SetDeviceOrigin()
-                                                                   
     long         m_deviceOriginX,m_deviceOriginY;                   // Sum of the two above.
     
     long         m_logicalOriginX,m_logicalOriginY;                 // User defined.