fix crash when the user code refuses to validate the new text when editing the item...

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

diff --git a/include/wx/gtk1/dcclient.h b/include/wx/gtk1/dcclient.h
index 19c9e2e09440ac55f6c518dd320c356febc4937e..ab21e69e4a21c50e1ad9a7a780baf9101ae09f73 100644 (file)
--- a/include/wx/gtk1/dcclient.h
+++ b/include/wx/gtk1/dcclient.h
@@ -31,18 +31,18 @@ class wxClientDC;
 
 class wxWindowDC : public wxDC
 {
 
 class wxWindowDC : public wxDC
 {

-    DECLARE_DYNAMIC_CLASS(wxWindowDC)
-

 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
 

-    ~wxWindowDC();
+    virtual ~wxWindowDC();

 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 
 
     virtual bool CanDrawBitmap() const { return TRUE; }
     virtual bool CanGetTextExtent() const { return TRUE; }
 

-    virtual void DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, int style=wxFLOOD_SURFACE );

     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 
     virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 );
     virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const;
 
     virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 );


@@ -69,14 +69,18 @@ public:
 
     virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                          wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                         int logical_func = wxCOPY, bool useMask = FALSE );
+                         int logical_func = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 );

 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );
 
     virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y );

+    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+                                   double angle);

     virtual void DoGetTextExtent( const wxString &string,
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,
                                 wxFont *theFont = (wxFont *) NULL) const;
     virtual void DoGetTextExtent( const wxString &string,
                                 wxCoord *width, wxCoord *height,
                                 wxCoord *descent = (wxCoord *) NULL,
                                 wxCoord *externalLeading = (wxCoord *) NULL,
                                 wxFont *theFont = (wxFont *) NULL) const;

+
+public:

     virtual wxCoord GetCharWidth() const;
     virtual wxCoord GetCharHeight() const;
 
     virtual wxCoord GetCharWidth() const;
     virtual wxCoord GetCharHeight() const;
 


@@ -96,10 +100,6 @@ public:
     virtual void DestroyClippingRegion();
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region  );
 
     virtual void DestroyClippingRegion();
     virtual void DoSetClippingRegionAsRegion( const wxRegion &region  );
 

-#if wxUSE_SPLINES
-    virtual void DoDrawSpline( wxList *points );
-#endif
-

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


@@ -114,40 +114,54 @@ public:
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
     bool          m_isMemDC;
     GdkGC        *m_bgGC;
     GdkColormap  *m_cmap;
     bool          m_isMemDC;

+    bool          m_isScreenDC;

     wxWindow     *m_owner;
     wxWindow     *m_owner;

+    wxRegion      m_currentClippingRegion;
+    wxRegion      m_paintClippingRegion;
+#ifdef __WXGTK20__
+    PangoContext *m_context;
+    PangoFontDescription *m_fontdesc;
+#endif

 
     void SetUpDC();
     void Destroy();
     void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }
 
     void SetUpDC();
     void Destroy();
     void ComputeScaleAndOrigin();
 
     GdkWindow *GetWindow() { return m_window; }

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxWindowDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxPaintDC
+// wxClientDC

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

-class wxPaintDC : public wxWindowDC
+class wxClientDC : public wxWindowDC

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPaintDC)
-

 public:
 public:

-    wxPaintDC();
-    wxPaintDC( wxWindow *win );
+    wxClientDC() { }
+    wxClientDC( wxWindow *win );
+
+protected:
+    virtual void DoGetSize(int *width, int *height) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxClientDC)

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// wxClientDC
+// wxPaintDC

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

-class wxClientDC : public wxWindowDC
+class wxPaintDC : public wxClientDC

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxClientDC)
-

 public:
 public:

-    wxClientDC();
-    wxClientDC( wxWindow *win );
-};
+    wxPaintDC() { }
+    wxPaintDC( wxWindow *win );

 
 

+private:
+    DECLARE_DYNAMIC_CLASS(wxPaintDC)
+};

 
 #endif // __GTKDCCLIENTH__
 
 #endif // __GTKDCCLIENTH__