Triued in vain to fix threads segvs with gcc

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

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 57b784c0f481e2f7d1864402e7ce3a75f29c4b8a..4f4999affbd93757b832f6fdced3d828dbbab8f1 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -2,10 +2,9 @@
 // Name:        dcclient.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        dcclient.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -23,87 +22,116 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

+class wxWindowDC;

 class wxPaintDC;
 class wxPaintDC;

-typedef wxPaintDC wxClientDC;
-typedef wxPaintDC wxWindowDC;
+class wxClientDC;
+
+//-----------------------------------------------------------------------------
+// wxWindowDC
+//-----------------------------------------------------------------------------
+
+class wxWindowDC: public wxDC
+{
+  DECLARE_DYNAMIC_CLASS(wxWindowDC)
+
+public:
+  wxWindowDC();
+  wxWindowDC( wxWindow *win );
+
+  ~wxWindowDC();
+
+  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 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() 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 );
+  virtual long GetCharWidth();
+  virtual long GetCharHeight();
+
+  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 SetClippingRegion( long x, long y, long width, long height );
+  virtual void DestroyClippingRegion();
+  virtual void SetClippingRegion( const wxRegion &region  );
+
+  virtual void DrawSpline( wxList *points );
+
+  // implementation
+
+  GdkWindow    *m_window;
+  GdkGC        *m_penGC;
+  GdkGC        *m_brushGC;
+  GdkGC        *m_textGC;
+  GdkGC        *m_bgGC;
+  GdkColormap  *m_cmap;
+  bool          m_isMemDC;
+
+  void SetUpDC();
+  void Destroy();
+  GdkWindow *GetWindow();
+};

 
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxPaintDC
 //-----------------------------------------------------------------------------
 

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

 {
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 
 {
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 

-  public:
-
-    wxPaintDC(void);
-    wxPaintDC( wxWindow *win );
-    
-    ~wxPaintDC(void);
-    
-    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 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 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,
-                     long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16 = FALSE );
-    virtual long GetCharWidth(void);
-    virtual long GetCharHeight(void);
-    
-    virtual void Clear(void);
-            
-    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 DrawOpenSpline( wxList *points );
-    
-  public: // shouldn't be public
-    
-    GdkWindow    *m_window;
-    GdkGC        *m_penGC;
-    GdkGC        *m_brushGC;
-    GdkGC        *m_textGC;
-    GdkGC        *m_bgGC;
-    GdkColormap  *m_cmap;
-    bool          m_isDrawable;
-    
-    void SetUpDC(void);
-    GdkWindow *GetWindow(void);
+public:
+  wxPaintDC();
+  wxPaintDC( wxWindow *win );
+};
+
+//-----------------------------------------------------------------------------
+// wxClientDC
+//-----------------------------------------------------------------------------
+
+class wxClientDC : public wxWindowDC
+{
+  DECLARE_DYNAMIC_CLASS(wxClientDC)
+
+public:
+  wxClientDC();
+  wxClientDC( wxWindow *win );

 };
 
 };
 

+

 #endif // __GTKDCCLIENTH__
 #endif // __GTKDCCLIENTH__