Listctrl updates

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

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 2797a151cfdad0b16c5cd4a4360ebbb221bc4403..9a466630293d92147240e1305282bf518b296b6d 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -22,88 +22,116 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

+class wxWindowDC;

 class wxPaintDC;
 class wxPaintDC;

-typedef wxPaintDC wxClientDC;
-typedef wxPaintDC wxWindowDC;
+class wxClientDC;

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxPaintDC
+// wxWindowDC

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxPaintDC: public wxDC
+class wxWindowDC: public wxDC

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPaintDC)
-
-  public:
+  DECLARE_DYNAMIC_CLASS(wxWindowDC)

 
 

-    wxPaintDC(void);
-    wxPaintDC( wxWindow *win );
+public:
+  wxWindowDC();
+  wxWindowDC( wxWindow *win );

     
     

-    ~wxPaintDC(void);
+  ~wxWindowDC();

     
     

-    virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE );
-    virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
-
-    virtual void DrawLine( long x1, long y1, long x2, long y2 );
-    virtual void CrossHair( long x, long y );
-    virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc );
-    virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
-    virtual void DrawPoint( long x, long y );
+  virtual void FloodFill( long x, long y, const wxColour& col, int style=wxFLOOD_SURFACE );
+  virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
+
+  virtual void DrawLine( long x1, long y1, long x2, long y2 );
+  virtual void CrossHair( long x, long y );
+  virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc );
+  virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
+  virtual void DrawPoint( long x, long y );

     
     

-    virtual void DrawLines( int n, wxPoint points[], long xoffset = 0, long yoffset = 0 );
-    virtual void DrawLines( wxList *points, long xoffset = 0, long yoffset = 0 );
-    virtual void DrawPolygon( int n, wxPoint points[], long xoffset = 0, long yoffset = 0, 
-                              int fillStyle=wxODDEVEN_RULE );
-    virtual void DrawPolygon( wxList *lines, long xoffset = 0, long yoffset = 0, 
-                              int fillStyle=wxODDEVEN_RULE );
+  virtual void DrawLines( int n, wxPoint points[], long xoffset = 0, long yoffset = 0 );
+  virtual void DrawLines( wxList *points, long xoffset = 0, long yoffset = 0 );
+  virtual void DrawPolygon( int n, wxPoint points[], long xoffset = 0, long yoffset = 0, 
+                            int fillStyle=wxODDEVEN_RULE );
+  virtual void DrawPolygon( wxList *lines, long xoffset = 0, long yoffset = 0, 
+                            int fillStyle=wxODDEVEN_RULE );

     
     

-    virtual void DrawRectangle( long x, long y, long width, long height );
-    virtual void DrawRoundedRectangle( long x, long y, long width, long height, double radius = 20.0 );
-    virtual void DrawEllipse( long x, long y, long width, long height );
+  virtual void DrawRectangle( long x, long y, long width, long height );
+  virtual void DrawRoundedRectangle( long x, long y, long width, long height, double radius = 20.0 );
+  virtual void DrawEllipse( long x, long y, long width, long height );

     
     

-    virtual bool CanDrawBitmap(void) const;
-    virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask=FALSE );
-    virtual bool Blit( long xdest, long ydest, long width, long height,
-       wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE );
-
-    virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE );
-    virtual bool CanGetTextExtent(void) const;
-    virtual void GetTextExtent( const wxString &string, long *width, long *height,
+  virtual bool CanDrawBitmap() const;
+  virtual void DrawIcon( const wxIcon &icon, long x, long y );
+  virtual void DrawBitmap( const wxBitmap &bitmap, long x, long y, bool useMask=FALSE );
+  virtual bool Blit( long xdest, long ydest, long width, long height,
+                      wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE );
+
+  virtual void DrawText( const wxString &text, long x, long y, bool use16 = FALSE );
+  virtual bool CanGetTextExtent() const;
+  virtual void GetTextExtent( const wxString &string, long *width, long *height,

                      long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
                      wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE );
                      long *descent = (long *) NULL, long *externalLeading = (long *) NULL,
                      wxFont *theFont = (wxFont *) NULL, bool use16 = FALSE );

-    virtual long GetCharWidth(void);
-    virtual long GetCharHeight(void);
+  virtual long GetCharWidth();
+  virtual long GetCharHeight();

     
     

-    virtual void Clear(void);
+  virtual void Clear();

             
             

-    virtual void SetFont( const wxFont &font );
-    virtual void SetPen( const wxPen &pen );
-    virtual void SetBrush( const wxBrush &brush );
-    virtual void SetBackground( const wxBrush &brush );
-    virtual void SetLogicalFunction( int function );
-    virtual void SetTextForeground( const wxColour &col );
-    virtual void SetTextBackground( const wxColour &col );
-    virtual void SetBackgroundMode( int mode );
-    virtual void SetPalette( const wxPalette& palette );
+  virtual void SetFont( const wxFont &font );
+  virtual void SetPen( const wxPen &pen );
+  virtual void SetBrush( const wxBrush &brush );
+  virtual void SetBackground( const wxBrush &brush );
+  virtual void SetLogicalFunction( int function );
+  virtual void SetTextForeground( const wxColour &col );
+  virtual void SetTextBackground( const wxColour &col );
+  virtual void SetBackgroundMode( int mode );
+  virtual void SetPalette( const wxPalette& palette );

     
     

-    virtual void SetClippingRegion( long x, long y, long width, long height );
-    virtual void DestroyClippingRegion(void);
+  virtual void SetClippingRegion( long x, long y, long width, long height );
+  virtual void DestroyClippingRegion();
+  virtual void SetClippingRegion( const wxRegion &region  );

     
     

-    virtual void DrawSpline( wxList *points );
+  virtual void DrawSpline( wxList *points );

     
     

-  public: // shouldn't be public
+  // implementation

     
     

-    GdkWindow    *m_window;
-    GdkGC        *m_penGC;
-    GdkGC        *m_brushGC;
-    GdkGC        *m_textGC;
-    GdkGC        *m_bgGC;
-    GdkColormap  *m_cmap;
-    bool          m_isMemDC;
+  GdkWindow    *m_window;
+  GdkGC        *m_penGC;
+  GdkGC        *m_brushGC;
+  GdkGC        *m_textGC;
+  GdkGC        *m_bgGC;
+  GdkColormap  *m_cmap;
+  bool          m_isMemDC;

     
     

-    void SetUpDC(void);
-    void Destroy(void);
-    GdkWindow *GetWindow(void);
+  void SetUpDC();
+  void Destroy();
+  GdkWindow *GetWindow();
+};
+
+//-----------------------------------------------------------------------------
+// wxPaintDC
+//-----------------------------------------------------------------------------
+
+class wxPaintDC : public wxWindowDC
+{
+  DECLARE_DYNAMIC_CLASS(wxPaintDC)
+
+public:
+  wxPaintDC();
+  wxPaintDC( wxWindow *win );

 };
 
 };
 

+//-----------------------------------------------------------------------------
+// wxClientDC
+//-----------------------------------------------------------------------------
+
+class wxClientDC : public wxWindowDC
+{
+  DECLARE_DYNAMIC_CLASS(wxClientDC)
+
+public:
+  wxClientDC();
+  wxClientDC( wxWindow *win );
+};
+
+

 #endif // __GTKDCCLIENTH__
 #endif // __GTKDCCLIENTH__