Prealpha, prebeta of new wxTreeCtrl for GTK. It is possible to AddRoot,

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 9abb2793df0958736f2b4e06682dccf60acdb511..1fca0bcf10afec53cb245d43c021440b26338f8d 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -66,7 +66,7 @@ class wxDC: public wxObject
     void BeginDrawing(void) {};
     void EndDrawing(void) {};
     
     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;
 
     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 +90,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 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 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,
             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 +105,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,
     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;
     
     virtual long GetCharWidth(void) = 0;
     virtual long GetCharHeight(void) = 0;
     


@@ -119,6 +121,9 @@ class wxDC: public wxObject
     virtual void SetBrush( const wxBrush &brush ) = 0;
     virtual wxBrush *GetBrush(void) { return &m_brush; };
 
     virtual void SetBrush( const wxBrush &brush ) = 0;
     virtual wxBrush *GetBrush(void) { return &m_brush; };
 

+    virtual void SetBackground( const wxBrush &brush ) = 0;
+    virtual wxBrush *GetBackground(void) { return &m_backgroundBrush; };
+

     virtual void SetLogicalFunction( int function ) = 0;
     virtual int GetLogicalFunction(void) { return m_logicalFunction; };
     
     virtual void SetLogicalFunction( int function ) = 0;
     virtual int GetLogicalFunction(void) { return m_logicalFunction; };
     


@@ -164,8 +169,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 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 );
     
 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
     


@@ -247,7 +250,6 @@ class wxDC: public wxObject
            return (long)((double)(y) * m_scaleY - 0.5);
        }
   
            return (long)((double)(y) * m_scaleY - 0.5);
        }
   

-    virtual void DrawOpenSpline( wxList *points ) = 0;

        
   public:
     
        
   public:
     


@@ -278,14 +280,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; 
     
     // 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.
     long         m_deviceOriginX,m_deviceOriginY;                   // Sum of the two above.
     
     long         m_logicalOriginX,m_logicalOriginY;                 // User defined.